Update 2 packages

liblzma (5.6.1-2 -> 5.6.2-1) xz (5.6.1-2 -> 5.6.2-1) Signed-off-by: Git for Windows Build Agent <[email protected]>
git-for-windows · May 31, 2024 · 28a6cb0 · 28a6cb0
1 parent 66e0b78
commit 28a6cb0
Show file tree

Hide file tree

Showing 151 changed files with 1,120 additions and 1,066 deletions.
diff --git a/usr/bin/lzcat.exe b/usr/bin/lzcat.exe
diff --git a/usr/bin/lzcmp b/usr/bin/lzcmp
@@ -31,7 +31,7 @@ case ${0##*/} in
   *)     prog=xzdiff; cmp=${DIFF:-diff};;
 esac
 
-version="$prog (XZ Utils) 5.6.1"
+version="$prog (XZ Utils) 5.6.2"
 
 usage="Usage: ${0##*/} [OPTION]... FILE1 [FILE2]
 Compare FILE1 to FILE2, using their uncompressed contents if they are

diff --git a/usr/bin/lzdiff b/usr/bin/lzdiff
@@ -31,7 +31,7 @@ case ${0##*/} in
   *)     prog=xzdiff; cmp=${DIFF:-diff};;
 esac
 
-version="$prog (XZ Utils) 5.6.1"
+version="$prog (XZ Utils) 5.6.2"
 
 usage="Usage: ${0##*/} [OPTION]... FILE1 [FILE2]
 Compare FILE1 to FILE2, using their uncompressed contents if they are

diff --git a/usr/bin/lzegrep b/usr/bin/lzegrep
@@ -35,7 +35,7 @@ case ${0##*/} in
   *)       prog=xzgrep; grep=${GREP:-grep};;
 esac
 
-version="$prog (XZ Utils) 5.6.1"
+version="$prog (XZ Utils) 5.6.2"
 
 usage="Usage: ${0##*/} [OPTION]... [-e] PATTERN [FILE]...
 Look for instances of PATTERN in the input FILEs, using their
@@ -277,7 +277,7 @@ for i; do
     test "$(kill -l "$xz_status" 2> /dev/null)" != "PIPE" && exit "$xz_status"
   elif test "$xz_status" -gt 0; then
     # Decompression failed but we will continue with the remaining
-    # files anwyway. Set exit status to at least 2 to indicate an error.
+    # files anyway. Set exit status to at least 2 to indicate an error.
     test "$r" -lt 2 && r=2
   fi
 

diff --git a/usr/bin/lzfgrep b/usr/bin/lzfgrep
@@ -35,7 +35,7 @@ case ${0##*/} in
   *)       prog=xzgrep; grep=${GREP:-grep};;
 esac
 
-version="$prog (XZ Utils) 5.6.1"
+version="$prog (XZ Utils) 5.6.2"
 
 usage="Usage: ${0##*/} [OPTION]... [-e] PATTERN [FILE]...
 Look for instances of PATTERN in the input FILEs, using their
@@ -277,7 +277,7 @@ for i; do
     test "$(kill -l "$xz_status" 2> /dev/null)" != "PIPE" && exit "$xz_status"
   elif test "$xz_status" -gt 0; then
     # Decompression failed but we will continue with the remaining
-    # files anwyway. Set exit status to at least 2 to indicate an error.
+    # files anyway. Set exit status to at least 2 to indicate an error.
     test "$r" -lt 2 && r=2
   fi
 

diff --git a/usr/bin/lzgrep b/usr/bin/lzgrep
@@ -35,7 +35,7 @@ case ${0##*/} in
   *)       prog=xzgrep; grep=${GREP:-grep};;
 esac
 
-version="$prog (XZ Utils) 5.6.1"
+version="$prog (XZ Utils) 5.6.2"
 
 usage="Usage: ${0##*/} [OPTION]... [-e] PATTERN [FILE]...
 Look for instances of PATTERN in the input FILEs, using their
@@ -277,7 +277,7 @@ for i; do
     test "$(kill -l "$xz_status" 2> /dev/null)" != "PIPE" && exit "$xz_status"
   elif test "$xz_status" -gt 0; then
     # Decompression failed but we will continue with the remaining
-    # files anwyway. Set exit status to at least 2 to indicate an error.
+    # files anyway. Set exit status to at least 2 to indicate an error.
     test "$r" -lt 2 && r=2
   fi
 

diff --git a/usr/bin/lzless b/usr/bin/lzless
@@ -24,7 +24,7 @@
 # specified via XZ_OPT.
 xz='xz --format=auto'
 
-version='xzless (XZ Utils) 5.6.1'
+version='xzless (XZ Utils) 5.6.2'
 
 usage="Usage: ${0##*/} [OPTION]... [FILE]...
 Like 'less', but operate on the uncompressed contents of xz compressed FILEs.

