4 files changed, 51 insertions, 7 deletions

diff --git a/lib/liblzma/Makefile b/lib/liblzma/Makefile
index 0bdcc6af5ddc..00731618a06c 100644
--- a/lib/liblzma/Makefile
+++ b/lib/liblzma/Makefile
@@ -40,6 +40,7 @@ SRCS+=	common.c \
 	hardware_cputhreads.c \
 	index.c \
 	stream_flags_common.c \
+	string_conversion.c \
 	vli_size.c \
 	alone_encoder.c \
 	block_buffer_encoder.c \
@@ -52,6 +53,9 @@ SRCS+=	common.c \
 	filter_encoder.c \
 	filter_flags_encoder.c \
 	index_encoder.c \
+	lzip_decoder.c \
+	microlzma_encoder.c \
+	microlzma_decoder.c \
 	stream_buffer_encoder.c \
 	stream_encoder.c \
 	stream_flags_encoder.c \
@@ -62,6 +66,7 @@ SRCS+=	common.c \
 	block_decoder.c \
 	block_header_decoder.c \
 	easy_decoder_memusage.c \
+	file_info.c \
 	filter_buffer_decoder.c \
 	filter_decoder.c \
 	filter_flags_decoder.c \
@@ -69,6 +74,7 @@ SRCS+=	common.c \
 	index_hash.c \
 	stream_buffer_decoder.c \
 	stream_decoder.c \
+	stream_decoder_mt.c \
 	stream_flags_decoder.c \
 	stream_encoder_mt.c \
 	vli_decoder.c \
@@ -119,6 +125,7 @@ SRCS+=	simple_coder.c \
 	powerpc.c \
 	ia64.c \
 	arm.c \
+	arm64.c \
 	armthumb.c \
 	sparc.c
 
diff --git a/lib/liblzma/Symbol.map b/lib/liblzma/Symbol.map
index c3208527764d..8e8fc10a2453 100644
--- a/lib/liblzma/Symbol.map
+++ b/lib/liblzma/Symbol.map
@@ -102,6 +102,18 @@ XZ_5.2 {
 	lzma_stream_encoder_mt_memusage;
 };
 
+XZ_5.4 {
+	lzma_file_info_decoder;
+	lzma_filters_free;
+	lzma_lzip_decoder;
+	lzma_microlzma_decoder;
+	lzma_microlzma_encoder;
+	lzma_stream_decoder_mt;
+	lzma_str_from_filters;
+	lzma_str_list_filters;
+	lzma_str_to_filters;
+};
+
 XZprivate_1.0 {
 	lzma_alloc;
 	lzma_alloc_zero;
diff --git a/lib/liblzma/Versions.def b/lib/liblzma/Versions.def
index 678624078b5b..f3e2b02c7a7c 100644
--- a/lib/liblzma/Versions.def
+++ b/lib/liblzma/Versions.def
@@ -6,6 +6,9 @@ XZ_5.0 {
 XZ_5.2 {
 } XZ_5.0;
 
-XZprivate_1.0 {
+XZ_5.4 {
 } XZ_5.2;
 
+XZprivate_1.0 {
+} XZ_5.4;
+
diff --git a/lib/liblzma/config.h b/lib/liblzma/config.h
index f19ebe9a421e..7f9d3265c120 100644
--- a/lib/liblzma/config.h
+++ b/lib/liblzma/config.h
@@ -75,6 +75,9 @@
 /* Define to 1 if arm decoder is enabled. */
 #define HAVE_DECODER_ARM 1
 
+/* Define to 1 if arm64 decoder is enabled. */
+#define HAVE_DECODER_ARM64 1
+
 /* Define to 1 if armthumb decoder is enabled. */
 #define HAVE_DECODER_ARMTHUMB 1
 
@@ -108,6 +111,9 @@
 /* Define to 1 if arm encoder is enabled. */
 #define HAVE_ENCODER_ARM 1
 
+/* Define to 1 if arm64 encoder is enabled. */
+#define HAVE_ENCODER_ARM64 1
+
 /* Define to 1 if armthumb encoder is enabled. */
 #define HAVE_ENCODER_ARMTHUMB 1
 
@@ -135,6 +141,10 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
+/* Define to 1 if __attribute__((__constructor__)) is supported for functions.
+   */
+#define HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR 1
+
 /* Define to 1 if you have the `futimens' function. */
 #define HAVE_FUTIMENS 1
 
@@ -169,6 +179,9 @@
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
 
+/* Define to 1 if .lz (lzip) decompression support is enabled. */
+#define HAVE_LZIP_DECODER 1
+
 /* Define to 1 if mbrtowc and mbstate_t are properly declared. */
 #define HAVE_MBRTOWC 1
 
@@ -193,6 +206,9 @@
 /* Define to 1 if getopt.h declares extern int optreset. */
 #define HAVE_OPTRESET 1
 
+/* Define to 1 if you have the `pledge' function. */
+/* #undef HAVE_PLEDGE */
+
 /* Define to 1 if you have the `posix_fadvise' function. */
 #define HAVE_POSIX_FADVISE 1
 
@@ -270,7 +286,7 @@
 #define HAVE_SYS_CAPSICUM_H 1
 
 /* Define to 1 if you have the <sys/endian.h> header file. */
-#define HAVE_SYS_ENDIAN_H 1
+/* #undef HAVE_SYS_ENDIAN_H */
 
 /* Define to 1 if you have the <sys/param.h> header file. */
 #define HAVE_SYS_PARAM_H 1
@@ -290,6 +306,12 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
+/* Define to 1 if _mm_clmulepi64_si128 is usable. See configure.ac for
+   details. */
+#if defined(__FreeBSD__) && defined(__amd64__)
+#define HAVE_USABLE_CLMUL 1
+#endif
+
 /* Define to 1 if you have the `utime' function. */
 /* #undef HAVE_UTIME */
 
@@ -352,7 +374,7 @@
 #define PACKAGE_NAME "XZ Utils"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "XZ Utils 5.2.9"
+#define PACKAGE_STRING "XZ Utils 5.4.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xz"
@@ -361,7 +383,7 @@
 #define PACKAGE_URL "https://tukaani.org/xz/"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "5.2.9"
+#define PACKAGE_VERSION "5.4.0"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -395,8 +417,8 @@
    sysctl(). */
 /* #undef TUKLIB_CPUCORES_SYSCTL */
 
-/* Define to 1 if the system supports fast unaligned access to 16-bit and
-   32-bit integers. */
+/* Define to 1 if the system supports fast unaligned access to 16-bit, 32-bit,
+   and 64-bit integers. */
 /* FreeBSD - derive from __NO_STRICT_ALIGNMENT */
 /* #undef TUKLIB_FAST_UNALIGNED_ACCESS */
 
@@ -522,7 +544,7 @@
 
 
 /* Version number of package */
-#define VERSION "5.2.9"
+#define VERSION "5.4.0"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */