Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 1 Jan 2023 04:25:41 GMT
From:      Xin LI <delphij@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 73ed8e77a793 - main - MFV: xz 5.4.0
Message-ID:  <202301010425.3014Pf4w043371@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by delphij:

URL: https://cgit.FreeBSD.org/src/commit/?id=73ed8e77a79398eb8e7b600a0b67f286e9e5cd53

commit 73ed8e77a79398eb8e7b600a0b67f286e9e5cd53
Merge: 231d75568f16 f6a891c2b422
Author:     Xin LI <delphij@FreeBSD.org>
AuthorDate: 2023-01-01 04:25:17 +0000
Commit:     Xin LI <delphij@FreeBSD.org>
CommitDate: 2023-01-01 04:25:17 +0000

    MFV: xz 5.4.0
    
    MFC after:      2 weeks

 contrib/xz/AUTHORS                                 |    12 +
 contrib/xz/ChangeLog                               | 12348 +++++++++----------
 contrib/xz/README                                  |    74 +-
 contrib/xz/THANKS                                  |     9 +
 contrib/xz/TODO                                    |     2 -
 contrib/xz/src/common/tuklib_common.h              |     2 +-
 contrib/xz/src/common/tuklib_config.h              |     3 +
 contrib/xz/src/common/tuklib_integer.h             |    46 +-
 contrib/xz/src/liblzma/api/lzma/base.h             |    44 +-
 contrib/xz/src/liblzma/api/lzma/bcj.h              |     6 +-
 contrib/xz/src/liblzma/api/lzma/container.h        |   296 +-
 contrib/xz/src/liblzma/api/lzma/filter.h           |   309 +-
 contrib/xz/src/liblzma/api/lzma/index.h            |    66 +
 contrib/xz/src/liblzma/api/lzma/lzma12.h           |   123 +-
 contrib/xz/src/liblzma/api/lzma/version.h          |     4 +-
 contrib/xz/src/liblzma/check/crc32_small.c         |     7 +
 contrib/xz/src/liblzma/check/crc64_fast.c          |   454 +-
 contrib/xz/src/liblzma/check/crc64_small.c         |     5 +
 contrib/xz/src/liblzma/check/crc64_table.c         |    21 +-
 contrib/xz/src/liblzma/common/alone_decoder.c      |    23 +-
 contrib/xz/src/liblzma/common/alone_encoder.c      |     1 +
 contrib/xz/src/liblzma/common/auto_decoder.c       |    23 +-
 .../xz/src/liblzma/common/block_header_decoder.c   |    29 +-
 contrib/xz/src/liblzma/common/common.c             |    16 +-
 contrib/xz/src/liblzma/common/common.h             |    49 +-
 contrib/xz/src/liblzma/common/file_info.c          |   855 ++
 contrib/xz/src/liblzma/common/filter_common.c      |    50 +-
 contrib/xz/src/liblzma/common/filter_common.h      |     3 +
 contrib/xz/src/liblzma/common/filter_decoder.c     |    14 +
 contrib/xz/src/liblzma/common/filter_encoder.c     |    19 +
 contrib/xz/src/liblzma/common/index_decoder.c      |    15 +-
 contrib/xz/src/liblzma/common/index_decoder.h      |    24 +
 contrib/xz/src/liblzma/common/index_hash.c         |     5 +-
 contrib/xz/src/liblzma/common/lzip_decoder.c       |   414 +
 contrib/xz/src/liblzma/common/lzip_decoder.h       |    22 +
 contrib/xz/src/liblzma/common/memcmplen.h          |     9 +-
 contrib/xz/src/liblzma/common/microlzma_decoder.c  |   221 +
 contrib/xz/src/liblzma/common/microlzma_encoder.c  |   140 +
 contrib/xz/src/liblzma/common/outqueue.c           |   299 +-
 contrib/xz/src/liblzma/common/outqueue.h           |   176 +-
 contrib/xz/src/liblzma/common/stream_decoder.c     |     4 +-
 contrib/xz/src/liblzma/common/stream_decoder_mt.c  |  2016 +++
 contrib/xz/src/liblzma/common/stream_encoder.c     |    16 +-
 contrib/xz/src/liblzma/common/stream_encoder_mt.c  |   167 +-
 .../xz/src/liblzma/common/stream_flags_decoder.c   |    10 +-
 contrib/xz/src/liblzma/common/string_conversion.c  |  1317 ++
 contrib/xz/src/liblzma/liblzma_generic.map         |    13 +
 contrib/xz/src/liblzma/liblzma_linux.map           |    13 +
 contrib/xz/src/liblzma/lz/lz_decoder.c             |    19 +-
 contrib/xz/src/liblzma/lz/lz_decoder.h             |     6 +-
 contrib/xz/src/liblzma/lz/lz_encoder.c             |    37 +-
 contrib/xz/src/liblzma/lz/lz_encoder.h             |    16 +-
 contrib/xz/src/liblzma/lzma/lzma2_decoder.c        |     3 +-
 contrib/xz/src/liblzma/lzma/lzma2_encoder.c        |     5 +-
 contrib/xz/src/liblzma/lzma/lzma_decoder.c         |    31 +-
 contrib/xz/src/liblzma/lzma/lzma_decoder.h         |     2 +-
 contrib/xz/src/liblzma/lzma/lzma_encoder.c         |   179 +-
 contrib/xz/src/liblzma/lzma/lzma_encoder.h         |     3 +-
 contrib/xz/src/liblzma/lzma/lzma_encoder_private.h |    15 +
 contrib/xz/src/liblzma/rangecoder/range_encoder.h  |   123 +-
 contrib/xz/src/liblzma/simple/arm.c                |     4 +
 contrib/xz/src/liblzma/simple/arm64.c              |   136 +
 contrib/xz/src/liblzma/simple/armthumb.c           |     4 +
 contrib/xz/src/liblzma/simple/ia64.c               |     4 +
 contrib/xz/src/liblzma/simple/powerpc.c            |     4 +
 contrib/xz/src/liblzma/simple/simple_coder.h       |     9 +
 contrib/xz/src/liblzma/simple/sparc.c              |     4 +
 contrib/xz/src/liblzma/simple/x86.c                |     4 +
 contrib/xz/src/xz/args.c                           |    85 +-
 contrib/xz/src/xz/args.h                           |     2 +-
 contrib/xz/src/xz/coder.c                          |   199 +-
 contrib/xz/src/xz/coder.h                          |     4 +-
 contrib/xz/src/xz/file_io.c                        |    45 +-
 contrib/xz/src/xz/file_io.h                        |    15 +-
 contrib/xz/src/xz/hardware.c                       |   206 +-
 contrib/xz/src/xz/hardware.h                       |    49 +-
 contrib/xz/src/xz/list.c                           |   713 +-
 contrib/xz/src/xz/main.c                           |    14 +
 contrib/xz/src/xz/message.c                        |   181 +-
 contrib/xz/src/xz/message.h                        |    16 -
 contrib/xz/src/xz/options.c                        |     5 -
 contrib/xz/src/xz/private.h                        |     2 +-
 contrib/xz/src/xz/suffix.c                         |    31 +-
 contrib/xz/src/xz/util.c                           |    12 -
 contrib/xz/src/xz/util.h                           |     4 -
 contrib/xz/src/xz/xz.1                             |   327 +-
 lib/liblzma/Makefile                               |     7 +
 lib/liblzma/Symbol.map                             |    12 +
 lib/liblzma/Versions.def                           |     5 +-
 lib/liblzma/config.h                               |    34 +-
 90 files changed, 14495 insertions(+), 7875 deletions(-)