diff --git a/usr/bin/lzma.exe b/usr/bin/lzma.exe
diff --git a/usr/bin/lzmadec.exe b/usr/bin/lzmadec.exe
diff --git a/usr/bin/lzmainfo.exe b/usr/bin/lzmainfo.exe
diff --git a/usr/bin/lzmore b/usr/bin/lzmore
@@ -24,7 +24,7 @@
 # specified via XZ_OPT.
 xz='xz --format=auto'
 
-version='xzmore (XZ Utils) 5.6.1'
+version='xzmore (XZ Utils) 5.6.2'
 
 usage="Usage: ${0##*/} [OPTION]... [FILE]...
 Like 'more', but operate on the uncompressed contents of xz compressed FILEs.

diff --git a/usr/bin/msys-lzma-5.dll b/usr/bin/msys-lzma-5.dll
diff --git a/usr/bin/unlzma.exe b/usr/bin/unlzma.exe
diff --git a/usr/bin/unxz.exe b/usr/bin/unxz.exe
diff --git a/usr/bin/xz.exe b/usr/bin/xz.exe
diff --git a/usr/bin/xzcat.exe b/usr/bin/xzcat.exe
diff --git a/usr/bin/xzcmp b/usr/bin/xzcmp
@@ -31,7 +31,7 @@ case ${0##*/} in
   *)     prog=xzdiff; cmp=${DIFF:-diff};;
 esac
 
-version="$prog (XZ Utils) 5.6.1"
+version="$prog (XZ Utils) 5.6.2"
 
 usage="Usage: ${0##*/} [OPTION]... FILE1 [FILE2]
 Compare FILE1 to FILE2, using their uncompressed contents if they are

diff --git a/usr/bin/xzdec.exe b/usr/bin/xzdec.exe
diff --git a/usr/bin/xzdiff b/usr/bin/xzdiff
@@ -31,7 +31,7 @@ case ${0##*/} in
   *)     prog=xzdiff; cmp=${DIFF:-diff};;
 esac
 
-version="$prog (XZ Utils) 5.6.1"
+version="$prog (XZ Utils) 5.6.2"
 
 usage="Usage: ${0##*/} [OPTION]... FILE1 [FILE2]
 Compare FILE1 to FILE2, using their uncompressed contents if they are

diff --git a/usr/bin/xzegrep b/usr/bin/xzegrep
@@ -35,7 +35,7 @@ case ${0##*/} in
   *)       prog=xzgrep; grep=${GREP:-grep};;
 esac
 
-version="$prog (XZ Utils) 5.6.1"
+version="$prog (XZ Utils) 5.6.2"
 
 usage="Usage: ${0##*/} [OPTION]... [-e] PATTERN [FILE]...
 Look for instances of PATTERN in the input FILEs, using their
@@ -277,7 +277,7 @@ for i; do
     test "$(kill -l "$xz_status" 2> /dev/null)" != "PIPE" && exit "$xz_status"
   elif test "$xz_status" -gt 0; then
     # Decompression failed but we will continue with the remaining
-    # files anwyway. Set exit status to at least 2 to indicate an error.
+    # files anyway. Set exit status to at least 2 to indicate an error.
     test "$r" -lt 2 && r=2
   fi
 

diff --git a/usr/bin/xzfgrep b/usr/bin/xzfgrep
@@ -35,7 +35,7 @@ case ${0##*/} in
   *)       prog=xzgrep; grep=${GREP:-grep};;
 esac
 
-version="$prog (XZ Utils) 5.6.1"
+version="$prog (XZ Utils) 5.6.2"
 
 usage="Usage: ${0##*/} [OPTION]... [-e] PATTERN [FILE]...
 Look for instances of PATTERN in the input FILEs, using their
@@ -277,7 +277,7 @@ for i; do
     test "$(kill -l "$xz_status" 2> /dev/null)" != "PIPE" && exit "$xz_status"
   elif test "$xz_status" -gt 0; then
     # Decompression failed but we will continue with the remaining
-    # files anwyway. Set exit status to at least 2 to indicate an error.
+    # files anyway. Set exit status to at least 2 to indicate an error.
     test "$r" -lt 2 && r=2
   fi
 

diff --git a/usr/bin/xzgrep b/usr/bin/xzgrep
@@ -35,7 +35,7 @@ case ${0##*/} in
   *)       prog=xzgrep; grep=${GREP:-grep};;
 esac
 
-version="$prog (XZ Utils) 5.6.1"
+version="$prog (XZ Utils) 5.6.2"
 
 usage="Usage: ${0##*/} [OPTION]... [-e] PATTERN [FILE]...
 Look for instances of PATTERN in the input FILEs, using their
