MFV: xz 5.4.5

MFC after: 2 weeks
dzvon · Nov 26, 2023 · ca6a637 · ca6a637
2 parents a9758e4 + 039b23c
commit ca6a637
Show file tree

Hide file tree

Showing 36 changed files with 1,298 additions and 174 deletions.
diff --git a/contrib/xz/ChangeLog b/contrib/xz/ChangeLog
diff --git a/contrib/xz/FREEBSD-Xlist b/contrib/xz/FREEBSD-Xlist
@@ -1,4 +1,3 @@
-$FreeBSD$
 */*/*/Makefile.*
 */*/Makefile.*
 */.gitignore

diff --git a/contrib/xz/FREEBSD-upgrade b/contrib/xz/FREEBSD-upgrade
@@ -1,5 +1,3 @@
-$FreeBSD$
-
 xz
 
 The source code is pulled with git:

diff --git a/contrib/xz/THANKS b/contrib/xz/THANKS
@@ -19,6 +19,7 @@ has been important. :-) In alphabetical order:
   - Jakub Bogusz
   - Adam Borowski
   - Maarten Bosmans
+  - Lukas Braune
   - Benjamin Buch
   - Trent W. Buck
   - Kevin R. Bulgrien
@@ -64,6 +65,7 @@ has been important. :-) In alphabetical order:
   - Jouk Jansen
   - Jun I Jin
   - Kiyoshi Kanazawa
+  - Joona Kannisto
   - Per Øyvind Karlsen
   - Iouri Kharon
   - Thomas Klausner
@@ -127,6 +129,7 @@ has been important. :-) In alphabetical order:
   - Torsten Rupp
   - Stephen Sachs
   - Jukka Salmi
+  - Agostino Sarubbo
   - Alexandre Sauvé
   - Benno Schulenberg
   - Andreas Schwab
@@ -138,6 +141,7 @@ has been important. :-) In alphabetical order:
   - Brad Smith
   - Bruce Stark
   - Pippijn van Steenhoven
+  - Martin Storsjö
   - Jonathan Stott
   - Dan Stromberg
   - Jia Tan

diff --git a/contrib/xz/doxygen/Doxyfile b/contrib/xz/doxygen/Doxyfile
@@ -2277,8 +2277,11 @@ INCLUDE_FILE_PATTERNS  =
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 PREDEFINED             = LZMA_API(type)=type \
-                         LZMA_API_IMPORT \
-                         LZMA_API_CALL=
+                         LZMA_API_IMPORT= \
+                         LZMA_API_CALL= \
+                         tuklib_attr_noreturn= \
+                         lzma_attribute(attr)= \
+                         lzma_attr_alloc_size(size)=
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The

diff --git a/contrib/xz/src/common/mythread.h b/contrib/xz/src/common/mythread.h
@@ -378,7 +378,7 @@ typedef struct {
 			abort(); \
 		if (pending_) { \
 			func(); \
-			if (!InitOnceComplete(&once, 0, NULL)) \
+			if (!InitOnceComplete(&once_, 0, NULL)) \
 				abort(); \
 		} \
 	} while (0)

diff --git a/contrib/xz/src/common/sysdefs.h b/contrib/xz/src/common/sysdefs.h
@@ -24,7 +24,15 @@
 #	include <config.h>
 #endif
 
-// Get standard-compliant stdio functions under MinGW and MinGW-w64.
+// This #define ensures that C99 and POSIX compliant stdio functions are
+// available with MinGW-w64 (both 32-bit and 64-bit). Modern MinGW-w64 adds
+// this automatically, for example, when the compiler is in C99 (or later)
+// mode when building against msvcrt.dll. It still doesn't hurt to be explicit
+// that we always want this and #define this unconditionally.
+//
+// With Universal CRT (UCRT) this is less important because UCRT contains
+// C99-compatible stdio functions. It's still nice to #define this as UCRT
+// doesn't support the POSIX thousand separator flag in printf (like "%'u").
 #ifdef __MINGW32__
 #	define __USE_MINGW_ANSI_STDIO 1
 #endif