diff --cc contrib/xz/src/liblzma/common/file_info.c
index 000000000000,a6b7e145ae04..a6b7e145ae04
mode 000000,100644..100644
--- a/contrib/xz/src/liblzma/common/file_info.c
+++ b/contrib/xz/src/liblzma/common/file_info.c
diff --cc contrib/xz/src/liblzma/common/index_decoder.h
index 000000000000,1af433b58b56..1af433b58b56
mode 000000,100644..100644
--- a/contrib/xz/src/liblzma/common/index_decoder.h
+++ b/contrib/xz/src/liblzma/common/index_decoder.h
diff --cc contrib/xz/src/liblzma/common/lzip_decoder.c
index 000000000000,20794f9466f0..20794f9466f0
mode 000000,100644..100644
--- a/contrib/xz/src/liblzma/common/lzip_decoder.c
+++ b/contrib/xz/src/liblzma/common/lzip_decoder.c
diff --cc contrib/xz/src/liblzma/common/lzip_decoder.h
index 000000000000,33a01c352ce3..33a01c352ce3
mode 000000,100644..100644
--- a/contrib/xz/src/liblzma/common/lzip_decoder.h
+++ b/contrib/xz/src/liblzma/common/lzip_decoder.h
diff --cc contrib/xz/src/liblzma/common/microlzma_decoder.c
index 000000000000,e473373daaae..e473373daaae
mode 000000,100644..100644
--- a/contrib/xz/src/liblzma/common/microlzma_decoder.c
+++ b/contrib/xz/src/liblzma/common/microlzma_decoder.c
diff --cc contrib/xz/src/liblzma/common/microlzma_encoder.c
index 000000000000,d3ef0632ddb3..d3ef0632ddb3
mode 000000,100644..100644
--- a/contrib/xz/src/liblzma/common/microlzma_encoder.c
+++ b/contrib/xz/src/liblzma/common/microlzma_encoder.c
diff --cc contrib/xz/src/liblzma/common/stream_decoder_mt.c
index 000000000000,5733c764892d..5733c764892d
mode 000000,100644..100644
--- a/contrib/xz/src/liblzma/common/stream_decoder_mt.c
+++ b/contrib/xz/src/liblzma/common/stream_decoder_mt.c
diff --cc contrib/xz/src/liblzma/common/string_conversion.c
index 000000000000,53fdff2a62ee..53fdff2a62ee
mode 000000,100644..100644
--- a/contrib/xz/src/liblzma/common/string_conversion.c
+++ b/contrib/xz/src/liblzma/common/string_conversion.c
diff --cc contrib/xz/src/liblzma/simple/arm64.c
index 000000000000,5e7f26562d5a..5e7f26562d5a
mode 000000,100644..100644
--- a/contrib/xz/src/liblzma/simple/arm64.c
+++ b/contrib/xz/src/liblzma/simple/arm64.c
diff --cc lib/liblzma/Makefile
index 0bdcc6af5ddc,000000000000..00731618a06c
mode 100644,000000..100644
--- a/lib/liblzma/Makefile
+++ b/lib/liblzma/Makefile
@@@ -1,171 -1,0 +1,178 @@@
 +# $FreeBSD$
 +
 +PACKAGE=lib${LIB}
 +LIB=		lzma
 +LZMADIR=	${SRCTOP}/contrib/xz/src/liblzma
 +
 +.PATH: ${LZMADIR:H}/common
 +SRCS+=	tuklib_physmem.c tuklib_cpucores.c
 +
 +.PATH: ${LZMADIR}/api/lzma
 +
 +MAININCS=	../lzma.h
 +MAININCSDIR=	${INCLUDEDIR}
 +
 +LZMAINCS+=	base.h \
 +		bcj.h \
 +		block.h \
 +		check.h \
 +		container.h \
 +		delta.h \
 +		filter.h \
 +		hardware.h \
 +		index.h \
 +		index_hash.h \
 +		lzma12.h \
 +		stream_flags.h \
 +		version.h \
 +		vli.h
 +
 +LZMAINCSDIR=	${INCLUDEDIR}/lzma
 +
 +INCSGROUPS=	MAININCS LZMAINCS
 +
 +.PATH: ${LZMADIR}/common
 +SRCS+=	common.c \
 +	block_util.c \
 +	easy_preset.c \
 +	filter_common.c \
 +	hardware_physmem.c \
 +	hardware_cputhreads.c \
 +	index.c \
 +	stream_flags_common.c \
