Update 2 packages

mingw-w64-x86_64 (7zip-23.01-1 -> 7zip-24.05-1) mingw-w64-x86_64-libzip (1.10.1-1 -> 1.10.1-2) Signed-off-by: Git for Windows Build Agent <[email protected]>
git-for-windows · May 20, 2024 · 91c0bd2 · 91c0bd2
1 parent 026301a
commit 91c0bd2
Show file tree

Hide file tree

Showing 38 changed files with 190 additions and 68 deletions.
diff --git a/mingw64/bin/7z.dll b/mingw64/bin/7z.dll
diff --git a/mingw64/bin/7z.exe b/mingw64/bin/7z.exe
diff --git a/mingw64/bin/libzip.dll b/mingw64/bin/libzip.dll
diff --git a/mingw64/bin/zipcmp.exe b/mingw64/bin/zipcmp.exe
diff --git a/mingw64/bin/zipmerge.exe b/mingw64/bin/zipmerge.exe
diff --git a/mingw64/bin/ziptool.exe b/mingw64/bin/ziptool.exe
diff --git a/mingw64/lib/7zip/7zCon.sfx b/mingw64/lib/7zip/7zCon.sfx
diff --git a/mingw64/lib/cmake/libzip/libzip-targets.cmake b/mingw64/lib/cmake/libzip/libzip-targets.cmake
@@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "2.8.3")
    message(FATAL_ERROR "CMake >= 2.8.3 required")
 endif()
 cmake_policy(PUSH)
-cmake_policy(VERSION 2.8.3...3.25)
+cmake_policy(VERSION 2.8.3...3.27)
 #----------------------------------------------------------------
 # Generated CMake target import file.
 #----------------------------------------------------------------
@@ -84,9 +84,12 @@ set(_IMPORT_PREFIX)
 
 # Loop over all imported files and verify that they actually exist
 foreach(_cmake_target IN LISTS _cmake_import_check_targets)
-  foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
-    if(NOT EXISTS "${_cmake_file}")
-      message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
+  if(CMAKE_VERSION VERSION_LESS "3.28"
+      OR NOT DEFINED _cmake_import_check_xcframework_for_${_cmake_target}
+      OR NOT IS_DIRECTORY "${_cmake_import_check_xcframework_for_${_cmake_target}}")
+    foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
+      if(NOT EXISTS "${_cmake_file}")
+        message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
    \"${_cmake_file}\"
 but this file does not exist.  Possible reasons include:
 * The file was deleted, renamed, or moved to another location.
@@ -95,8 +98,9 @@ but this file does not exist.  Possible reasons include:
    \"${CMAKE_CURRENT_LIST_FILE}\"
 but not all the files it references.
 ")
-    endif()
-  endforeach()
+      endif()
+    endforeach()
+  endif()
   unset(_cmake_file)
   unset("_cmake_import_check_files_for_${_cmake_target}")
 endforeach()

diff --git a/mingw64/lib/libzip.a b/mingw64/lib/libzip.a
diff --git a/mingw64/lib/pkgconfig/libzip.pc b/mingw64/lib/pkgconfig/libzip.pc
@@ -12,3 +12,4 @@ Version: 1.10.1
 Libs:  -L${libdir} -lzip
 Libs.private:  -ladvapi32 -lbz2 -llzma -lzstd -lbcrypt -lz
 Cflags: -I${includedir}
+Cflags.private: -DZIP_STATIC
diff --git a/mingw64/share/doc/7zip/7zip.hhp b/mingw64/share/doc/7zip/7zip.hhp
@@ -71,6 +71,7 @@ cmdline\switches\working_dir.htm
 cmdline\switches\exclude.htm
 fm\options.htm
 fm\benchmark.htm
+fm\temp.htm
 fm\index.htm
 fm\menu.htm
 fm\about.htm

