git-for-windows · dscho · Jan 26, 2025 · Jan 26, 2025 · Jan 26, 2025
diff --git a/etc/pacman.conf b/etc/pacman.conf
@@ -21,7 +21,7 @@ HoldPkg     = pacman
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-IgnorePkg   = msys2-runtime msys2-runtime-devel
+# IgnorePkg   =
 #IgnoreGroup =
 
 #NoUpgrade   =

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

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

diff --git a/mingw32/bin/xzegrep b/mingw32/bin/xzegrep
@@ -35,7 +35,7 @@ case ${0##*/} in
   *)       prog=xzgrep; grep=${GREP:-grep};;
 esac
 
-version="$prog (XZ Utils) 5.6.3"
+version="$prog (XZ Utils) 5.6.4"
 
 usage="Usage: ${0##*/} [OPTION]... [-e] PATTERN [FILE]...
 Look for instances of PATTERN in the input FILEs, using their

diff --git a/mingw32/bin/xzfgrep b/mingw32/bin/xzfgrep
@@ -35,7 +35,7 @@ case ${0##*/} in
   *)       prog=xzgrep; grep=${GREP:-grep};;
 esac
 
-version="$prog (XZ Utils) 5.6.3"
+version="$prog (XZ Utils) 5.6.4"
 
 usage="Usage: ${0##*/} [OPTION]... [-e] PATTERN [FILE]...
 Look for instances of PATTERN in the input FILEs, using their

diff --git a/mingw32/bin/xzgrep b/mingw32/bin/xzgrep
@@ -35,7 +35,7 @@ case ${0##*/} in
   *)       prog=xzgrep; grep=${GREP:-grep};;
 esac
 
-version="$prog (XZ Utils) 5.6.3"
+version="$prog (XZ Utils) 5.6.4"
 
 usage="Usage: ${0##*/} [OPTION]... [-e] PATTERN [FILE]...
 Look for instances of PATTERN in the input FILEs, using their

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

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