++	string_conversion.c \
 +	vli_size.c \
 +	alone_encoder.c \
 +	block_buffer_encoder.c \
 +	block_encoder.c \
 +	block_header_encoder.c \
 +	easy_buffer_encoder.c \
 +	easy_encoder.c \
 +	easy_encoder_memusage.c \
 +	filter_buffer_encoder.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 \
 +	vli_encoder.c \
 +	alone_decoder.c \
 +	auto_decoder.c \
 +	block_buffer_decoder.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 \
 +	index_decoder.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 \
 +	outqueue.c
 +
 +
 +.PATH: ${LZMADIR}/check
 +SRCS+=	check.c \
 +	crc32_table.c \
 +	crc64_table.c
 +.if defined(MACHINE_ARCH) && ${MACHINE_ARCH} == "i386"
 +SRCS+=	crc32_x86.S \
 +	crc64_x86.S
 +ACFLAGS+=	-Wa,--noexecstack
 +.else
 +SRCS+=	crc32_fast.c \
 +	crc64_fast.c
 +.endif
 +
 +.PATH: ${LZMADIR}/lz
 +SRCS+=	lz_encoder.c \
 +	lz_encoder_mf.c \
 +	lz_decoder.c
 +
 +.PATH: ${LZMADIR}/lzma
 +SRCS+=	lzma_encoder.c \
 +	lzma_encoder_presets.c \
 +	lzma_encoder_optimum_fast.c \
 +	lzma_encoder_optimum_normal.c \
 +	fastpos_table.c \
 +	lzma_decoder.c \
 +	lzma2_encoder.c \
 +	lzma2_decoder.c
 +
 +.PATH: ${LZMADIR}/rangecoder
 +SRCS+=	price_table.c
 +
 +.PATH: ${LZMADIR}/delta
 +SRCS+=	delta_common.c \
 +	delta_encoder.c \
 +	delta_decoder.c
 +
 +.PATH: ${LZMADIR}/simple
 +SRCS+=	simple_coder.c \
 +	simple_encoder.c \
 +	simple_decoder.c \
 +	x86.c \
 +	powerpc.c \
 +	ia64.c \
 +	arm.c \