diff --git a/mingw64/share/doc/7zip/7zip.wxs b/mingw64/share/doc/7zip/7zip.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
-<?define VerMajor = "23" ?>
-<?define VerMinor = "01" ?>
+<?define VerMajor = "24" ?>
+<?define VerMinor = "05" ?>
 <?define VerBuild = "00" ?>
 <?define MmVer = "$(var.VerMajor).$(var.VerMinor)" ?>
 <?define MmHex = "$(var.VerMajor)$(var.VerMinor)" ?>

diff --git a/mingw64/share/doc/7zip/License.txt b/mingw64/share/doc/7zip/License.txt
@@ -3,14 +3,16 @@
   License for use and distribution
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-  7-Zip Copyright (C) 1999-2020 Igor Pavlov.
+  7-Zip Copyright (C) 1999-2024 Igor Pavlov.
 
   The licenses for files are:
 
-    1) CPP/7zip/Compress/Rar* files: the "GNU LGPL" with "unRAR license restriction"
-    2) CPP/7zip/Compress/LzfseDecoder.cpp: the "BSD 3-clause License"
-    3) Some files are "public domain" files, if "public domain" status is stated in source file.
-    4) the "GNU LGPL" for all other files. If there is no license information in 
+    - CPP/7zip/Compress/Rar* files: the "GNU LGPL" with "unRAR license restriction"
+    - CPP/7zip/Compress/LzfseDecoder.cpp: the "BSD 3-clause License"
+    - C/ZstdDec.c: the "BSD 3-clause License"
+    - C/Xxh64.c: the "BSD 2-clause License"
+    - Some files are "public domain" files, if "public domain" status is stated in source file.
+    - the "GNU LGPL" for all other files. If there is no license information in 
        some source file, that file is under the "GNU LGPL".
 
   The "GNU LGPL" with "unRAR license restriction" means that you must follow both 
@@ -19,8 +21,8 @@
 
 
 
-  GNU LGPL information
-  --------------------
+GNU LGPL information
+--------------------
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -33,58 +35,117 @@
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    License along with this library; if not, 
+    you can get a copy of the GNU Lesser General Public License from
+    http://www.gnu.org/
 
 
 
 
-  BSD 3-clause License
-  --------------------
+BSD 3-clause License in 7-Zip code
+----------------------------------
 
-    The "BSD 3-clause License" is used for the code in LzfseDecoder.cpp that implements LZFSE data decompression.
-    That code was derived from the code in the "LZFSE compression library" developed by Apple Inc,
-    that also uses the "BSD 3-clause License":
+  The "BSD 3-clause License" is used for the following code in 7z.dll
+    1) LZFSE data decompression.
+         CPP/7zip/Compress/LzfseDecoder.cpp.
+       That code was derived from the code in the "LZFSE compression library" developed by Apple Inc,
+       that also uses the "BSD 3-clause License".
+    2) ZSTD data decompression.
+         C/ZstdDec.c
+       that code was developed using original zstd decoder code as reference code.
+       The original zstd decoder code was developed by Facebook Inc,
+       that also uses the "BSD 3-clause License".
 
-    ----
-    Copyright (c) 2015-2016, Apple Inc. All rights reserved.
+  Copyright (c) 2015-2016, Apple Inc. All rights reserved.
+  Copyright (c) Facebook, Inc. All rights reserved.
+  Copyright (c) 2023-2024 Igor Pavlov.
 
-    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Text of the "BSD 3-clause License"
+----------------------------------
 
-    1.  Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-    2.  Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer
-        in the documentation and/or other materials provided with the distribution.
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
 
-    3.  Neither the name of the copyright holder(s) nor the names of any contributors may be used to endorse or promote products derived
-        from this software without specific prior written permission.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
 
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-    ----
+3. Neither the name of the copyright holder nor the names of its contributors may
+   be used to endorse or promote products derived from this software without
+   specific prior written permission.
 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+---
 
 
-  unRAR license restriction
-  -------------------------
 
-    The decompression engine for RAR archives was developed using source 
-    code of unRAR program.
-    All copyrights to original unRAR code are owned by Alexander Roshal.
 
-    The license for original unRAR code has the following restriction:
+BSD 2-clause License in 7-Zip code
+----------------------------------
 
