git: 8db56defa766 - main - MFV: xz 5.6.0.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 25 Feb 2024 23:46:57 UTC
The branch main has been updated by delphij:
URL: https://cgit.FreeBSD.org/src/commit/?id=8db56defa766eacdbaf89a37f25b11a57fd9787a
commit 8db56defa766eacdbaf89a37f25b11a57fd9787a
Merge: dc15f025062d a7819ed7ade8
Author: Xin LI <delphij@FreeBSD.org>
AuthorDate: 2024-02-25 23:46:22 +0000
Commit: Xin LI <delphij@FreeBSD.org>
CommitDate: 2024-02-25 23:46:22 +0000
MFV: xz 5.6.0.
MFC after: 2 weeks
contrib/xz/AUTHORS | 40 +-
contrib/xz/COPYING | 116 +-
contrib/xz/COPYING.0BSD | 11 +
contrib/xz/COPYING.CC-BY-SA-4.0 | 427 +
contrib/xz/ChangeLog | 16248 ++++++++-----------
contrib/xz/README | 43 +-
contrib/xz/THANKS | 7 +
contrib/xz/TODO | 4 -
contrib/xz/doxygen/Doxyfile | 6 +-
contrib/xz/doxygen/footer.html | 13 +
contrib/xz/doxygen/update-doxygen | 6 +-
contrib/xz/src/common/mythread.h | 28 +-
contrib/xz/src/common/sysdefs.h | 18 +-
contrib/xz/src/common/tuklib_common.h | 27 +-
contrib/xz/src/common/tuklib_config.h | 2 +
contrib/xz/src/common/tuklib_cpucores.c | 5 +-
contrib/xz/src/common/tuklib_cpucores.h | 5 +-
contrib/xz/src/common/tuklib_exit.c | 5 +-
contrib/xz/src/common/tuklib_exit.h | 9 +-
contrib/xz/src/common/tuklib_gettext.h | 5 +-
contrib/xz/src/common/tuklib_integer.h | 7 +-
contrib/xz/src/common/tuklib_mbstr.h | 5 +-
contrib/xz/src/common/tuklib_mbstr_fw.c | 5 +-
contrib/xz/src/common/tuklib_mbstr_width.c | 5 +-
contrib/xz/src/common/tuklib_open_stdxxx.c | 5 +-
contrib/xz/src/common/tuklib_open_stdxxx.h | 5 +-
contrib/xz/src/common/tuklib_physmem.c | 25 +-
contrib/xz/src/common/tuklib_physmem.h | 5 +-
contrib/xz/src/common/tuklib_progname.c | 5 +-
contrib/xz/src/common/tuklib_progname.h | 5 +-
contrib/xz/src/liblzma/api/lzma.h | 31 +-
contrib/xz/src/liblzma/api/lzma/base.h | 23 +-
contrib/xz/src/liblzma/api/lzma/bcj.h | 10 +-
contrib/xz/src/liblzma/api/lzma/block.h | 5 +-
contrib/xz/src/liblzma/api/lzma/check.h | 5 +-
contrib/xz/src/liblzma/api/lzma/container.h | 43 +-
contrib/xz/src/liblzma/api/lzma/delta.h | 5 +-
contrib/xz/src/liblzma/api/lzma/filter.h | 11 +-
contrib/xz/src/liblzma/api/lzma/hardware.h | 5 +-
contrib/xz/src/liblzma/api/lzma/index.h | 36 +-
contrib/xz/src/liblzma/api/lzma/index_hash.h | 5 +-
contrib/xz/src/liblzma/api/lzma/lzma12.h | 7 +-
contrib/xz/src/liblzma/api/lzma/stream_flags.h | 5 +-
contrib/xz/src/liblzma/api/lzma/version.h | 9 +-
contrib/xz/src/liblzma/api/lzma/vli.h | 5 +-
contrib/xz/src/liblzma/check/check.c | 5 +-
contrib/xz/src/liblzma/check/check.h | 5 +-
contrib/xz/src/liblzma/check/crc32_arm64.h | 119 +
contrib/xz/src/liblzma/check/crc32_fast.c | 187 +-
contrib/xz/src/liblzma/check/crc32_small.c | 5 +-
contrib/xz/src/liblzma/check/crc32_table.c | 36 +-
contrib/xz/src/liblzma/check/crc32_table_be.h | 4 +-
contrib/xz/src/liblzma/check/crc32_table_le.h | 4 +-
contrib/xz/src/liblzma/check/crc32_tablegen.c | 21 +-
contrib/xz/src/liblzma/check/crc32_x86.S | 5 +-
contrib/xz/src/liblzma/check/crc64_fast.c | 450 +-
contrib/xz/src/liblzma/check/crc64_small.c | 5 +-
contrib/xz/src/liblzma/check/crc64_table.c | 16 +-
contrib/xz/src/liblzma/check/crc64_table_be.h | 4 +-
contrib/xz/src/liblzma/check/crc64_table_le.h | 4 +-
contrib/xz/src/liblzma/check/crc64_tablegen.c | 13 +-
contrib/xz/src/liblzma/check/crc64_x86.S | 5 +-
contrib/xz/src/liblzma/check/crc_common.h | 143 +
contrib/xz/src/liblzma/check/crc_macros.h | 30 -
contrib/xz/src/liblzma/check/crc_x86_clmul.h | 435 +
contrib/xz/src/liblzma/common/alone_decoder.c | 5 +-
contrib/xz/src/liblzma/common/alone_decoder.h | 5 +-
contrib/xz/src/liblzma/common/alone_encoder.c | 5 +-
contrib/xz/src/liblzma/common/auto_decoder.c | 5 +-
.../xz/src/liblzma/common/block_buffer_decoder.c | 5 +-
.../xz/src/liblzma/common/block_buffer_encoder.c | 5 +-
.../xz/src/liblzma/common/block_buffer_encoder.h | 5 +-
contrib/xz/src/liblzma/common/block_decoder.c | 5 +-
contrib/xz/src/liblzma/common/block_decoder.h | 5 +-
contrib/xz/src/liblzma/common/block_encoder.c | 5 +-
contrib/xz/src/liblzma/common/block_encoder.h | 5 +-
.../xz/src/liblzma/common/block_header_decoder.c | 5 +-
.../xz/src/liblzma/common/block_header_encoder.c | 5 +-
contrib/xz/src/liblzma/common/block_util.c | 5 +-
contrib/xz/src/liblzma/common/common.c | 5 +-
contrib/xz/src/liblzma/common/common.h | 5 +-
.../xz/src/liblzma/common/easy_buffer_encoder.c | 5 +-
.../xz/src/liblzma/common/easy_decoder_memusage.c | 5 +-
contrib/xz/src/liblzma/common/easy_encoder.c | 5 +-
.../xz/src/liblzma/common/easy_encoder_memusage.c | 5 +-
contrib/xz/src/liblzma/common/easy_preset.c | 5 +-
contrib/xz/src/liblzma/common/easy_preset.h | 5 +-
contrib/xz/src/liblzma/common/file_info.c | 5 +-
.../xz/src/liblzma/common/filter_buffer_decoder.c | 5 +-
.../xz/src/liblzma/common/filter_buffer_encoder.c | 5 +-
contrib/xz/src/liblzma/common/filter_common.c | 14 +-
contrib/xz/src/liblzma/common/filter_common.h | 5 +-
contrib/xz/src/liblzma/common/filter_decoder.c | 13 +-
contrib/xz/src/liblzma/common/filter_decoder.h | 5 +-
contrib/xz/src/liblzma/common/filter_encoder.c | 39 +-
contrib/xz/src/liblzma/common/filter_encoder.h | 11 +-
.../xz/src/liblzma/common/filter_flags_decoder.c | 5 +-
.../xz/src/liblzma/common/filter_flags_encoder.c | 5 +-
.../xz/src/liblzma/common/hardware_cputhreads.c | 5 +-
contrib/xz/src/liblzma/common/hardware_physmem.c | 5 +-
contrib/xz/src/liblzma/common/index.c | 5 +-
contrib/xz/src/liblzma/common/index.h | 5 +-
contrib/xz/src/liblzma/common/index_decoder.c | 5 +-
contrib/xz/src/liblzma/common/index_decoder.h | 5 +-
contrib/xz/src/liblzma/common/index_encoder.c | 5 +-
contrib/xz/src/liblzma/common/index_encoder.h | 5 +-
contrib/xz/src/liblzma/common/index_hash.c | 5 +-
contrib/xz/src/liblzma/common/lzip_decoder.c | 5 +-
contrib/xz/src/liblzma/common/lzip_decoder.h | 5 +-
contrib/xz/src/liblzma/common/memcmplen.h | 24 +-
contrib/xz/src/liblzma/common/microlzma_decoder.c | 5 +-
contrib/xz/src/liblzma/common/microlzma_encoder.c | 5 +-
contrib/xz/src/liblzma/common/outqueue.c | 5 +-
contrib/xz/src/liblzma/common/outqueue.h | 5 +-
.../xz/src/liblzma/common/stream_buffer_decoder.c | 5 +-
.../xz/src/liblzma/common/stream_buffer_encoder.c | 5 +-
contrib/xz/src/liblzma/common/stream_decoder.c | 5 +-
contrib/xz/src/liblzma/common/stream_decoder.h | 5 +-
contrib/xz/src/liblzma/common/stream_decoder_mt.c | 5 +-
contrib/xz/src/liblzma/common/stream_encoder.c | 5 +-
contrib/xz/src/liblzma/common/stream_encoder_mt.c | 25 +-
.../xz/src/liblzma/common/stream_flags_common.c | 5 +-
.../xz/src/liblzma/common/stream_flags_common.h | 5 +-
.../xz/src/liblzma/common/stream_flags_decoder.c | 5 +-
.../xz/src/liblzma/common/stream_flags_encoder.c | 5 +-
contrib/xz/src/liblzma/common/string_conversion.c | 14 +-
contrib/xz/src/liblzma/common/vli_decoder.c | 5 +-
contrib/xz/src/liblzma/common/vli_encoder.c | 5 +-
contrib/xz/src/liblzma/common/vli_size.c | 5 +-
contrib/xz/src/liblzma/delta/delta_common.c | 5 +-
contrib/xz/src/liblzma/delta/delta_common.h | 5 +-
contrib/xz/src/liblzma/delta/delta_decoder.c | 5 +-
contrib/xz/src/liblzma/delta/delta_decoder.h | 5 +-
contrib/xz/src/liblzma/delta/delta_encoder.c | 5 +-
contrib/xz/src/liblzma/delta/delta_encoder.h | 5 +-
contrib/xz/src/liblzma/delta/delta_private.h | 5 +-
contrib/xz/src/liblzma/liblzma.pc.in | 6 +-
contrib/xz/src/liblzma/liblzma_generic.map | 7 +
contrib/xz/src/liblzma/liblzma_linux.map | 7 +
contrib/xz/src/liblzma/lz/lz_decoder.c | 48 +-
contrib/xz/src/liblzma/lz/lz_decoder.h | 116 +-
contrib/xz/src/liblzma/lz/lz_encoder.c | 13 +-
contrib/xz/src/liblzma/lz/lz_encoder.h | 21 +-
contrib/xz/src/liblzma/lz/lz_encoder_hash.h | 5 +-
contrib/xz/src/liblzma/lz/lz_encoder_hash_table.h | 4 +-
contrib/xz/src/liblzma/lz/lz_encoder_mf.c | 5 +-
contrib/xz/src/liblzma/lzma/fastpos.h | 5 +-
contrib/xz/src/liblzma/lzma/fastpos_table.c | 4 +-
contrib/xz/src/liblzma/lzma/fastpos_tablegen.c | 17 +-
contrib/xz/src/liblzma/lzma/lzma2_decoder.c | 5 +-
contrib/xz/src/liblzma/lzma/lzma2_decoder.h | 5 +-
contrib/xz/src/liblzma/lzma/lzma2_encoder.c | 8 +-
contrib/xz/src/liblzma/lzma/lzma2_encoder.h | 5 +-
contrib/xz/src/liblzma/lzma/lzma_common.h | 41 +-
contrib/xz/src/liblzma/lzma/lzma_decoder.c | 760 +-
contrib/xz/src/liblzma/lzma/lzma_decoder.h | 5 +-
contrib/xz/src/liblzma/lzma/lzma_encoder.c | 18 +-
contrib/xz/src/liblzma/lzma/lzma_encoder.h | 5 +-
.../src/liblzma/lzma/lzma_encoder_optimum_fast.c | 5 +-
.../src/liblzma/lzma/lzma_encoder_optimum_normal.c | 7 +-
contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c | 5 +-
contrib/xz/src/liblzma/lzma/lzma_encoder_private.h | 9 +-
contrib/xz/src/liblzma/rangecoder/price.h | 5 +-
contrib/xz/src/liblzma/rangecoder/price_table.c | 4 +-
contrib/xz/src/liblzma/rangecoder/price_tablegen.c | 22 +-
contrib/xz/src/liblzma/rangecoder/range_common.h | 14 +-
contrib/xz/src/liblzma/rangecoder/range_decoder.h | 838 +-
contrib/xz/src/liblzma/rangecoder/range_encoder.h | 5 +-
contrib/xz/src/liblzma/simple/arm.c | 5 +-
contrib/xz/src/liblzma/simple/arm64.c | 5 +-
contrib/xz/src/liblzma/simple/armthumb.c | 5 +-
contrib/xz/src/liblzma/simple/ia64.c | 5 +-
contrib/xz/src/liblzma/simple/powerpc.c | 5 +-
contrib/xz/src/liblzma/simple/riscv.c | 755 +
contrib/xz/src/liblzma/simple/simple_coder.c | 5 +-
contrib/xz/src/liblzma/simple/simple_coder.h | 14 +-
contrib/xz/src/liblzma/simple/simple_decoder.c | 5 +-
contrib/xz/src/liblzma/simple/simple_decoder.h | 5 +-
contrib/xz/src/liblzma/simple/simple_encoder.c | 5 +-
contrib/xz/src/liblzma/simple/simple_encoder.h | 5 +-
contrib/xz/src/liblzma/simple/simple_private.h | 5 +-
contrib/xz/src/liblzma/simple/sparc.c | 5 +-
contrib/xz/src/liblzma/simple/x86.c | 5 +-
contrib/xz/src/liblzma/validate_map.sh | 6 +-
contrib/xz/src/lzmainfo/lzmainfo.1 | 4 +-
contrib/xz/src/lzmainfo/lzmainfo.c | 5 +-
contrib/xz/src/xz/args.c | 159 +-
contrib/xz/src/xz/args.h | 8 +-
contrib/xz/src/xz/coder.c | 648 +-
contrib/xz/src/xz/coder.h | 31 +-
contrib/xz/src/xz/file_io.c | 144 +-
contrib/xz/src/xz/file_io.h | 21 +-
contrib/xz/src/xz/hardware.c | 11 +-
contrib/xz/src/xz/hardware.h | 5 +-
contrib/xz/src/xz/list.c | 31 +-
contrib/xz/src/xz/list.h | 5 +-
contrib/xz/src/xz/main.c | 91 +-
contrib/xz/src/xz/main.h | 5 +-
contrib/xz/src/xz/message.c | 94 +-
contrib/xz/src/xz/message.h | 15 +-
contrib/xz/src/xz/mytime.c | 105 +-
contrib/xz/src/xz/mytime.h | 11 +-
contrib/xz/src/xz/options.c | 7 +-
contrib/xz/src/xz/options.h | 5 +-
contrib/xz/src/xz/private.h | 26 +-
contrib/xz/src/xz/sandbox.c | 355 +
contrib/xz/src/xz/sandbox.h | 43 +
contrib/xz/src/xz/signals.c | 22 +-
contrib/xz/src/xz/signals.h | 5 +-
contrib/xz/src/xz/suffix.c | 17 +-
contrib/xz/src/xz/suffix.h | 5 +-
contrib/xz/src/xz/util.c | 36 +-
contrib/xz/src/xz/util.h | 19 +-
contrib/xz/src/xz/xz.1 | 439 +-
contrib/xz/src/xzdec/xzdec.1 | 8 +-
contrib/xz/src/xzdec/xzdec.c | 160 +-
lib/liblzma/Makefile | 1 +
lib/liblzma/Symbol.map | 5 +-
lib/liblzma/Versions.def | 5 +-
lib/liblzma/config.h | 120 +-
usr.bin/xz/Makefile | 1 +
221 files changed, 13494 insertions(+), 11300 deletions(-)
diff --cc contrib/xz/COPYING.0BSD
index 000000000000,4322122aecf1..4322122aecf1
mode 000000,100644..100644
--- a/contrib/xz/COPYING.0BSD
+++ b/contrib/xz/COPYING.0BSD
diff --cc contrib/xz/COPYING.CC-BY-SA-4.0
index 000000000000,7d4f96c54aa1..7d4f96c54aa1
mode 000000,100644..100644
--- a/contrib/xz/COPYING.CC-BY-SA-4.0
+++ b/contrib/xz/COPYING.CC-BY-SA-4.0
diff --cc contrib/xz/doxygen/footer.html
index 000000000000,38d6ea0f4364..38d6ea0f4364
mode 000000,100644..100644
--- a/contrib/xz/doxygen/footer.html
+++ b/contrib/xz/doxygen/footer.html
diff --cc contrib/xz/src/liblzma/check/crc32_arm64.h
index 000000000000,6cdb5dab32e6..6cdb5dab32e6
mode 000000,100644..100644
--- a/contrib/xz/src/liblzma/check/crc32_arm64.h
+++ b/contrib/xz/src/liblzma/check/crc32_arm64.h
diff --cc contrib/xz/src/liblzma/check/crc_common.h
index 000000000000,856665db79a8..856665db79a8
mode 000000,100644..100644
--- a/contrib/xz/src/liblzma/check/crc_common.h
+++ b/contrib/xz/src/liblzma/check/crc_common.h
diff --cc contrib/xz/src/liblzma/check/crc_x86_clmul.h
index 000000000000,ae66ca9f8c71..ae66ca9f8c71
mode 000000,100644..100644
--- a/contrib/xz/src/liblzma/check/crc_x86_clmul.h
+++ b/contrib/xz/src/liblzma/check/crc_x86_clmul.h
diff --cc contrib/xz/src/liblzma/simple/riscv.c
index 000000000000,aabbb0520577..aabbb0520577
mode 000000,100644..100644
--- a/contrib/xz/src/liblzma/simple/riscv.c
+++ b/contrib/xz/src/liblzma/simple/riscv.c
diff --cc contrib/xz/src/xz/sandbox.c
index 000000000000,3b3069c8b2c8..3b3069c8b2c8
mode 000000,100644..100644
--- a/contrib/xz/src/xz/sandbox.c
+++ b/contrib/xz/src/xz/sandbox.c
diff --cc contrib/xz/src/xz/sandbox.h
index 000000000000,f41b4725ce3f..f41b4725ce3f
mode 000000,100644..100644
--- a/contrib/xz/src/xz/sandbox.h
+++ b/contrib/xz/src/xz/sandbox.h
diff --cc lib/liblzma/Makefile
index 85e7b87bbbf0,000000000000..e656ddd9bb45
mode 100644,000000..100644
--- a/lib/liblzma/Makefile
+++ b/lib/liblzma/Makefile
@@@ -1,176 -1,0 +1,177 @@@
+
+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 \
++ riscv.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
+
+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 8e8fc10a2453,000000000000..3b58bc759e75
mode 100644,000000..100644
--- a/lib/liblzma/Symbol.map
+++ b/lib/liblzma/Symbol.map
@@@ -1,211 -1,0 +1,214 @@@
+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;
+};
+
++XZ_5.6 {
++ lzma_mt_block_size;
++};
++
+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 dea89514beda,000000000000..25064d9d50e7
mode 100644,000000..100644
--- a/lib/liblzma/Versions.def
+++ b/lib/liblzma/Versions.def
@@@ -1,13 -1,0 +1,16 @@@
+
+XZ_5.0 {
+};
+
+XZ_5.2 {
+} XZ_5.0;
+
+XZ_5.4 {
+} XZ_5.2;
+
- XZprivate_1.0 {
++XZ_5.6 {
+} XZ_5.4;
+
++XZprivate_1.0 {
++} XZ_5.6;
++
diff --cc lib/liblzma/config.h
index cfa53becb2ad,000000000000..15e0c71e5ed1
mode 100644,000000..100644
--- a/lib/liblzma/config.h
+++ b/lib/liblzma/config.h
@@@ -1,618 -1,0 +1,654 @@@
+/* 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 ARM64 CRC32 instruction is supported. See configure.ac for
++ details. */
++/* #undef HAVE_ARM64_CRC32 */
++
+/* 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 */
+
+#ifndef WITHOUT_CAPSICUM
- /* Define to 1 if Capsicum is available. */
- #define HAVE_CAPSICUM 1
++/* Define to 1 if you have the 'cap_rights_limit' function. */
++#define HAVE_CAP_RIGHTS_LIMIT 1
+#endif
+
- /* Define to 1 if the system has the type `CC_SHA256_CTX'. */
++/* 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. */
++/* 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 to 1 if you have the 'clock_gettime' function. */
+#define HAVE_CLOCK_GETTIME 1
+
- /* Define to 1 if `CLOCK_MONOTONIC' is declared in <time.h>. */
++/* Define to 1 if 'CLOCK_MONOTONIC' is declared in <time.h>. */
+#define HAVE_CLOCK_MONOTONIC 1
+
+/* Define to 1 if you have the <CommonCrypto/CommonDigest.h> header file. */
+/* #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H */
+
+/* Define to 1 if you have the <cpuid.h> header file. */
+#define HAVE_CPUID_H 1
+
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+ */
+/* FreeBSD - disabled intentionally */
+/* #undef HAVE_DCGETTEXT */
+
+/* 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 riscv decoder is enabled. */
++#define HAVE_DECODER_RISCV 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 you have the 'elf_aux_info' function. */
++/* #undef HAVE_ELF_AUX_INFO */
++
+/* 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 riscv encoder is enabled. */
++#define HAVE_ENCODER_RISCV 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 to 1 if __attribute__((__ifunc__())) is supported for functions. */
++#define HAVE_FUNC_ATTRIBUTE_IFUNC 1
++
++/* Define to 1 if you have the 'futimens' function. */
+#define HAVE_FUTIMENS 1
+
- /* Define to 1 if you have the `futimes' function. */
++/* Define to 1 if you have the 'futimes' function. */
+/* #undef HAVE_FUTIMES */
+
- /* Define to 1 if you have the `futimesat' function. */
++/* Define to 1 if you have the 'futimesat' function. */
+/* #undef HAVE_FUTIMESAT */
+
++/* Define to 1 if you have the 'getauxval' function. */
++/* #undef HAVE_GETAUXVAL */
++
+/* 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 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 you have the <linux/landlock.h> header file. */
++/* #undef HAVE_LINUX_LANDLOCK_H */
++
+/* 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 MicroLZMA support is enabled. */
++#define HAVE_MICROLZMA 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. */
++/* Define to 1 if you have the 'pledge' function. */
+/* #undef HAVE_PLEDGE */
+
- /* Define to 1 if you have the `posix_fadvise' function. */
++/* Define to 1 if you have the 'posix_fadvise' function. */
+#define HAVE_POSIX_FADVISE 1
+
- /* Define to 1 if `program_invocation_name' is declared in <errno.h>. */
++/* Define to 1 if 'program_invocation_name' is declared in <errno.h>. */
+/* #undef HAVE_PROGRAM_INVOCATION_NAME */
+
- /* Define to 1 if you have the `pthread_condattr_setclock' function. */
++/* 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. */
++/* Define to 1 if you have the 'SHA256Init' function. */
+/* #undef HAVE_SHA256INIT */
+
- /* Define to 1 if the system has the type `SHA256_CTX'. */
++/* 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. */
*** 484 LINES SKIPPED ***