++	arm64.c \
 +	armthumb.c \
 +	sparc.c
 +
 +.PATH: ${LZMADIR}
 +
 +VERSION_MAJOR!=	sed -n '/define.*LZMA_VERSION_MAJOR/{s,[^0-9.],,gp;q;}' \
 +			${LZMADIR}/api/lzma/version.h
 +VERSION_MINOR!=	sed -n '/define.*LZMA_VERSION_MINOR/{s,[^0-9.],,gp;q;}' \
 +			${LZMADIR}/api/lzma/version.h
 +VERSION_PATCH!=	sed -n '/define.*LZMA_VERSION_PATCH/{s,[^0-9.],,gp;q;}' \
 +			${LZMADIR}/api/lzma/version.h
 +
 +WARNS?=	3
 +
 +CFLAGS+=	-DHAVE_CONFIG_H \
 +		-DTUKLIB_SYMBOL_PREFIX=lzma_ \
 +		-I${.CURDIR} \
 +		-I${LZMADIR}/api \
 +		-I${LZMADIR}/common \
 +		-I${LZMADIR}/check \
 +		-I${LZMADIR}/lz \
 +		-I${LZMADIR}/rangecoder \
 +		-I${LZMADIR}/lzma \
 +		-I${LZMADIR}/delta \
 +		-I${LZMADIR}/simple \
 +		-I${LZMADIR:H}/common
 +
 +LIBADD+=	md pthread
 +
 +VERSION_DEF=	${.CURDIR}/Versions.def
 +SYMBOL_MAPS=	${.CURDIR}/Symbol.map
 +CFLAGS+=	-DSYMBOL_VERSIONING
 +
 +CLEANFILES+=	liblzma.pc
 +
 +PCFILES=	liblzma.pc
 +
 +liblzma.pc: liblzma.pc.in
 +	sed -e 's,@prefix@,/usr,g ; \
 +		s,@exec_prefix@,/usr,g ; \
 +		s,@libdir@,${LIBDIR},g ; \
 +		s,@sharedlibdir@,${SHLIBDIR},g ; \
 +		s,@includedir@,${INCLUDEDIR},g ; \
 +		s,@LIBS@,-pthread -lmd,g ; \
 +		s,@PACKAGE_URL@,https://tukaani.org/xz/,g ; \
 +		s,@PACKAGE_VERSION@,${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH},g ; \
 +		s,@PTHREAD_CFLAGS@,,g ; \
 +		s,@PTHREAD_LIBS@,,g' ${.ALLSRC} > ${.TARGET}
 +
 +.include <bsd.lib.mk>