diff --git a/mingw32/include/lzma/lzma12.h b/mingw32/include/lzma/lzma12.h
@@ -461,7 +461,7 @@ typedef struct {
 	 *
 	 * ext_size_low holds the least significant 32 bits of the
 	 * uncompressed size. The most significant 32 bits must be set
-	 * in ext_size_high. The macro lzma_ext_size_set(opt_lzma, u64size)
+	 * in ext_size_high. The macro lzma_set_ext_size(opt_lzma, u64size)
 	 * can be used to set these members.
 	 *
 	 * The 64-bit uncompressed size is split into two uint32_t variables

diff --git a/mingw32/include/lzma/version.h b/mingw32/include/lzma/version.h
@@ -22,7 +22,7 @@
 #define LZMA_VERSION_MINOR 6
 
 /** \brief Patch version number of the liblzma release. */
-#define LZMA_VERSION_PATCH 3
+#define LZMA_VERSION_PATCH 4
 
 /**
  * \brief Version stability marker

diff --git a/mingw32/lib/liblzma.a b/mingw32/lib/liblzma.a
diff --git a/mingw32/lib/pkgconfig/liblzma.pc b/mingw32/lib/pkgconfig/liblzma.pc
@@ -9,7 +9,7 @@ includedir=/mingw32/include
 Name: liblzma
 Description: General purpose data compression library
 URL: https://tukaani.org/xz/
-Version: 5.6.3
+Version: 5.6.4
 Cflags: -I${includedir}
 Cflags.private: -DLZMA_API_STATIC
 Libs: -L${libdir} -llzma

diff --git a/mingw32/share/doc/xz/NEWS b/mingw32/share/doc/xz/NEWS
@@ -2,10 +2,56 @@
 XZ Utils Release Notes
 ======================
 
+5.6.4 (2025-01-23)
+
+    * liblzma: Fix LZMA/LZMA2 encoder on big endian ARM64.
+
+    * xz:
+
+        - Fix --filters= and --filters1= ... --filters9= options
+          parsing. They require an argument, thus "xz --filters lzma2"
+          should work in addition to "xz --filters=lzma2".
+
+        - On the man page, note in the --compress and --decompress
+          options that the default behavior is to delete the input
+          file unless writing to standard output. It was already
+          documented in the DESCRIPTION section but new users in
+          a hurry might miss it.
+
+    * Windows (native builds, not Cygwin): Fix regressions introduced
+      in XZ Utils 5.6.3 which caused non-ASCII characters to display
+      incorrectly. Only builds with translation support were affected
+      (--enable-nls or ENABLE_NLS=ON). The following changes affect
+      builds that have translations enabled:
+
+        - Require UCRT because MSVCRT doesn't support UTF-8
+          locales and thus translations won't be readable on
+          Windows 10 version 1903 and later. (MSVCRT builds
+          are still possible with --disable-nls or ENABLE_NLS=OFF.)
+
+        - Require gettext-runtime >= 0.23.1 because older versions
+          don't autodetect the use of the UTF-8 code page. This
+          resulted in garbled non-ASCII characters even with UCRT.
+
+        - Partially fix alignment issues in xz --verbose --list
+          with translated messages. Chinese (simplified),
+          Chinese (traditional), and Korean column headings
+          are misaligned still because Windows and MinGW-w64
+          don't provide wcwidth() and XZ Utils doesn't include
+          a replacement function either.
+
+    * CMake: Explicitly disable unity builds. This prevents build
+      failures when another project uses XZ Utils via CMake's
+      FetchContent module, and that project enables unity builds.
+
+    * Update Chinese (traditional) and Serbian translations.
+
+
 5.6.3 (2024-10-01)
 
     IMPORTANT: This includes a Windows-specific security fix to
-    the command line tools. liblzma isn't affected by this issue.
+    the command line tools (CVE-2024-47611). liblzma isn't affected
+    by this issue.
 
     * liblzma:
 
@@ -55,6 +101,7 @@ XZ Utils Release Notes
               which can be exploited with malicious filenames to do
               argument injection or directory traversal attacks.
               UTF-8 avoids best-fit mappings and thus fixes the issue.
+              (CVE-2024-47611)
 
               Forcing the process code page to UTF-8 is possible only
               on Windows 10 version 1903 and later. The command line

diff --git a/mingw32/share/doc/xz/THANKS b/mingw32/share/doc/xz/THANKS
@@ -34,12 +34,14 @@ has been important. :-) In alphabetical order:
   - Vitaly Chikunov
   - Antoine Cœur
   - Felix Collin
+  - Marcus Comstedt
   - Gabi Davar
   - İhsan Doğan
   - Chris Donawa
   - Andrew Dudman
   - Markus Duft
   - İsmail Dönmez
+  - Dexter Castor Döpping
   - Paul Eggert
   - Robert Elz
   - Gilles Espinasse
@@ -118,13 +120,15 @@ has been important. :-) In alphabetical order:
   - Alexander Neumann
   - Hongbo Ni
   - Jonathan Nieder
+  - Asgeir Storesund Nilsen
   - Andre Noll
   - Peter O'Gorman
   - Dimitri Papadopoulos Orfanos
   - Daniel Packard
   - Filip Palian
   - Peter Pallinger
   - Kai Pastor
+  - Keith Patton
   - Rui Paulo
   - Igor Pavlov
   - Diego Elio Pettenò
@@ -181,6 +185,7 @@ has been important. :-) In alphabetical order:
   - Christian Weisgerber
   - Dan Weiss
   - Bert Wesarg
+  - Mark Wielaard
   - Fredrik Wikstrom
   - Jim Wilcoxson
   - Ralf Wildenhues

diff --git a/mingw32/share/locale/ca/LC_MESSAGES/xz.mo b/mingw32/share/locale/ca/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/cs/LC_MESSAGES/xz.mo b/mingw32/share/locale/cs/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/da/LC_MESSAGES/xz.mo b/mingw32/share/locale/da/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/de/LC_MESSAGES/xz.mo b/mingw32/share/locale/de/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/eo/LC_MESSAGES/xz.mo b/mingw32/share/locale/eo/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/es/LC_MESSAGES/xz.mo b/mingw32/share/locale/es/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/fi/LC_MESSAGES/xz.mo b/mingw32/share/locale/fi/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/fr/LC_MESSAGES/xz.mo b/mingw32/share/locale/fr/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/hr/LC_MESSAGES/xz.mo b/mingw32/share/locale/hr/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/hu/LC_MESSAGES/xz.mo b/mingw32/share/locale/hu/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/it/LC_MESSAGES/xz.mo b/mingw32/share/locale/it/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/ko/LC_MESSAGES/xz.mo b/mingw32/share/locale/ko/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/pl/LC_MESSAGES/xz.mo b/mingw32/share/locale/pl/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/pt/LC_MESSAGES/xz.mo b/mingw32/share/locale/pt/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/pt_BR/LC_MESSAGES/xz.mo b/mingw32/share/locale/pt_BR/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/ro/LC_MESSAGES/xz.mo b/mingw32/share/locale/ro/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/sr/LC_MESSAGES/xz.mo b/mingw32/share/locale/sr/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/sv/LC_MESSAGES/xz.mo b/mingw32/share/locale/sv/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/tr/LC_MESSAGES/xz.mo b/mingw32/share/locale/tr/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/uk/LC_MESSAGES/xz.mo b/mingw32/share/locale/uk/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/vi/LC_MESSAGES/xz.mo b/mingw32/share/locale/vi/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/zh_CN/LC_MESSAGES/xz.mo b/mingw32/share/locale/zh_CN/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/locale/zh_TW/LC_MESSAGES/xz.mo b/mingw32/share/locale/zh_TW/LC_MESSAGES/xz.mo
diff --git a/mingw32/share/man/de/man1/lzmadec.1.gz b/mingw32/share/man/de/man1/lzmadec.1.gz
diff --git a/mingw32/share/man/de/man1/lzmainfo.1.gz b/mingw32/share/man/de/man1/lzmainfo.1.gz
diff --git a/mingw32/share/man/de/man1/unxz.1.gz b/mingw32/share/man/de/man1/unxz.1.gz
diff --git a/mingw32/share/man/de/man1/xz.1.gz b/mingw32/share/man/de/man1/xz.1.gz
diff --git a/mingw32/share/man/de/man1/xzcat.1.gz b/mingw32/share/man/de/man1/xzcat.1.gz
diff --git a/mingw32/share/man/de/man1/xzcmp.1.gz b/mingw32/share/man/de/man1/xzcmp.1.gz
diff --git a/mingw32/share/man/de/man1/xzdec.1.gz b/mingw32/share/man/de/man1/xzdec.1.gz
diff --git a/mingw32/share/man/de/man1/xzdiff.1.gz b/mingw32/share/man/de/man1/xzdiff.1.gz
diff --git a/mingw32/share/man/de/man1/xzegrep.1.gz b/mingw32/share/man/de/man1/xzegrep.1.gz
diff --git a/mingw32/share/man/de/man1/xzfgrep.1.gz b/mingw32/share/man/de/man1/xzfgrep.1.gz
diff --git a/mingw32/share/man/de/man1/xzgrep.1.gz b/mingw32/share/man/de/man1/xzgrep.1.gz
diff --git a/mingw32/share/man/de/man1/xzless.1.gz b/mingw32/share/man/de/man1/xzless.1.gz
diff --git a/mingw32/share/man/de/man1/xzmore.1.gz b/mingw32/share/man/de/man1/xzmore.1.gz
diff --git a/mingw32/share/man/fr/man1/lzmadec.1.gz b/mingw32/share/man/fr/man1/lzmadec.1.gz
diff --git a/mingw32/share/man/fr/man1/lzmainfo.1.gz b/mingw32/share/man/fr/man1/lzmainfo.1.gz
diff --git a/mingw32/share/man/fr/man1/unxz.1.gz b/mingw32/share/man/fr/man1/unxz.1.gz
diff --git a/mingw32/share/man/fr/man1/xz.1.gz b/mingw32/share/man/fr/man1/xz.1.gz
diff --git a/mingw32/share/man/fr/man1/xzcat.1.gz b/mingw32/share/man/fr/man1/xzcat.1.gz
diff --git a/mingw32/share/man/fr/man1/xzdec.1.gz b/mingw32/share/man/fr/man1/xzdec.1.gz
diff --git a/mingw32/share/man/fr/man1/xzless.1.gz b/mingw32/share/man/fr/man1/xzless.1.gz
diff --git a/mingw32/share/man/ko/man1/lzmadec.1.gz b/mingw32/share/man/ko/man1/lzmadec.1.gz
diff --git a/mingw32/share/man/ko/man1/lzmainfo.1.gz b/mingw32/share/man/ko/man1/lzmainfo.1.gz
diff --git a/mingw32/share/man/ko/man1/unxz.1.gz b/mingw32/share/man/ko/man1/unxz.1.gz
diff --git a/mingw32/share/man/ko/man1/xz.1.gz b/mingw32/share/man/ko/man1/xz.1.gz
diff --git a/mingw32/share/man/ko/man1/xzcat.1.gz b/mingw32/share/man/ko/man1/xzcat.1.gz
diff --git a/mingw32/share/man/ko/man1/xzcmp.1.gz b/mingw32/share/man/ko/man1/xzcmp.1.gz
diff --git a/mingw32/share/man/ko/man1/xzdec.1.gz b/mingw32/share/man/ko/man1/xzdec.1.gz
diff --git a/mingw32/share/man/ko/man1/xzdiff.1.gz b/mingw32/share/man/ko/man1/xzdiff.1.gz
diff --git a/mingw32/share/man/ko/man1/xzegrep.1.gz b/mingw32/share/man/ko/man1/xzegrep.1.gz
diff --git a/mingw32/share/man/ko/man1/xzfgrep.1.gz b/mingw32/share/man/ko/man1/xzfgrep.1.gz
diff --git a/mingw32/share/man/ko/man1/xzgrep.1.gz b/mingw32/share/man/ko/man1/xzgrep.1.gz
diff --git a/mingw32/share/man/ko/man1/xzless.1.gz b/mingw32/share/man/ko/man1/xzless.1.gz
diff --git a/mingw32/share/man/ko/man1/xzmore.1.gz b/mingw32/share/man/ko/man1/xzmore.1.gz
diff --git a/mingw32/share/man/man1/unxz.1.gz b/mingw32/share/man/man1/unxz.1.gz
diff --git a/mingw32/share/man/man1/xz.1.gz b/mingw32/share/man/man1/xz.1.gz
diff --git a/mingw32/share/man/man1/xzcat.1.gz b/mingw32/share/man/man1/xzcat.1.gz
diff --git a/mingw32/share/man/pt_BR/man1/lzmadec.1.gz b/mingw32/share/man/pt_BR/man1/lzmadec.1.gz
diff --git a/mingw32/share/man/pt_BR/man1/lzmainfo.1.gz b/mingw32/share/man/pt_BR/man1/lzmainfo.1.gz
diff --git a/mingw32/share/man/pt_BR/man1/unxz.1.gz b/mingw32/share/man/pt_BR/man1/unxz.1.gz
diff --git a/mingw32/share/man/pt_BR/man1/xz.1.gz b/mingw32/share/man/pt_BR/man1/xz.1.gz
diff --git a/mingw32/share/man/pt_BR/man1/xzcat.1.gz b/mingw32/share/man/pt_BR/man1/xzcat.1.gz
diff --git a/mingw32/share/man/pt_BR/man1/xzdec.1.gz b/mingw32/share/man/pt_BR/man1/xzdec.1.gz
diff --git a/mingw32/share/man/pt_BR/man1/xzless.1.gz b/mingw32/share/man/pt_BR/man1/xzless.1.gz
diff --git a/mingw32/share/man/ro/man1/lzmadec.1.gz b/mingw32/share/man/ro/man1/lzmadec.1.gz
diff --git a/mingw32/share/man/ro/man1/lzmainfo.1.gz b/mingw32/share/man/ro/man1/lzmainfo.1.gz
diff --git a/mingw32/share/man/ro/man1/unxz.1.gz b/mingw32/share/man/ro/man1/unxz.1.gz
diff --git a/mingw32/share/man/ro/man1/xz.1.gz b/mingw32/share/man/ro/man1/xz.1.gz
diff --git a/mingw32/share/man/ro/man1/xzcat.1.gz b/mingw32/share/man/ro/man1/xzcat.1.gz
diff --git a/mingw32/share/man/ro/man1/xzcmp.1.gz b/mingw32/share/man/ro/man1/xzcmp.1.gz
diff --git a/mingw32/share/man/ro/man1/xzdec.1.gz b/mingw32/share/man/ro/man1/xzdec.1.gz
diff --git a/mingw32/share/man/ro/man1/xzdiff.1.gz b/mingw32/share/man/ro/man1/xzdiff.1.gz
diff --git a/mingw32/share/man/ro/man1/xzegrep.1.gz b/mingw32/share/man/ro/man1/xzegrep.1.gz
diff --git a/mingw32/share/man/ro/man1/xzfgrep.1.gz b/mingw32/share/man/ro/man1/xzfgrep.1.gz
diff --git a/mingw32/share/man/ro/man1/xzgrep.1.gz b/mingw32/share/man/ro/man1/xzgrep.1.gz
diff --git a/mingw32/share/man/ro/man1/xzless.1.gz b/mingw32/share/man/ro/man1/xzless.1.gz
diff --git a/mingw32/share/man/ro/man1/xzmore.1.gz b/mingw32/share/man/ro/man1/xzmore.1.gz
diff --git a/mingw32/share/man/uk/man1/lzmadec.1.gz b/mingw32/share/man/uk/man1/lzmadec.1.gz
diff --git a/mingw32/share/man/uk/man1/lzmainfo.1.gz b/mingw32/share/man/uk/man1/lzmainfo.1.gz
diff --git a/mingw32/share/man/uk/man1/unxz.1.gz b/mingw32/share/man/uk/man1/unxz.1.gz
diff --git a/mingw32/share/man/uk/man1/xz.1.gz b/mingw32/share/man/uk/man1/xz.1.gz
diff --git a/mingw32/share/man/uk/man1/xzcat.1.gz b/mingw32/share/man/uk/man1/xzcat.1.gz
diff --git a/mingw32/share/man/uk/man1/xzcmp.1.gz b/mingw32/share/man/uk/man1/xzcmp.1.gz
diff --git a/mingw32/share/man/uk/man1/xzdec.1.gz b/mingw32/share/man/uk/man1/xzdec.1.gz
diff --git a/mingw32/share/man/uk/man1/xzdiff.1.gz b/mingw32/share/man/uk/man1/xzdiff.1.gz
diff --git a/mingw32/share/man/uk/man1/xzegrep.1.gz b/mingw32/share/man/uk/man1/xzegrep.1.gz
diff --git a/mingw32/share/man/uk/man1/xzfgrep.1.gz b/mingw32/share/man/uk/man1/xzfgrep.1.gz
diff --git a/mingw32/share/man/uk/man1/xzgrep.1.gz b/mingw32/share/man/uk/man1/xzgrep.1.gz
diff --git a/mingw32/share/man/uk/man1/xzless.1.gz b/mingw32/share/man/uk/man1/xzless.1.gz
diff --git a/mingw32/share/man/uk/man1/xzmore.1.gz b/mingw32/share/man/uk/man1/xzmore.1.gz
diff --git a/mingw64/bin/liblzma-5.dll b/mingw64/bin/liblzma-5.dll
diff --git a/mingw64/bin/lzmadec.exe b/mingw64/bin/lzmadec.exe
diff --git a/mingw64/bin/lzmainfo.exe b/mingw64/bin/lzmainfo.exe
diff --git a/mingw64/bin/unxz.exe b/mingw64/bin/unxz.exe
diff --git a/mingw64/bin/xz.exe b/mingw64/bin/xz.exe
diff --git a/mingw64/bin/xzcat.exe b/mingw64/bin/xzcat.exe
diff --git a/mingw64/bin/xzcmp b/mingw64/bin/xzcmp
@@ -31,7 +31,7 @@ case ${0##*/} in
   *)     prog=xzdiff; cmp=${DIFF:-diff};;
 esac
 