-    The unRAR sources cannot be used to re-create the RAR compression algorithm, 
-    which is proprietary. Distribution of modified unRAR sources in separate form 
-    or as a part of other software is permitted, provided that it is clearly
-    stated in the documentation and source comments that the code may
-    not be used to develop a RAR (WinRAR) compatible archiver.
+  The "BSD 2-clause License" is used for the XXH64 code in 7-Zip.
+    C/Xxh64.c
 
+  XXH64 code in 7-Zip was derived from the original XXH64 code developed by Yann Collet.
 
-  --
-  Igor Pavlov
+  Copyright (c) 2012-2021 Yann Collet.
+  Copyright (c) 2023-2024 Igor Pavlov.
+
+Text of the "BSD 2-clause License"
+----------------------------------
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+---
+
+
+
+
+unRAR license restriction
+-------------------------
+
+The decompression engine for RAR archives was developed using source
+code of unRAR program.
+All copyrights to original unRAR code are owned by Alexander Roshal.
+
+The license for original unRAR code has the following restriction:
+
+  The unRAR sources cannot be used to re-create the RAR compression algorithm,
+  which is proprietary. Distribution of modified unRAR sources in separate form
+  or as a part of other software is permitted, provided that it is clearly
+  stated in the documentation and source comments that the code may
+  not be used to develop a RAR (WinRAR) compatible archiver.
+
+--
diff --git a/mingw64/share/doc/7zip/Methods.txt b/mingw64/share/doc/7zip/Methods.txt
@@ -1,8 +1,8 @@
 7-Zip method IDs for 7z and xz archives
 ---------------------------------------
 
-Version: 23.01
-Date: 2023-06-30
+Version: 24.02
+Date: 2024-03-22
 
 Each compression or crypto method in 7z is associated with unique binary value (ID).
 The length of ID in bytes is arbitrary but it can not exceed 63 bits (8 bytes).
@@ -38,6 +38,7 @@ List of defined IDs
 08 - ARMT (little-endian)
 09 - SPARC
 0A - ARM64
+0B - RISCV
 
 21 - LZMA2
 

diff --git a/mingw64/share/doc/7zip/lzma.txt b/mingw64/share/doc/7zip/lzma.txt
@@ -1,6 +1,6 @@
 LZMA compression
 ----------------
-Version: 23.01
+Version: 24.05
 
 This file describes LZMA encoding and decoding functions written in C language.
 

diff --git a/mingw64/share/doc/7zip/readme.txt b/mingw64/share/doc/7zip/readme.txt
@@ -1,9 +1,9 @@
-7-Zip 23.01 Sources
+7-Zip 24.05 Sources
 -------------------
 
 7-Zip is a file archiver for Windows. 
 
-7-Zip Copyright (C) 1999-2023 Igor Pavlov.
+7-Zip Copyright (C) 1999-2024 Igor Pavlov.
 
 
 License Info

diff --git a/mingw64/share/doc/7zip/src-history.txt b/mingw64/share/doc/7zip/src-history.txt
@@ -1,6 +1,52 @@
 HISTORY of the 7-Zip source code
 --------------------------------
 