diff --cc lib/liblzma/Symbol.map
index c3208527764d,000000000000..8e8fc10a2453
mode 100644,000000..100644
--- a/lib/liblzma/Symbol.map
+++ b/lib/liblzma/Symbol.map
@@@ -1,199 -1,0 +1,211 @@@
 +XZ_5.0 {
 +	lzma_alone_decoder;
 +	lzma_alone_encoder;
 +	lzma_auto_decoder;
 +	lzma_block_buffer_bound;
 +	lzma_block_buffer_decode;
 +	lzma_block_buffer_encode;
 +	lzma_block_compressed_size;
 +	lzma_block_decoder;
 +	lzma_block_encoder;
 +	lzma_block_header_decode;
 +	lzma_block_header_encode;
 +	lzma_block_header_size;
 +	lzma_block_total_size;
 +	lzma_block_unpadded_size;
 +	lzma_check_is_supported;
 +	lzma_check_size;
 +	lzma_code;
 +	lzma_crc32;
 +	lzma_crc64;
 +	lzma_easy_buffer_encode;
 +	lzma_easy_decoder_memusage;
 +	lzma_easy_encoder;
 +	lzma_easy_encoder_memusage;
 +	lzma_end;
 +	lzma_filter_decoder_is_supported;
 +	lzma_filter_encoder_is_supported;
 +	lzma_filter_flags_decode;
 +	lzma_filter_flags_encode;
 +	lzma_filter_flags_size;
 +	lzma_filters_copy;
 +	lzma_filters_update;
 +	lzma_get_check;
 +	lzma_index_append;
 +	lzma_index_block_count;
 +	lzma_index_buffer_decode;
 +	lzma_index_buffer_encode;
 +	lzma_index_cat;
 +	lzma_index_checks;
 +	lzma_index_decoder;
 +	lzma_index_dup;
 +	lzma_index_encoder;
 +	lzma_index_end;
 +	lzma_index_file_size;
 +	lzma_index_hash_append;
 +	lzma_index_hash_decode;
 +	lzma_index_hash_end;
 +	lzma_index_hash_init;
 +	lzma_index_hash_size;
 +	lzma_index_init;
 +	lzma_index_iter_init;
 +	lzma_index_iter_locate;
 +	lzma_index_iter_next;
 +	lzma_index_iter_rewind;
 +	lzma_index_memusage;
 +	lzma_index_memused;
 +	lzma_index_size;
 +	lzma_index_stream_count;
 +	lzma_index_stream_flags;
 +	lzma_index_stream_padding;
 +	lzma_index_stream_size;
 +	lzma_index_total_size;
 +	lzma_index_uncompressed_size;
 +	lzma_lzma_preset;
 +	lzma_memlimit_get;
 +	lzma_memlimit_set;
 +	lzma_memusage;
 +	lzma_mf_is_supported;
 +	lzma_mode_is_supported;
 +	lzma_physmem;
 +	lzma_properties_decode;
 +	lzma_properties_encode;
 +	lzma_properties_size;
 +	lzma_raw_buffer_decode;
 +	lzma_raw_buffer_encode;
 +	lzma_raw_decoder;
 +	lzma_raw_decoder_memusage;
 +	lzma_raw_encoder;
 +	lzma_raw_encoder_memusage;
 +	lzma_stream_buffer_bound;
 +	lzma_stream_buffer_decode;
 +	lzma_stream_buffer_encode;
 +	lzma_stream_decoder;
 +	lzma_stream_encoder;
 +	lzma_stream_flags_compare;
 +	lzma_stream_footer_decode;
 +	lzma_stream_footer_encode;
 +	lzma_stream_header_decode;
 +	lzma_stream_header_encode;
 +	lzma_version_number;
 +	lzma_version_string;
 +	lzma_vli_decode;
 +	lzma_vli_encode;
 +	lzma_vli_size;
 +};
 +
 +XZ_5.2 {
 +	lzma_block_uncomp_encode;
 +	lzma_cputhreads;
 +	lzma_get_progress;
 +	lzma_stream_encoder_mt;
 +	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;
 +	lzma_alone_decoder_init;
 +	lzma_block_buffer_bound64;
 +	lzma_block_decoder_init;
 +	lzma_block_encoder_init;
 +	lzma_bufcpy;
 +	lzma_check_finish;
 +	lzma_check_init;
 +	lzma_check_update;
 +	lzma_delta_coder_init;
 +	lzma_delta_coder_memusage;
 +	lzma_delta_decoder_init;
 +	lzma_delta_encoder_init;
 +	lzma_delta_props_decode;
 +	lzma_delta_props_encode;
 +	lzma_easy_preset;
 +	lzma_free;
 +	lzma_index_encoder_init;
 +	lzma_index_padding_size;
 +	lzma_index_prealloc;
 +	lzma_lz_decoder_init;
 +	lzma_lz_decoder_memusage;
 +	lzma_lz_decoder_uncompressed;
 +	lzma_lz_encoder_init;
 +	lzma_lz_encoder_memusage;
 +	lzma_lzma2_block_size;
 +	lzma_lzma2_decoder_init;
 +	lzma_lzma2_decoder_memusage;
 +	lzma_lzma2_encoder_init;
 +	lzma_lzma2_encoder_memusage;
 +	lzma_lzma2_props_decode;
 +	lzma_lzma2_props_encode;
 +	lzma_lzma_decoder_create;
 +	lzma_lzma_decoder_init;
 +	lzma_lzma_decoder_memusage;
 +	lzma_lzma_decoder_memusage_nocheck;
 +	lzma_lzma_encode;
 +	lzma_lzma_encoder_create;
 +	lzma_lzma_encoder_init;
 +	lzma_lzma_encoder_memusage;
 +	lzma_lzma_encoder_reset;
 +	lzma_lzma_lclppb_decode;
 +	lzma_lzma_lclppb_encode;
 +	lzma_lzma_optimum_fast;
 +	lzma_lzma_optimum_normal;
 +	lzma_lzma_props_decode;
 +	lzma_lzma_props_encode;
 +	lzma_mf_bt2_find;
 +	lzma_mf_bt2_skip;
 +	lzma_mf_bt3_find;
 +	lzma_mf_bt3_skip;
 +	lzma_mf_bt4_find;
 +	lzma_mf_bt4_skip;
 +	lzma_mf_find;
 +	lzma_mf_hc3_find;
 +	lzma_mf_hc3_skip;
 +	lzma_mf_hc4_find;
 +	lzma_mf_hc4_skip;
 +	lzma_mt_block_size;
 +	lzma_next_end;
 +	lzma_next_filter_init;
 +	lzma_next_filter_update;
 +	lzma_outq_end;
 +	lzma_outq_get_buf;
 +	lzma_outq_init;
 +	lzma_outq_is_readable;
 +	lzma_outq_memusage;
 +	lzma_outq_read;
 +	lzma_raw_coder_init;
 +	lzma_raw_coder_memusage;
 +	lzma_raw_decoder_init;
 +	lzma_raw_encoder_init;
 +	lzma_simple_arm_decoder_init;
 +	lzma_simple_arm_encoder_init;
 +	lzma_simple_armthumb_decoder_init;
 +	lzma_simple_armthumb_encoder_init;
 +	lzma_simple_coder_init;
 +	lzma_simple_ia64_decoder_init;
 +	lzma_simple_ia64_encoder_init;
 +	lzma_simple_powerpc_decoder_init;
 +	lzma_simple_powerpc_encoder_init;
 +	lzma_simple_props_decode;
 +	lzma_simple_props_encode;
 +	lzma_simple_props_size;
 +	lzma_simple_sparc_decoder_init;
 +	lzma_simple_sparc_encoder_init;
 +	lzma_simple_x86_decoder_init;
 +	lzma_simple_x86_encoder_init;
 +	lzma_stream_decoder_init;
 +	lzma_strm_init;
 +	lzma_tuklib_cpucores;
 +	lzma_tuklib_physmem;
 +};