-version="$prog (XZ Utils) 5.6.3"
+version="$prog (XZ Utils) 5.6.4"
 
 usage="Usage: ${0##*/} [OPTION]... FILE1 [FILE2]
 Compare FILE1 to FILE2, using their uncompressed contents if they are

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

diff --git a/mingw64/bin/xzegrep b/mingw64/bin/xzegrep
@@ -35,7 +35,7 @@ case ${0##*/} in
   *)       prog=xzgrep; grep=${GREP:-grep};;
 esac
 
-version="$prog (XZ Utils) 5.6.3"
+version="$prog (XZ Utils) 5.6.4"
 
 usage="Usage: ${0##*/} [OPTION]... [-e] PATTERN [FILE]...
 Look for instances of PATTERN in the input FILEs, using their

diff --git a/mingw64/bin/xzfgrep b/mingw64/bin/xzfgrep
@@ -35,7 +35,7 @@ case ${0##*/} in
   *)       prog=xzgrep; grep=${GREP:-grep};;
 esac
 
-version="$prog (XZ Utils) 5.6.3"
+version="$prog (XZ Utils) 5.6.4"
 
 usage="Usage: ${0##*/} [OPTION]... [-e] PATTERN [FILE]...
 Look for instances of PATTERN in the input FILEs, using their