+24.05          2024-05-14
+-------------------------
+- New switch -myv={MMNN} to set decoder compatibility version for 7z archive creating.
+  {MMNN} is 4-digit number that represents the version of 7-Zip without a dot.
+  If -myv={MMNN} switch is specified, 7-Zip will only use compression methods that can 
+  be decoded by the specified version {MMNN} of 7-Zip and newer versions.
+  If -myv={MMNN} switch is not specified, -myv=2300 is used, and 7-Zip will only
+  use compression methods that can be decoded by 7-Zip 23.00 and newer versions.
+- New switch -myfa={FilterID} to    allow 7-Zip to use the specified filter method for 7z archive creating.
+- New switch -myfd={FilterID} to disallow 7-Zip to use the specified filter method for 7z archive creating.
+
+
+24.03          2024-03-23
+-------------------------
+- 7-Zip now can use new RISCV filter for compression to 7z and xz archives.
+  RISCV filter can increase compression ratio for data containing executable
+  files compiled for RISC-V architecture.
+- The speed for LZMA and LZMA2 decompression in ARM64 version for Windows
+  was increased by 20%-60%.
+  It uses arm64 assembler code, and clang-cl is required for arm64 assembler code compiling.
+- Some bugs were fixed.
+
+
+24.01          2024-01-31
+-------------------------
+- 7-Zip uses file C/Precomp.h that is included to all c and c++ files.
+  CPP/Common/Common.h also includes C/Precomp.h.
+  C/Precomp.h defines the following macros (if _WIN32 is defined):
+    Z7_LARGE_PAGES 1
+    Z7_LONG_PATH 1
+    Z7_WIN32_WINNT_MIN  0x0500 (or higher)
+    _WIN32_WINNT        0x0500 (or higher)
+    WINVER  _WIN32_WINNT
+    UNICODE 1
+    _UNICODE 1
+  if _WIN32_WINNT is defined already, C/Precomp.h doesn't redefine it.
+
+- 7-Zip now can unpack ZSTD archives (.zst extension).
+- 7-Zip now can unpack ZIP and SquashFS archives that use ZSTD compression method.
+- 7-Zip now supports fast hash algorithm XXH64 that is used in ZSTD.
+- Speed optimizations for archive unpacking: rar, zip, gz, wim, cab.
+- Speed optimizations for hash caclulation: CRC-32, CRC-64, Blake2sp.
+- The bug was fixed: 7-Zip for Linux could fail for multivolume creation in some cases.
+- Some bugs were fixed.
+
+
 23.01          2023-06-20
 -------------------------
 - All external macros for compiling C/C++ code of 7-Zip now have Z7_ prefix.

diff --git a/var/lib/pacman/local/mingw-w64-x86_64-7zip-23.01-1/mtree b/var/lib/pacman/local/mingw-w64-x86_64-7zip-23.01-1/mtree
diff --git a/.../local/mingw-w64-x86_64-7zip-23.01-1/desc → .../local/mingw-w64-x86_64-7zip-24.05-1/desc b/.../local/mingw-w64-x86_64-7zip-23.01-1/desc → .../local/mingw-w64-x86_64-7zip-24.05-1/desc
@@ -2,7 +2,7 @@
 mingw-w64-x86_64-7zip
 
 %VERSION%
-23.01-1
+24.05-1
 
 %BASE%
 mingw-w64-7zip
@@ -17,23 +17,27 @@ https://7-zip.org
 any
 
 %BUILDDATE%
-1692922000
+1716098630
 
 %INSTALLDATE%
-1694415466
+1716173980
 
 %PACKAGER%
-CI (msys2/msys2-autobuild/f368fb49/5970138560)
+CI (msys2/msys2-autobuild/9c7e8d31/9145491394)
 
 %SIZE%
-3625238
+3355204
 
 %LICENSE%
-LGPL
+spdx:LGPL-2.1-or-later AND BSD-3-Clause
 
 %VALIDATION%
+sha256
 pgp
 
 %DEPENDS%
 mingw-w64-x86_64-gcc-libs
 
+%XDATA%
+pkgtype=pkg
+
diff --git a/...local/mingw-w64-x86_64-7zip-23.01-1/files → ...local/mingw-w64-x86_64-7zip-24.05-1/files b/...local/mingw-w64-x86_64-7zip-23.01-1/files → ...local/mingw-w64-x86_64-7zip-24.05-1/files
diff --git a/var/lib/pacman/local/mingw-w64-x86_64-7zip-24.05-1/mtree b/var/lib/pacman/local/mingw-w64-x86_64-7zip-24.05-1/mtree
diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.636.2db97b993-1/desc b/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.636.2db97b993-1/desc
@@ -20,7 +20,7 @@ any
 1682971619
 
 %INSTALLDATE%
-1716001199
+1716173985
 
 %PACKAGER%
 Johannes Schindelin <[email protected]>

diff --git a/var/lib/pacman/local/mingw-w64-x86_64-libzip-1.10.1-1/mtree b/var/lib/pacman/local/mingw-w64-x86_64-libzip-1.10.1-1/mtree