git: 6b55e41b3fac - stable/13 - Revert "MFV: xz 5.6.0"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 08 Apr 2024 04:06:28 UTC
The branch stable/13 has been updated by delphij:
URL: https://cgit.FreeBSD.org/src/commit/?id=6b55e41b3fac3102d82864f926636c23df46bba9
commit 6b55e41b3fac3102d82864f926636c23df46bba9
Author: Xin LI <delphij@FreeBSD.org>
AuthorDate: 2024-04-05 06:39:23 +0000
Commit: Xin LI <delphij@FreeBSD.org>
CommitDate: 2024-04-08 04:06:12 +0000
Revert "MFV: xz 5.6.0"
This commit reverts 8db56defa766eacdbaf89a37f25b11a57fd9787a,
rolling back the vendor import of xz 5.6.0 and restoring the
package to version 5.4.5.
The revert was not directly due to the attack (CVE-2024-3094):
our import process have removed the test cases and build scripts
that would have enabled the attack. However, reverting would
help to reduce potential confusion and false positives from
security scanners that assess risk based solely on version
numbers.
Another commit will follow to restore binary compatibility with
the liblzma 5.6.0 library by making the previously private
symbol (lzma_mt_block_size) public.
PR: 278127
(cherry picked from commit 2f9cd13d6c1824633251fb4267c9752d3b044a45)
---
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 | 16270 +++++++++++--------
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, 11311 insertions(+), 13505 deletions(-)
diff --git a/contrib/xz/AUTHORS b/contrib/xz/AUTHORS
index 5012d0e01e83..69bbfc3ef609 100644
--- a/contrib/xz/AUTHORS
+++ b/contrib/xz/AUTHORS
@@ -9,13 +9,15 @@ Authors of XZ Utils
specifically the LZMA SDK <https://7-zip.org/sdk.html>. Without
this code, XZ Utils wouldn't exist.
- The SHA-256 implementation in liblzma is based on code written by
- Wei Dai in Crypto++ Library <https://www.cryptopp.com/>.
+ The SHA-256 implementation in liblzma is based on the code found from
+ 7-Zip <https://7-zip.org/>, which has a modified version of the SHA-256
+ code found from Crypto++ <https://www.cryptopp.com/>. The SHA-256 code
+ in Crypto++ was written by Kevin Springle and Wei Dai.
- A few scripts have been adapted from GNU gzip. The original
- versions were written by Jean-loup Gailly, Charles Levert, and
- Paul Eggert. Andrew Dudman helped adapting the scripts and their
- man pages for XZ Utils.
+ Some scripts have been adapted from gzip. The original versions
+ were written by Jean-loup Gailly, Charles Levert, and Paul Eggert.
+ Andrew Dudman helped adapting the scripts and their man pages for
+ XZ Utils.
The initial version of the threaded .xz decompressor was written
by Sebastian Andrzej Siewior.
@@ -23,31 +25,15 @@ Authors of XZ Utils
The initial version of the .lz (lzip) decoder was written
by Michał Górny.
- Architecture-specific CRC optimizations were contributed by
- Ilya Kurdyukov, Hans Jansen, and Chenxi Mao.
+ CLMUL-accelerated CRC code was contributed by Ilya Kurdyukov.
Other authors:
- Jonathan Nieder
- Joachim Henke
- Many people have contributed improvements or reported bugs.
- Most of these people are mentioned in the file THANKS.
+ The GNU Autotools-based build system contains files from many authors,
+ which I'm not trying to list here.
- The translations of the command line tools and man pages have been
- contributed by many people via the Translation Project:
-
- - https://translationproject.org/domain/xz.html
- - https://translationproject.org/domain/xz-man.html
-
- The authors of the translated man pages are in the header comments
- of the man page files. In the source package, the authors of the
- translations are in po/*.po and po4a/*.po files.
-
- Third-party code whose authors aren't listed here:
-
- - GNU getopt_long() in the 'lib' directory is included for
- platforms that don't have a usable getopt_long().
-
- - The build system files from GNU Autoconf, GNU Automake,
- GNU Libtool, GNU Gettext, Autoconf Archive, and related files.
+ Several people have contributed fixes or reported bugs. Most of them
+ are mentioned in the file THANKS.
diff --git a/contrib/xz/COPYING b/contrib/xz/COPYING
index a31477d62d31..e54eeacfbf3f 100644
--- a/contrib/xz/COPYING
+++ b/contrib/xz/COPYING
@@ -6,95 +6,71 @@ XZ Utils Licensing
is a rough summary of which licenses apply to which parts of this
package (but check the individual files to be sure!):
- - liblzma is under the BSD Zero Clause License (0BSD).
+ - liblzma is in the public domain.
- - The command line tools xz, xzdec, lzmadec, and lzmainfo are
- under 0BSD except that, on systems that don't have a usable
- getopt_long, GNU getopt_long is compiled and linked in from the
- 'lib' directory. The getopt_long code is under GNU LGPLv2.1+.
+ - xz, xzdec, and lzmadec command line tools are in the public
+ domain unless GNU getopt_long had to be compiled and linked
+ in from the lib directory. The getopt_long code is under
+ GNU LGPLv2.1+.
- The scripts to grep, diff, and view compressed files have been
- adapted from GNU gzip. These scripts (xzgrep, xzdiff, xzless,
- and xzmore) are under GNU GPLv2+. The man pages of the scripts
- are under 0BSD; they aren't based on the man pages of GNU gzip.
-
- - Most of the XZ Utils specific documentation that is in
- plain text files (like README, INSTALL, PACKAGERS, NEWS,
- and ChangeLog) are under 0BSD unless stated otherwise in
- the file itself. The files xz-file-format.txt and
- lzma-file-format.xt are in the public domain but may
- be distributed under the terms of 0BSD too.
-
- - Doxygen-generated HTML version of the liblzma API documentation:
- While Doxygen is under the GNU GPLv2, the license information
- in Doxygen includes the following exception:
-
- Documents produced by doxygen are derivative works
- derived from the input used in their production;
- they are not affected by this license.
+ adapted from gzip. These scripts and their documentation are
+ under GNU GPLv2+.
+
+ - All the documentation in the doc directory and most of the
+ XZ Utils specific documentation files in other directories
+ are in the public domain.
Note: The JavaScript files (under the MIT license) have
- been removed from the Doxygen output.
+ been removed from the Doxygen-generated HTML version of the
+ liblzma API documentation. Doxygen itself is under the GNU GPL
+ but the remaining files generated by Doxygen are not affected
+ by the licenses used in Doxygen because Doxygen licensing has
+ the following exception:
- - The XZ logo (xz-logo.png) included in the Doxygen-generated
- documentation is under the Creative Commons BY-SA 4.0 license.
+ "Documents produced by doxygen are derivative works
+ derived from the input used in their production;
+ they are not affected by this license."
- - Translated messages and man pages are under 0BSD except that
- some old translations are in the public domain.
+ - Translated messages are in the public domain.
- - Test files and test code in the 'tests' directory, and
- debugging utilities in the 'debug' directory are under
- the BSD Zero Clause License (0BSD).
+ - The build system contains public domain files, and files that
+ are under GNU GPLv2+ or GNU GPLv3+. None of these files end up
+ in the binaries being built.
- - The GNU Autotools based build system contains files that are
- under GNU GPLv2+, GNU GPLv3+, and a few permissive licenses.
- These files don't affect the licensing of the binaries being
- built.
+ - Test files and test code in the tests directory, and debugging
+ utilities in the debug directory are in the public domain.
- - The extra directory contain files that are under various
- free software licenses.
+ - The extra directory may contain public domain files, and files
+ that are under various free software licenses.
- For the files under the BSD Zero Clause License (0BSD), if
- a copyright notice is needed, the following is sufficient:
+ You can do whatever you want with the files that have been put into
+ the public domain. If you find public domain legally problematic,
+ take the previous sentence as a license grant. If you still find
+ the lack of copyright legally problematic, you have too many
+ lawyers.
- Copyright (C) The XZ Utils authors and contributors
+ As usual, this software is provided "as is", without any warranty.
- If you copy significant amounts of 0BSD-licensed code from XZ Utils
+ If you copy significant amounts of public domain code from XZ Utils
into your project, acknowledging this somewhere in your software is
polite (especially if it is proprietary, non-free software), but
- it is not legally required by the license terms. Here is an example
- of a good notice to put into "about box" or into documentation:
+ naturally it is not legally required. Here is an example of a good
+ notice to put into "about box" or into documentation:
- This software includes code from XZ Utils
- <https://xz.tukaani.org/xz-utils/>.
+ This software includes code from XZ Utils <https://tukaani.org/xz/>.
The following license texts are included in the following files:
- - COPYING.0BSD: BSD Zero Clause License
- COPYING.LGPLv2.1: GNU Lesser General Public License version 2.1
- COPYING.GPLv2: GNU General Public License version 2
- COPYING.GPLv3: GNU General Public License version 3
- - COPYING.CC-BY-SA-4.0: Creative Commons Attribution-ShareAlike 4.0
- International Public License
-
- A note about old XZ Utils releases:
-
- XZ Utils releases 5.4.6 and older and 5.5.1alpha have a
- significant amount of code put into the public domain and
- that obviously remains so. The switch from public domain to
- 0BSD for newer releases was made in Febrary 2024 because
- public domain has (real or perceived) legal ambiguities in
- some jurisdictions.
-
- There is very little *practical* difference between public
- domain and 0BSD. The main difference likely is that one
- shouldn't claim that 0BSD-licensed code is in the public
- domain; 0BSD-licensed code is copyrighted but available under
- an extremely permissive license. Neither 0BSD nor public domain
- require retaining or reproducing author, copyright holder, or
- license notices when distributing the software. (Compare to,
- for example, BSD 2-Clause "Simplified" License which does have
- such requirements.)
-
- If you have questions, don't hesitate to ask for more information.
- The contact information is in the README file.
+
+ Note that the toolchain (compiler, linker etc.) may add some code
+ pieces that are copyrighted. Thus, it is possible that e.g. liblzma
+ binary wouldn't actually be in the public domain in its entirety
+ even though it contains no copyrighted code from the XZ Utils source
+ package.
+
+ If you have questions, don't hesitate to ask the author(s) for more
+ information.
diff --git a/contrib/xz/COPYING.0BSD b/contrib/xz/COPYING.0BSD
deleted file mode 100644
index 4322122aecf1..000000000000
--- a/contrib/xz/COPYING.0BSD
+++ /dev/null
@@ -1,11 +0,0 @@
-Permission to use, copy, modify, and/or distribute this
-software for any purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
-THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/contrib/xz/COPYING.CC-BY-SA-4.0 b/contrib/xz/COPYING.CC-BY-SA-4.0
deleted file mode 100644
index 7d4f96c54aa1..000000000000
--- a/contrib/xz/COPYING.CC-BY-SA-4.0
+++ /dev/null
@@ -1,427 +0,0 @@
-Attribution-ShareAlike 4.0 International
-
-=======================================================================
-
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
-other relationship. Creative Commons makes its licenses and related
-information available on an "as-is" basis. Creative Commons gives no
-warranties regarding its licenses, any material licensed under their
-terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the
-fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and
-conditions that creators and other rights holders may use to share
-original works of authorship and other material subject to copyright
-and certain other rights specified in the public license below. The
-following considerations are for informational purposes only, are not
-exhaustive, and do not form part of our licenses.
-
- Considerations for licensors: Our public licenses are
- intended for use by those authorized to give the public
- permission to use material in ways otherwise restricted by
- copyright and certain other rights. Our licenses are
- irrevocable. Licensors should read and understand the terms
- and conditions of the license they choose before applying it.
- Licensors should also secure all rights necessary before
- applying our licenses so that the public can reuse the
- material as expected. Licensors should clearly mark any
- material not subject to the license. This includes other CC-
- licensed material, or material used under an exception or
- limitation to copyright. More considerations for licensors:
- wiki.creativecommons.org/Considerations_for_licensors
-
- Considerations for the public: By using one of our public
- licenses, a licensor grants the public permission to use the
- licensed material under specified terms and conditions. If
- the licensor's permission is not necessary for any reason--for
- example, because of any applicable exception or limitation to
- copyright--then that use is not regulated by the license. Our
- licenses grant only permissions under copyright and certain
- other rights that a licensor has authority to grant. Use of
- the licensed material may still be restricted for other
- reasons, including because others have copyright or other
- rights in the material. A licensor may make special requests,
- such as asking that all changes be marked or described.
- Although not required by our licenses, you are encouraged to
- respect those requests where reasonable. More considerations
- for the public:
- wiki.creativecommons.org/Considerations_for_licensees
-
-=======================================================================
-
-Creative Commons Attribution-ShareAlike 4.0 International Public
-License
-
-By exercising the Licensed Rights (defined below), You accept and agree
-to be bound by the terms and conditions of this Creative Commons
-Attribution-ShareAlike 4.0 International Public License ("Public
-License"). To the extent this Public License may be interpreted as a
-contract, You are granted the Licensed Rights in consideration of Your
-acceptance of these terms and conditions, and the Licensor grants You
-such rights in consideration of benefits the Licensor receives from
-making the Licensed Material available under these terms and
-conditions.
-
-
-Section 1 -- Definitions.
-
- a. Adapted Material means material subject to Copyright and Similar
- Rights that is derived from or based upon the Licensed Material
- and in which the Licensed Material is translated, altered,
- arranged, transformed, or otherwise modified in a manner requiring
- permission under the Copyright and Similar Rights held by the
- Licensor. For purposes of this Public License, where the Licensed
- Material is a musical work, performance, or sound recording,
- Adapted Material is always produced where the Licensed Material is
- synched in timed relation with a moving image.
-
- b. Adapter's License means the license You apply to Your Copyright
- and Similar Rights in Your contributions to Adapted Material in
- accordance with the terms and conditions of this Public License.
-
- c. BY-SA Compatible License means a license listed at
- creativecommons.org/compatiblelicenses, approved by Creative
- Commons as essentially the equivalent of this Public License.
-
- d. Copyright and Similar Rights means copyright and/or similar rights
- closely related to copyright including, without limitation,
- performance, broadcast, sound recording, and Sui Generis Database
- Rights, without regard to how the rights are labeled or
- categorized. For purposes of this Public License, the rights
- specified in Section 2(b)(1)-(2) are not Copyright and Similar
- Rights.
-
- e. Effective Technological Measures means those measures that, in the
- absence of proper authority, may not be circumvented under laws
- fulfilling obligations under Article 11 of the WIPO Copyright
- Treaty adopted on December 20, 1996, and/or similar international
- agreements.
-
- f. Exceptions and Limitations means fair use, fair dealing, and/or
- any other exception or limitation to Copyright and Similar Rights
- that applies to Your use of the Licensed Material.
-
- g. License Elements means the license attributes listed in the name
- of a Creative Commons Public License. The License Elements of this
- Public License are Attribution and ShareAlike.
-
- h. Licensed Material means the artistic or literary work, database,
- or other material to which the Licensor applied this Public
- License.
-
- i. Licensed Rights means the rights granted to You subject to the
- terms and conditions of this Public License, which are limited to
- all Copyright and Similar Rights that apply to Your use of the
- Licensed Material and that the Licensor has authority to license.
-
- j. Licensor means the individual(s) or entity(ies) granting rights
- under this Public License.
-
- k. Share means to provide material to the public by any means or
- process that requires permission under the Licensed Rights, such
- as reproduction, public display, public performance, distribution,
- dissemination, communication, or importation, and to make material
- available to the public including in ways that members of the
- public may access the material from a place and at a time
- individually chosen by them.
-
- l. Sui Generis Database Rights means rights other than copyright
- resulting from Directive 96/9/EC of the European Parliament and of
- the Council of 11 March 1996 on the legal protection of databases,
- as amended and/or succeeded, as well as other essentially
- equivalent rights anywhere in the world.
-
- m. You means the individual or entity exercising the Licensed Rights
- under this Public License. Your has a corresponding meaning.
-
-
-Section 2 -- Scope.
-
- a. License grant.
-
- 1. Subject to the terms and conditions of this Public License,
- the Licensor hereby grants You a worldwide, royalty-free,
- non-sublicensable, non-exclusive, irrevocable license to
- exercise the Licensed Rights in the Licensed Material to:
-
- a. reproduce and Share the Licensed Material, in whole or
- in part; and
-
- b. produce, reproduce, and Share Adapted Material.
-
- 2. Exceptions and Limitations. For the avoidance of doubt, where
- Exceptions and Limitations apply to Your use, this Public
- License does not apply, and You do not need to comply with
- its terms and conditions.
-
- 3. Term. The term of this Public License is specified in Section
- 6(a).
-
- 4. Media and formats; technical modifications allowed. The
- Licensor authorizes You to exercise the Licensed Rights in
- all media and formats whether now known or hereafter created,
- and to make technical modifications necessary to do so. The
- Licensor waives and/or agrees not to assert any right or
- authority to forbid You from making technical modifications
- necessary to exercise the Licensed Rights, including
- technical modifications necessary to circumvent Effective
- Technological Measures. For purposes of this Public License,
- simply making modifications authorized by this Section 2(a)
- (4) never produces Adapted Material.
-
- 5. Downstream recipients.
-
- a. Offer from the Licensor -- Licensed Material. Every
- recipient of the Licensed Material automatically
- receives an offer from the Licensor to exercise the
- Licensed Rights under the terms and conditions of this
- Public License.
-
- b. Additional offer from the Licensor -- Adapted Material.
- Every recipient of Adapted Material from You
- automatically receives an offer from the Licensor to
- exercise the Licensed Rights in the Adapted Material
- under the conditions of the Adapter's License You apply.
-
- c. No downstream restrictions. You may not offer or impose
- any additional or different terms or conditions on, or
- apply any Effective Technological Measures to, the
- Licensed Material if doing so restricts exercise of the
- Licensed Rights by any recipient of the Licensed
- Material.
-
- 6. No endorsement. Nothing in this Public License constitutes or
- may be construed as permission to assert or imply that You
- are, or that Your use of the Licensed Material is, connected
- with, or sponsored, endorsed, or granted official status by,
- the Licensor or others designated to receive attribution as
- provided in Section 3(a)(1)(A)(i).
-
- b. Other rights.
-
- 1. Moral rights, such as the right of integrity, are not
- licensed under this Public License, nor are publicity,
- privacy, and/or other similar personality rights; however, to
- the extent possible, the Licensor waives and/or agrees not to
- assert any such rights held by the Licensor to the limited
- extent necessary to allow You to exercise the Licensed
- Rights, but not otherwise.
-
- 2. Patent and trademark rights are not licensed under this
- Public License.
-
- 3. To the extent possible, the Licensor waives any right to
- collect royalties from You for the exercise of the Licensed
- Rights, whether directly or through a collecting society
- under any voluntary or waivable statutory or compulsory
- licensing scheme. In all other cases the Licensor expressly
- reserves any right to collect such royalties.
-
-
-Section 3 -- License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the
-following conditions.
-
- a. Attribution.
-
- 1. If You Share the Licensed Material (including in modified
- form), You must:
-
- a. retain the following if it is supplied by the Licensor
- with the Licensed Material:
-
- i. identification of the creator(s) of the Licensed
- Material and any others designated to receive
- attribution, in any reasonable manner requested by
- the Licensor (including by pseudonym if
- designated);
-
- ii. a copyright notice;
-
- iii. a notice that refers to this Public License;
-
- iv. a notice that refers to the disclaimer of
- warranties;
-
- v. a URI or hyperlink to the Licensed Material to the
- extent reasonably practicable;
-
- b. indicate if You modified the Licensed Material and
- retain an indication of any previous modifications; and
-
- c. indicate the Licensed Material is licensed under this
- Public License, and include the text of, or the URI or
- hyperlink to, this Public License.
-
- 2. You may satisfy the conditions in Section 3(a)(1) in any
- reasonable manner based on the medium, means, and context in
- which You Share the Licensed Material. For example, it may be
- reasonable to satisfy the conditions by providing a URI or
- hyperlink to a resource that includes the required
- information.
-
- 3. If requested by the Licensor, You must remove any of the
- information required by Section 3(a)(1)(A) to the extent
- reasonably practicable.
-
- b. ShareAlike.
-
- In addition to the conditions in Section 3(a), if You Share
- Adapted Material You produce, the following conditions also apply.
-
- 1. The Adapter's License You apply must be a Creative Commons
- license with the same License Elements, this version or
- later, or a BY-SA Compatible License.
-
- 2. You must include the text of, or the URI or hyperlink to, the
- Adapter's License You apply. You may satisfy this condition
- in any reasonable manner based on the medium, means, and
- context in which You Share Adapted Material.
-
- 3. You may not offer or impose any additional or different terms
- or conditions on, or apply any Effective Technological
- Measures to, Adapted Material that restrict exercise of the
- rights granted under the Adapter's License You apply.
-
-
-Section 4 -- Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that
-apply to Your use of the Licensed Material:
-
- a. for the avoidance of doubt, Section 2(a)(1) grants You the right
- to extract, reuse, reproduce, and Share all or a substantial
- portion of the contents of the database;
-
- b. if You include all or a substantial portion of the database
- contents in a database in which You have Sui Generis Database
- Rights, then the database in which You have Sui Generis Database
- Rights (but not its individual contents) is Adapted Material,
- including for purposes of Section 3(b); and
-
- c. You must comply with the conditions in Section 3(a) if You Share
- all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not
-replace Your obligations under this Public License where the Licensed
-Rights include other Copyright and Similar Rights.
-
-
-Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
- a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
- EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
- AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
- ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
- IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
- WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
- PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
- ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
- KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
- ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
- b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
- TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
- NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
- INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
- COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
- USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
- ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
- DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
- IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
- c. The disclaimer of warranties and limitation of liability provided
- above shall be interpreted in a manner that, to the extent
- possible, most closely approximates an absolute disclaimer and
- waiver of all liability.
-
-
-Section 6 -- Term and Termination.
-
- a. This Public License applies for the term of the Copyright and
- Similar Rights licensed here. However, if You fail to comply with
- this Public License, then Your rights under this Public License
- terminate automatically.
-
- b. Where Your right to use the Licensed Material has terminated under
- Section 6(a), it reinstates:
-
- 1. automatically as of the date the violation is cured, provided
- it is cured within 30 days of Your discovery of the
- violation; or
-
- 2. upon express reinstatement by the Licensor.
-
- For the avoidance of doubt, this Section 6(b) does not affect any
- right the Licensor may have to seek remedies for Your violations
- of this Public License.
-
- c. For the avoidance of doubt, the Licensor may also offer the
- Licensed Material under separate terms or conditions or stop
- distributing the Licensed Material at any time; however, doing so
- will not terminate this Public License.
-
- d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
- License.
-
-
-Section 7 -- Other Terms and Conditions.
-
- a. The Licensor shall not be bound by any additional or different
- terms or conditions communicated by You unless expressly agreed.
-
- b. Any arrangements, understandings, or agreements regarding the
- Licensed Material not stated herein are separate from and
- independent of the terms and conditions of this Public License.
-
-
-Section 8 -- Interpretation.
-
- a. For the avoidance of doubt, this Public License does not, and
- shall not be interpreted to, reduce, limit, restrict, or impose
- conditions on any use of the Licensed Material that could lawfully
- be made without permission under this Public License.
-
- b. To the extent possible, if any provision of this Public License is
- deemed unenforceable, it shall be automatically reformed to the
- minimum extent necessary to make it enforceable. If the provision
- cannot be reformed, it shall be severed from this Public License
- without affecting the enforceability of the remaining terms and
- conditions.
-
- c. No term or condition of this Public License will be waived and no
- failure to comply consented to unless expressly agreed to by the
- Licensor.
-
- d. Nothing in this Public License constitutes or may be interpreted
- as a limitation upon, or waiver of, any privileges and immunities
- that apply to the Licensor or You, including from the legal
- processes of any jurisdiction or authority.
-
-
-=======================================================================
-
-Creative Commons is not a party to its public
-licenses. Notwithstanding, Creative Commons may elect to apply one of
-its public licenses to material it publishes and in those instances
-will be considered the “Licensor.” The text of the Creative Commons
-public licenses is dedicated to the public domain under the CC0 Public
-Domain Dedication. Except for the limited purpose of indicating that
-material is shared under a Creative Commons public license or as
-otherwise permitted by the Creative Commons policies published at
-creativecommons.org/policies, Creative Commons does not authorize the
-use of the trademark "Creative Commons" or any other trademark or logo
-of Creative Commons without its prior written consent including,
-without limitation, in connection with any unauthorized modifications
-to any of its public licenses or any other arrangements,
-understandings, or agreements concerning use of licensed material. For
-the avoidance of doubt, this paragraph does not form part of the
-public licenses.
-
-Creative Commons may be contacted at creativecommons.org.
diff --git a/contrib/xz/ChangeLog b/contrib/xz/ChangeLog
index 54b68744af86..4dd0978ef313 100644
--- a/contrib/xz/ChangeLog
+++ b/contrib/xz/ChangeLog
@@ -1,9764 +1,11756 @@
-commit 2d7d862e3ffa8cec4fd3fdffcd84e984a17aa429
+commit 49053c0a649f4c8bd2b8d97ce915f401fbc0f3d9
Author: Jia Tan <jiat0218@gmail.com>
-Date: 2024-02-24 15:55:08 +0800
+Date: 2023-10-31 22:30:29 +0800
- Bump version and soname for 5.6.0.
+ Bump version and soname for 5.4.5.
- src/liblzma/Makefile.am | 2 +-
- src/liblzma/api/lzma/version.h | 6 +++---
- src/liblzma/liblzma_generic.map | 2 +-
- src/liblzma/liblzma_linux.map | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
+ src/liblzma/Makefile.am | 2 +-
+ src/liblzma/api/lzma/version.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
-commit a18fb1edef0d0aac12a09eed05e9c448c777af7b
+commit 84c0cfc556287628df871703672879e530d0391f
Author: Jia Tan <jiat0218@gmail.com>
-Date: 2024-02-24 15:50:36 +0800
+Date: 2023-11-01 20:18:30 +0800
- Add NEWS for 5.6.0.
+ Add NEWS for 5.4.5.
- NEWS | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 143 insertions(+)
+ NEWS | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 74 insertions(+)
-commit 24355c5280bc95e3d594432d60bb8432aa6af173
-Author: Jia Tan <jiat0218@gmail.com>
-Date: 2024-02-22 22:27:01 +0800
+commit d90ed84db9770712e2421e170076b43bda9b64a7
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2023-10-31 21:41:09 +0200
- Translations: Remove obsolete and fuzzy matches from some translations.
+ liblzma: Fix compilation of fastpos_tablegen.c.
- The French and Brazilian Portuguese man page translations have not been
- updated since the switch from public domain to 0BSD. The old GPLv2
- strings have now been removed from these files.
-
- po4a/fr.po | 4702 +++++++++++++++++++++++++++++++++++++----------------
- po4a/pt_BR.po | 4987 ++++++++++++++++++++++++++++++++++++++++-----------------
- 2 files changed, 6832 insertions(+), 2857 deletions(-)
-
-commit 02ca4a7d7b703e2ec63e00b70feec825e919dbc1
-Author: Jia Tan <jiat0218@gmail.com>
-Date: 2024-02-21 00:31:54 +0800
-
- Translations: Patch man pages to avoid fuzzy matches.
+ The macro lzma_attr_visibility_hidden has to be defined to make
+ fastpos.h usable. The visibility attribute is irrelevant to
+ fastpos_tablegen.c so simply #define the macro to an empty value.
- This will be fixed in the next round of translations, but this avoids
- having a fuzzy match or not fixing the English version.
-
- po4a/de.po | 2 +-
- po4a/ko.po | 2 +-
- po4a/ro.po | 2 +-
- po4a/uk.po | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-commit 898aad9fc711e03452d24d9e2c5b7f77a6f9ce64
*** 32182 LINES SKIPPED ***