diff --cc lib/liblzma/Versions.def
index 678624078b5b,000000000000..f3e2b02c7a7c
mode 100644,000000..100644
--- a/lib/liblzma/Versions.def
+++ b/lib/liblzma/Versions.def
@@@ -1,11 -1,0 +1,14 @@@
 +# $FreeBSD$
 +
 +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 --cc lib/liblzma/config.h
index f19ebe9a421e,000000000000..7f9d3265c120
mode 100644,000000..100644
--- a/lib/liblzma/config.h
+++ b/lib/liblzma/config.h
@@@ -1,591 -1,0 +1,613 @@@
 +/* config.h.  Generated from config.h.in by configure.  */
 +/* config.h.in.  Generated from configure.ac by autoheader.  */
 +
 +/* Define if building universal (internal helper macro) */
 +/* #undef AC_APPLE_UNIVERSAL_BUILD */
 +
 +/* How many MiB of RAM to assume if the real amount cannot be determined. */
 +#define ASSUME_RAM 128
 +
 +/* Define to 1 if translation of program messages to the user's native
 +   language is requested. */
 +/* FreeBSD - disabled intentionally */
 +/* #undef ENABLE_NLS */
 +
 +/* Define to 1 if bswap_16 is available. */
 +/* #undef HAVE_BSWAP_16 */
 +
 +/* Define to 1 if bswap_32 is available. */
 +/* #undef HAVE_BSWAP_32 */
 +
 +/* Define to 1 if bswap_64 is available. */
 +/* #undef HAVE_BSWAP_64 */
 +
 +/* Define to 1 if you have the <byteswap.h> header file. */
 +/* #undef HAVE_BYTESWAP_H */
 +
 +/* Define to 1 if Capsicum is available. */
 +#define HAVE_CAPSICUM 1
 +
 +/* Define to 1 if the system has the type `CC_SHA256_CTX'. */
 +/* #undef HAVE_CC_SHA256_CTX */
 +
 +/* Define to 1 if you have the `CC_SHA256_Init' function. */
 +/* #undef HAVE_CC_SHA256_INIT */
 +
 +/* Define to 1 if you have the Mac OS X function
 +   CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */
 +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */
 +
 +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
 +   the CoreFoundation framework. */
 +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
 +
 +/* Define to 1 if crc32 integrity check is enabled. */
 +#define HAVE_CHECK_CRC32 1
 +
 +/* Define to 1 if crc64 integrity check is enabled. */
 +#define HAVE_CHECK_CRC64 1
 +
 +/* Define to 1 if sha256 integrity check is enabled. */
 +#define HAVE_CHECK_SHA256 1
 +
 +/* Define to 1 if you have the `clock_gettime' function. */
 +#define HAVE_CLOCK_GETTIME 1
 +
 +/* Define to 1 if you have the <CommonCrypto/CommonDigest.h> header file. */
 +/* #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H */
 +
 +/* Define if the GNU dcgettext() function is already present or preinstalled.
 +   */
 +/* FreeBSD - disabled intentionally */
 +/* #undef HAVE_DCGETTEXT */
 +
 +/* Define to 1 if you have the declaration of `CLOCK_MONOTONIC', and to 0 if
 +   you don't. */
 +#define HAVE_DECL_CLOCK_MONOTONIC 1
 +
 +/* Define to 1 if you have the declaration of `program_invocation_name', and
 +   to 0 if you don't. */
 +#define HAVE_DECL_PROGRAM_INVOCATION_NAME 0
 +
 +/* Define to 1 if any of HAVE_DECODER_foo have been defined. */
 +#define HAVE_DECODERS 1
 +
 +/* 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
 +
 +/* Define to 1 if delta decoder is enabled. */
 +#define HAVE_DECODER_DELTA 1
 +
 +/* Define to 1 if ia64 decoder is enabled. */
 +#define HAVE_DECODER_IA64 1
 +
 +/* Define to 1 if lzma1 decoder is enabled. */
 +#define HAVE_DECODER_LZMA1 1
 +
 +/* Define to 1 if lzma2 decoder is enabled. */
 +#define HAVE_DECODER_LZMA2 1
 +
 +/* Define to 1 if powerpc decoder is enabled. */
 +#define HAVE_DECODER_POWERPC 1
 +
 +/* Define to 1 if sparc decoder is enabled. */
 +#define HAVE_DECODER_SPARC 1
 +
 +/* Define to 1 if x86 decoder is enabled. */
 +#define HAVE_DECODER_X86 1
 +
 +/* Define to 1 if you have the <dlfcn.h> header file. */
 +#define HAVE_DLFCN_H 1
 +
 +/* Define to 1 if any of HAVE_ENCODER_foo have been defined. */
 +#define HAVE_ENCODERS 1
 +
 +/* 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
 +
 +/* Define to 1 if delta encoder is enabled. */
 +#define HAVE_ENCODER_DELTA 1
 +
 +/* Define to 1 if ia64 encoder is enabled. */
 +#define HAVE_ENCODER_IA64 1
 +
 +/* Define to 1 if lzma1 encoder is enabled. */
 +#define HAVE_ENCODER_LZMA1 1
 +
 +/* Define to 1 if lzma2 encoder is enabled. */
 +#define HAVE_ENCODER_LZMA2 1
 +
 +/* Define to 1 if powerpc encoder is enabled. */
 +#define HAVE_ENCODER_POWERPC 1
 +
 +/* Define to 1 if sparc encoder is enabled. */
 +#define HAVE_ENCODER_SPARC 1
 +
 +/* Define to 1 if x86 encoder is enabled. */
 +#define HAVE_ENCODER_X86 1
 +
 +/* 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
 +
 +/* Define to 1 if you have the `futimes' function. */
 +/* #undef HAVE_FUTIMES */
 +
 +/* Define to 1 if you have the `futimesat' function. */
 +/* #undef HAVE_FUTIMESAT */
 +
 +/* Define to 1 if you have the <getopt.h> header file. */
 +#define HAVE_GETOPT_H 1
 +
 +/* Define to 1 if you have the `getopt_long' function. */
 +#define HAVE_GETOPT_LONG 1
 +
 +/* Define if the GNU gettext() function is already present or preinstalled. */
 +/* FreeBSD - disabled intentionally */
 +/* #undef HAVE_GETTEXT */
 +
 +/* Define if you have the iconv() function and it works. */
 +#define HAVE_ICONV 1
 +
 +/* Define to 1 if you have the <immintrin.h> header file. */
 +/* FreeBSD - only with clang because the base gcc does not support it */
 +#if defined(__clang__) && defined(__FreeBSD__) && defined(__amd64__)
 +#define HAVE_IMMINTRIN_H 1
 +#endif
 +
 +/* Define to 1 if you have the <inttypes.h> header file. */
 +#define HAVE_INTTYPES_H 1
 +
 +/* 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
 +
 +/* Define to 1 to enable bt2 match finder. */
 +#define HAVE_MF_BT2 1
 +
 +/* Define to 1 to enable bt3 match finder. */
 +#define HAVE_MF_BT3 1
 +
 +/* Define to 1 to enable bt4 match finder. */
 +#define HAVE_MF_BT4 1
 +
 +/* Define to 1 to enable hc3 match finder. */
 +#define HAVE_MF_HC3 1
 +
 +/* Define to 1 to enable hc4 match finder. */
 +#define HAVE_MF_HC4 1
 +
 +/* Define to 1 if you have the <minix/config.h> header file. */
 +/* #undef HAVE_MINIX_CONFIG_H */
 +
 +/* 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
 +
 +/* Define to 1 if you have the `pthread_condattr_setclock' function. */
 +#define HAVE_PTHREAD_CONDATTR_SETCLOCK 1
 +
 +/* Have PTHREAD_PRIO_INHERIT. */
 +#define HAVE_PTHREAD_PRIO_INHERIT 1
 +
 +/* Define to 1 if you have the `SHA256Init' function. */
 +/* #undef HAVE_SHA256INIT */
 +
 +/* Define to 1 if the system has the type `SHA256_CTX'. */
 +#define HAVE_SHA256_CTX 1
 +
 +/* Define to 1 if you have the <sha256.h> header file. */
 +#define HAVE_SHA256_H 1
 +
 +/* Define to 1 if you have the `SHA256_Init' function. */
 +#define HAVE_SHA256_INIT 1
 +
 +/* Define to 1 if the system has the type `SHA2_CTX'. */
 +/* #undef HAVE_SHA2_CTX */
 +
 +/* Define to 1 if you have the <sha2.h> header file. */
 +/* #undef HAVE_SHA2_H */
 +
 +/* Define to 1 if optimizing for size. */
 +/* #undef HAVE_SMALL */
 +
 +/* Define to 1 if stdbool.h conforms to C99. */
 +#define HAVE_STDBOOL_H 1
 +
 +/* Define to 1 if you have the <stdint.h> header file. */
 +#define HAVE_STDINT_H 1
 +
 +/* Define to 1 if you have the <stdio.h> header file. */
 +#define HAVE_STDIO_H 1
 +
 +/* Define to 1 if you have the <stdlib.h> header file. */
 +#define HAVE_STDLIB_H 1
 +
 +/* Define to 1 if you have the <strings.h> header file. */
 +#define HAVE_STRINGS_H 1
 +
 +/* Define to 1 if you have the <string.h> header file. */
 +#define HAVE_STRING_H 1
 +
 +/* Define to 1 if `st_atimensec' is a member of `struct stat'. */
 +#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1
 +
 +/* Define to 1 if `st_atimespec.tv_nsec' is a member of `struct stat'. */
 +#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1
 +
 +/* Define to 1 if `st_atim.st__tim.tv_nsec' is a member of `struct stat'. */
 +/* #undef HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC */
 +
 +/* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */
 +#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1
 +
 +/* Define to 1 if `st_uatime' is a member of `struct stat'. */
 +/* #undef HAVE_STRUCT_STAT_ST_UATIME */
 +
 +/* Define to 1 to if GNU/Linux-specific details are unconditionally wanted for
 +   symbol versioning. Define to 2 to if these are wanted only if also PIC is
 +   defined (allows building both shared and static liblzma at the same time
 +   with Libtool if neither --with-pic nor --without-pic is used). This define
 +   must be used together with liblzma_linux.map. */
 +/* #undef HAVE_SYMBOL_VERSIONS_LINUX */
 +
 +/* Define to 1 if you have the <sys/byteorder.h> header file. */
 +/* #undef HAVE_SYS_BYTEORDER_H */
 +
 +/* Define to 1 if you have the <sys/capsicum.h> header file. */
 +#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
 +
 +/* Define to 1 if you have the <sys/stat.h> header file. */
 +#define HAVE_SYS_STAT_H 1
 +
 +/* Define to 1 if you have the <sys/time.h> header file. */
 +#define HAVE_SYS_TIME_H 1
 +
 +/* Define to 1 if you have the <sys/types.h> header file. */
 +#define HAVE_SYS_TYPES_H 1
 +
 +/* Define to 1 if the system has the type `uintptr_t'. */
 +#define HAVE_UINTPTR_T 1
 +
 +/* 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 */
 +
 +/* Define to 1 if you have the `utimes' function. */
 +/* #undef HAVE_UTIMES */
 +
 +/* Define to 1 or 0, depending whether the compiler supports simple visibility
 +   declarations. */
 +#define HAVE_VISIBILITY 1
 +
 +/* Define to 1 if you have the <wchar.h> header file. */
 +#define HAVE_WCHAR_H 1
 +
 +/* Define to 1 if you have the `wcwidth' function. */
 +#define HAVE_WCWIDTH 1
 +
 +/* Define to 1 if the system has the type `_Bool'. */
 +#define HAVE__BOOL 1
 +
 +/* Define to 1 if you have the `_futime' function. */
 +/* #undef HAVE__FUTIME */
 +
 +/* Define to 1 if _mm_movemask_epi8 is available. */
 +#if defined(__FreeBSD__) && defined(__amd64__)
 +#define HAVE__MM_MOVEMASK_EPI8 1
 +#endif
 +
 +/* Define to 1 if the GNU C extension __builtin_assume_aligned is supported.
 +   */
 +#define HAVE___BUILTIN_ASSUME_ALIGNED 1
 +
 +/* Define to 1 if the GNU C extensions __builtin_bswap16/32/64 are supported.
 +   */
 +#define HAVE___BUILTIN_BSWAPXX 1
 +
 +/* Define to the sub-directory where libtool stores uninstalled libraries. */
 +#define LT_OBJDIR ".libs/"
 +
 +/* Define to 1 when using POSIX threads (pthreads). */
 +#define MYTHREAD_POSIX 1
 +
 +/* Define to 1 when using Windows Vista compatible threads. This uses features
 +   that are not available on Windows XP. */
 +/* #undef MYTHREAD_VISTA */
 +
 +/* Define to 1 when using Windows 95 (and thus XP) compatible threads. This
 +   avoids use of features that were added in Windows Vista. */
 +/* #undef MYTHREAD_WIN95 */
 +
 +/* Define to 1 to disable debugging code. */
 +#define NDEBUG 1
 +
 +/* Name of package */
 +#define PACKAGE "xz"
 +
 +/* Define to the address where bug reports for this package should be sent. */
 +#define PACKAGE_BUGREPORT "xz@tukaani.org"
 +
 +/* Define to the full name of this package. */
 +#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"
 +
 +/* Define to the home page for this package. */
 +#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. */
 +/* #undef PTHREAD_CREATE_JOINABLE */
 +
 +/* The size of `size_t', as computed by sizeof. */
 +#define SIZEOF_SIZE_T 8
 +
 +/* Define to 1 if all of the C90 standard headers exist (not just the ones
 +   required in a freestanding environment). This macro is provided for
 +   backward compatibility; new code need not use it. */
 +#define STDC_HEADERS 1
 +
 +/* Define to 1 if the number of available CPU cores can be detected with
 +   cpuset(2). */
 +#define TUKLIB_CPUCORES_CPUSET 1
 +
 +/* Define to 1 if the number of available CPU cores can be detected with
*** 212 LINES SKIPPED ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301010425.3014Pf4w043371>