diff --git a/mingw64/bin/xzgrep b/mingw64/bin/xzgrep
@@ -35,7 +35,7 @@ case ${0##*/} in
   *)       prog=xzgrep; grep=${GREP:-grep};;
 esac
 
-version="$prog (XZ Utils) 5.6.3"
+version="$prog (XZ Utils) 5.6.4"
 
 usage="Usage: ${0##*/} [OPTION]... [-e] PATTERN [FILE]...
 Look for instances of PATTERN in the input FILEs, using their

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

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

diff --git a/mingw64/include/lzma/lzma12.h b/mingw64/include/lzma/lzma12.h
@@ -461,7 +461,7 @@ typedef struct {
 	 *
 	 * ext_size_low holds the least significant 32 bits of the
 	 * uncompressed size. The most significant 32 bits must be set
-	 * in ext_size_high. The macro lzma_ext_size_set(opt_lzma, u64size)
+	 * in ext_size_high. The macro lzma_set_ext_size(opt_lzma, u64size)
 	 * can be used to set these members.
 	 *
 	 * The 64-bit uncompressed size is split into two uint32_t variables

diff --git a/mingw64/include/lzma/version.h b/mingw64/include/lzma/version.h
@@ -22,7 +22,7 @@
 #define LZMA_VERSION_MINOR 6
 
 /** \brief Patch version number of the liblzma release. */
-#define LZMA_VERSION_PATCH 3
+#define LZMA_VERSION_PATCH 4
 
 /**
  * \brief Version stability marker

diff --git a/mingw64/lib/liblzma.a b/mingw64/lib/liblzma.a
diff --git a/mingw64/lib/pkgconfig/liblzma.pc b/mingw64/lib/pkgconfig/liblzma.pc
@@ -9,7 +9,7 @@ includedir=/mingw64/include
 Name: liblzma
 Description: General purpose data compression library
 URL: https://tukaani.org/xz/
-Version: 5.6.3
+Version: 5.6.4
 Cflags: -I${includedir}
 Cflags.private: -DLZMA_API_STATIC
 Libs: -L${libdir} -llzma

diff --git a/mingw64/share/doc/xz/NEWS b/mingw64/share/doc/xz/NEWS
@@ -2,10 +2,56 @@
 XZ Utils Release Notes
 ======================
 
+5.6.4 (2025-01-23)
+
+    * liblzma: Fix LZMA/LZMA2 encoder on big endian ARM64.
+
+    * xz:
+
+        - Fix --filters= and --filters1= ... --filters9= options
+          parsing. They require an argument, thus "xz --filters lzma2"
+          should work in addition to "xz --filters=lzma2".
+
+        - On the man page, note in the --compress and --decompress
+          options that the default behavior is to delete the input
+          file unless writing to standard output. It was already
+          documented in the DESCRIPTION section but new users in
+          a hurry might miss it.
+
+    * Windows (native builds, not Cygwin): Fix regressions introduced
+      in XZ Utils 5.6.3 which caused non-ASCII characters to display
+      incorrectly. Only builds with translation support were affected
+      (--enable-nls or ENABLE_NLS=ON). The following changes affect
+      builds that have translations enabled:
+
+        - Require UCRT because MSVCRT doesn't support UTF-8
+          locales and thus translations won't be readable on
+          Windows 10 version 1903 and later. (MSVCRT builds
+          are still possible with --disable-nls or ENABLE_NLS=OFF.)
+
+        - Require gettext-runtime >= 0.23.1 because older versions
+          don't autodetect the use of the UTF-8 code page. This
+          resulted in garbled non-ASCII characters even with UCRT.
+
+        - Partially fix alignment issues in xz --verbose --list
+          with translated messages. Chinese (simplified),
+          Chinese (traditional), and Korean column headings
+          are misaligned still because Windows and MinGW-w64
+          don't provide wcwidth() and XZ Utils doesn't include
+          a replacement function either.
+
+    * CMake: Explicitly disable unity builds. This prevents build
+      failures when another project uses XZ Utils via CMake's
+      FetchContent module, and that project enables unity builds.
+
+    * Update Chinese (traditional) and Serbian translations.
+
+
 5.6.3 (2024-10-01)
 
     IMPORTANT: This includes a Windows-specific security fix to
-    the command line tools. liblzma isn't affected by this issue.
+    the command line tools (CVE-2024-47611). liblzma isn't affected
+    by this issue.
 
     * liblzma:
 
@@ -55,6 +101,7 @@ XZ Utils Release Notes
               which can be exploited with malicious filenames to do
               argument injection or directory traversal attacks.
               UTF-8 avoids best-fit mappings and thus fixes the issue.
+              (CVE-2024-47611)
 
               Forcing the process code page to UTF-8 is possible only
               on Windows 10 version 1903 and later. The command line

diff --git a/mingw64/share/doc/xz/THANKS b/mingw64/share/doc/xz/THANKS
@@ -34,12 +34,14 @@ has been important. :-) In alphabetical order:
   - Vitaly Chikunov
   - Antoine Cœur
   - Felix Collin
+  - Marcus Comstedt
   - Gabi Davar
   - İhsan Doğan
   - Chris Donawa
   - Andrew Dudman
   - Markus Duft
   - İsmail Dönmez
+  - Dexter Castor Döpping
   - Paul Eggert
   - Robert Elz
   - Gilles Espinasse
@@ -118,13 +120,15 @@ has been important. :-) In alphabetical order:
   - Alexander Neumann
   - Hongbo Ni
   - Jonathan Nieder
+  - Asgeir Storesund Nilsen
   - Andre Noll
   - Peter O'Gorman
   - Dimitri Papadopoulos Orfanos
   - Daniel Packard
   - Filip Palian
   - Peter Pallinger
   - Kai Pastor
+  - Keith Patton
   - Rui Paulo
   - Igor Pavlov
   - Diego Elio Pettenò
@@ -181,6 +185,7 @@ has been important. :-) In alphabetical order:
   - Christian Weisgerber
   - Dan Weiss
   - Bert Wesarg
+  - Mark Wielaard
   - Fredrik Wikstrom
   - Jim Wilcoxson
   - Ralf Wildenhues