@@ -277,7 +277,7 @@ for i; do
     test "$(kill -l "$xz_status" 2> /dev/null)" != "PIPE" && exit "$xz_status"
   elif test "$xz_status" -gt 0; then
     # Decompression failed but we will continue with the remaining
-    # files anwyway. Set exit status to at least 2 to indicate an error.
+    # files anyway. Set exit status to at least 2 to indicate an error.
     test "$r" -lt 2 && r=2
   fi
 

diff --git a/usr/bin/xzless b/usr/bin/xzless
@@ -24,7 +24,7 @@
 # specified via XZ_OPT.
 xz='xz --format=auto'
 
-version='xzless (XZ Utils) 5.6.1'
+version='xzless (XZ Utils) 5.6.2'
 
 usage="Usage: ${0##*/} [OPTION]... [FILE]...
 Like 'less', but operate on the uncompressed contents of xz compressed FILEs.

diff --git a/usr/bin/xzmore b/usr/bin/xzmore
@@ -24,7 +24,7 @@
 # specified via XZ_OPT.
 xz='xz --format=auto'
 
-version='xzmore (XZ Utils) 5.6.1'
+version='xzmore (XZ Utils) 5.6.2'
 
 usage="Usage: ${0##*/} [OPTION]... [FILE]...
 Like 'more', but operate on the uncompressed contents of xz compressed FILEs.

diff --git a/usr/share/doc/xz/AUTHORS b/usr/share/doc/xz/AUTHORS
@@ -2,8 +2,8 @@
 Authors of XZ Utils
 ===================
 
-    XZ Utils is developed and maintained by Lasse Collin
-    <[email protected]> and Jia Tan <[email protected]>.
+    XZ Utils is developed and maintained by
+    Lasse Collin <[email protected]>.
 
     Major parts of liblzma are based on code written by Igor Pavlov,
     specifically the LZMA SDK <https://7-zip.org/sdk.html>. Without
@@ -30,6 +30,11 @@ Authors of XZ Utils
       - Jonathan Nieder
       - Joachim Henke
 
+    Special author: Jia Tan was a co-maintainer in 2022-2024. He and
+    the team behind him inserted a backdoor (CVE-2024-3094) into
+    XZ Utils 5.6.0 and 5.6.1 releases. He suddenly disappeared when
+    this was discovered.
+
     Many people have contributed improvements or reported bugs.
     Most of these people are mentioned in the file THANKS.
 

diff --git a/usr/share/doc/xz/COPYING b/usr/share/doc/xz/COPYING
@@ -3,8 +3,7 @@ XZ Utils Licensing
 ==================
 
     Different licenses apply to different files in this package. Here
-    is a rough summary of which licenses apply to which parts of this
-    package (but check the individual files to be sure!):
+    is a summary of which licenses apply to which parts of this package:
 
       - liblzma is under the BSD Zero Clause License (0BSD).
 
@@ -25,20 +24,6 @@ XZ Utils Licensing
         lzma-file-format.xt are in the public domain but may
         be distributed under the terms of 0BSD too.
 
-      - Doxygen-generated HTML version of the liblzma API documentation:
-        While Doxygen is under the GNU GPLv2, the license information
-        in Doxygen includes the following exception:
-
-            Documents produced by doxygen are derivative works
-            derived from the input used in their production;
-            they are not affected by this license.
-
-        Note: The JavaScript files (under the MIT license) have
-        been removed from the Doxygen output.
-
-      - The XZ logo (xz-logo.png) included in the Doxygen-generated
-        documentation is under the Creative Commons BY-SA 4.0 license.
-
       - Translated messages and man pages are under 0BSD except that
         some old translations are in the public domain.
 
@@ -51,8 +36,9 @@ XZ Utils Licensing
         These files don't affect the licensing of the binaries being
         built.
 
-      - The extra directory contain files that are under various
-        free software licenses.
+      - The 'extra' directory contains files that are under various
+        free software licenses. These aren't built or installed as
+        part of XZ Utils.
 
     For the files under the BSD Zero Clause License (0BSD), if
     a copyright notice is needed, the following is sufficient:
@@ -65,16 +51,13 @@ XZ Utils Licensing
     it is not legally required by the license terms. Here is an example
     of a good notice to put into "about box" or into documentation:
 
-        This software includes code from XZ Utils
-        <https://xz.tukaani.org/xz-utils/>.
+        This software includes code from XZ Utils <https://tukaani.org/xz/>.
 
     The following license texts are included in the following files:
       - COPYING.0BSD: BSD Zero Clause License
       - COPYING.LGPLv2.1: GNU Lesser General Public License version 2.1
       - COPYING.GPLv2: GNU General Public License version 2
       - COPYING.GPLv3: GNU General Public License version 3
-      - COPYING.CC-BY-SA-4.0: Creative Commons Attribution-ShareAlike 4.0
-                              International Public License
 
     A note about old XZ Utils releases: