Commit Graph

1515 Commits

Author SHA1 Message Date
Lasse Collin 27cfdc5897 Update contact info in README
(cherry picked from commit b14c130a58)
2024-05-28 18:42:45 +03:00
Lasse Collin 649b1ca6e5 Translations: Run "make -C po update-po"
In the past this wasn't done before releases; the Git repository
just contained the files from the Translation Project. But this
way it is clearer when comparing release tarballs against the
Git repository.
2024-05-28 18:42:45 +03:00
Lasse Collin af667d7f49 Translations: Use --package-name=xz-man with po4a
This is to match reality. See the added comment.

(cherry picked from commit 75f5f2e014)
2024-05-28 17:21:47 +03:00
Lasse Collin 6e49bd6c46 Translations: Omit man page line numbers from .pot and .po files
(cherry picked from commit 9114267038)
2024-05-28 17:21:47 +03:00
Lasse Collin fd38afb628 Translations: Update po/Makevars
Use the template from gettext 0.22.5.
Add --add-location=file to XGETTEXT_OPTIONS and MSGMERGE_OPTIONS.
Add --no-wrap to MSGINIT_OPTIONS.

(cherry picked from commit 451f6986a5)
2024-05-28 17:21:47 +03:00
Lasse Collin 31d3912f29 liblzma: Omit an unneeded array from the x86 filter
Fixes: 6aa2a6deeb
(cherry picked from commit de06b9f0c0)
2024-05-27 16:57:13 +03:00
Lasse Collin 891602da97 liblzma: Silence a warning from Coverity static analysis
It is logical why it cannot know for sure that the value has
to be at most 4 if it is less than 16.

The x86 filter is based on a very old LZMA SDK version. Newer
ones have quite a different implementation for the same filter.

Thanks to Sam James.

(cherry picked from commit 6aa2a6deeb)
2024-05-27 16:57:13 +03:00
Lasse Collin 702b9ed690 Fix typos
Thanks to xx on #tukaani.

(cherry picked from commit 4e9023857d)
2024-05-22 00:34:26 +03:00
Lasse Collin 37314d4d18 Update maintainer and author info.
The other maintainer suddenly disappeared.

(cherry picked from commit 77a294d98a)
(cherry picked from commit 37c46f7b67)
2024-05-22 00:34:26 +03:00
Lasse Collin 02d0318629 liblzma: Fix incorrect function type error from sanitizer
Clang 17 with -fsanitize=address,undefined:

    src/liblzma/common/filter_common.c:366:8: runtime error:
        call to function encoder_find through pointer to incorrect
        function type 'const lzma_filter_coder *(*)(unsigned long)'
    src/liblzma/common/filter_encoder.c:187: note:
        encoder_find defined here

Use a wrapper function to get the correct type neatly.
This reduces the number of casts needed too.

This issue could be a problem with control flow integrity (CFI)
methods that check the function type on indirect function calls.

Fixes: 3b34851de1
(cherry picked from commit 278563ef8f)
(cherry picked from commit 64e0a5f726)
2024-05-22 00:34:26 +03:00
Lasse Collin b933ef49a5 xz: Avoid arithmetic on a null pointer
It's undefined behavior. The result wasn't ever used as it occurred
in the last iteration of a loop.

Clang 17 with -fsanitize=address,undefined:

    $ src/xz/xz --block-list=123
    src/xz/args.c:164:12: runtime error: applying non-zero offset 1
        to null pointer

Fixes: 88ccf47205
Co-authored-by: Sam James <sam@gentoo.org>
(cherry picked from commit 77c8f60547)
(cherry picked from commit 203d482599)
2024-05-22 00:34:26 +03:00
Lasse Collin ecbc34d90b liblzma: index_decoder: Fix missing initializations on LZMA_PROG_ERROR
If the arguments to lzma_index_decoder() or lzma_index_buffer_decode()
were such that LZMA_PROG_ERROR was returned, the lzma_index **i
argument wasn't touched even though the API docs say that *i = NULL
is done if an error occurs. This obviously won't be done even now
if i == NULL but otherwise it is best to do it due to the wording
in the API docs.

In practice this matters very little: The problem can occur only
if the functions are called with invalid arguments, that is,
the calling application must already have a bug.

(cherry picked from commit 71eed2520e)
(cherry picked from commit 214569ace8)
2024-05-22 00:34:26 +03:00
Lasse Collin e0e53eb80f CMake: Bump maximum policy version to 3.29
(cherry picked from commit 80f72396ea)
2024-05-22 00:34:26 +03:00
Lasse Collin 46c574e70a xz man page: Use .ft CR instead of CW to silence warnings from groff.
(cherry picked from commit 31ef676567)
(cherry picked from commit 6edc2b554f)
2024-05-22 00:34:26 +03:00
Lasse Collin 33b2a5104a Update THANKS.
(cherry picked from commit db4dd74a34)
(cherry picked from commit 995afe4646)
2024-05-22 00:34:26 +03:00
Lasse Collin e60534b03b INSTALL: Document arguments of --enable-symbol-versions.
(cherry picked from commit 8a25ba024d)
(cherry picked from commit 44a5c1374e)
2024-05-22 00:34:26 +03:00
Lasse Collin be86d78acf Build: Use only the generic symbol versioning with NVIDIA HPC Compiler.
This does the previous commit with CMake.

AC_EGREP_CPP uses AC_REQUIRE so the outermost if-commands must
be changed to AS_IF to ensure that things wont break some day.
See 5a5bd7f871.

(cherry picked from commit 49324b711f)
(cherry picked from commit b03139b1d2)
2024-05-22 00:34:26 +03:00
Lasse Collin 0f455c2687 CMake: Use only the generic symbol versioning with NVIDIA HPC Compiler.
It doesn't support the __symver__ attribute or __asm__(".symver ...").
The generic symbol versioning can still be used since it only needs
linker support.

(cherry picked from commit c273123ed0)
(cherry picked from commit 08754772e8)
2024-05-22 00:34:26 +03:00
Lasse Collin 880556e98c Update THANKS.
(cherry picked from commit df7f487648)
(cherry picked from commit 9579efdbfd)
2024-05-22 00:34:26 +03:00
Lasse Collin 639d053823 liblzma: Minor comment edits.
(cherry picked from commit 3217b82b3e)
(cherry picked from commit 32e256c12a)
2024-05-22 00:34:26 +03:00
Sergey Kosukhin 7de966a02b liblzma: Fix building with NVHPC (NVIDIA HPC SDK).
NVHPC compiler has several issues that make it impossible to
build liblzma:
  - the compiler fails to produce valid code for delta_decode if the
    vectorization is enabled, which results in failed tests.

This introduces NVHPC-specific workarounds that address the issues.

(This commit was contributed under 0BSD but the author confirmed
that it is fine to backport it to the public domain branches. See
https://github.com/tukaani-project/xz/pull/90#issuecomment-2100185936
and the next two messages.)

(cherry picked from commit 096bc0e3f8)
(cherry picked from commit 65ac20807c)
2024-05-22 00:34:26 +03:00
Lasse Collin 13a0a0fc8f CMake: Disable symbol versioning on non-glibc Linux.
This better matches what configure.ac does. For example, musl has
only basic symbol versioning support:

https://wiki.musl-libc.org/functional-differences-from-glibc.html#Symbol_versioning

configure.ac tries to enable symbol versioning only with glibc
so now CMake does the same.

(cherry picked from commit 2ad7fad670)
(cherry picked from commit 78a015e753)
2024-05-22 00:34:26 +03:00
Lasse Collin 706134d965 CMake: Make symbol versioning configurable.
(cherry picked from commit 82f0c0d39e)
(cherry picked from commit 20e590bbed)
2024-05-22 00:34:26 +03:00
Lasse Collin a9b2d85120 CMake: Handle symbol versioning on MicroBlaze specially.
This is to match configure.ac.

(cherry picked from commit 025eb6d787)
(cherry picked from commit bcac3e3aa2)
2024-05-22 00:34:26 +03:00
Lasse Collin 93b928b230 Build: Style tweaks to configure.ac.
The AC_MSG_ERROR line is overlong anyway as are a few other
AC_MSG_ERROR lines already.

(cherry picked from commit 45d33bfc45)
(cherry picked from commit 9e7daa8dbd)
2024-05-22 00:34:26 +03:00
Sergey Kosukhin 2dbc0fc5c2 Build: Let the users override the symbol versioning variant.
There are cases when the users want to decide themselves whether
they want to have the generic (even on GNU/Linux) or the linux
(even if we do not recommend that) symbol versioning variant.
The former might be needed to circumvent compiler issues (i.e.
the compiler does not support all features that are required
for the linux versioning), the latter might help in overriding
the assumptions made in the configure script.

(This commit was contributed under 0BSD but the author confirmed
that it is fine to backport it to the public domain branches. See
https://github.com/tukaani-project/xz/pull/90#issuecomment-2100185936
and the next two messages.)

(cherry picked from commit f56ed6fac6)
(cherry picked from commit ce3a9fa94d)
2024-05-22 00:33:56 +03:00
Lasse Collin be29fac96d INSTALL: Clarify that --disable-assembler affects only 32-bit x86.
(cherry picked from commit 00440f52be)
(cherry picked from commit a8b3fb6d2f)
2024-05-22 00:28:10 +03:00
Lasse Collin 769b5d0055 xz: Delete old commented-out code.
(cherry picked from commit 4ce300ce08)
(cherry picked from commit b4b315a206)
2024-05-22 00:28:03 +03:00
Lasse Collin d800c85838 xz: Tweak comments.
(cherry picked from commit 7312dfbb02)
(cherry picked from commit 9c9a3e7b3f)
2024-05-22 00:27:48 +03:00
Lasse Collin 7d487a4c2a xz: Fix message_init() description.
Also explicitly initialize progress_automatic to make it clear
that it can be read before message_init() sets it. Static variable
was initialized to false by default already so this is only for
clarity.

(cherry picked from commit c701a5909a)
(cherry picked from commit 7d3418e496)
2024-05-22 00:27:25 +03:00
Lasse Collin 9c2d1b52ce Build: Don't install TODO.
(cherry picked from commit f3440e78c9)
(cherry picked from commit fb6cf07ac7)
2024-05-22 00:26:45 +03:00
Jia Tan 2c024f60c2 Update m4/.gitignore.
(cherry picked from commit 4323bc3e0c)
(cherry picked from commit e164211b09)
2024-05-22 00:26:06 +03:00
Lasse Collin fda91a5d77 liblzma: Fix compilation of price_tablegen.c.
It is built and run only manually so this didn't matter
unless one wanted to regenerate the price_table.c.

(cherry picked from commit 8e4ec79483)
(cherry picked from commit 65b5ee0716)
2024-05-07 19:57:27 +03:00
Lasse Collin 594b64742f liblzma: Sync the AUTHORS fix about SHA-256 to lzma.h.
(based on commit 23de53421e)

(cherry picked from commit f200c338f8)
2024-05-07 19:57:27 +03:00
Lasse Collin 6aba0e2a5e Fix SHA-256 authors.
The initial commit 5d018dc035
in 2007 had a comment in sha256.c that the code is based on
Crypto++ Library 5.5.1. In 2009 the Authors list in sha256.c
and the AUTHORS file was updated with information that the
code had come from Crypto++ but via 7-Zip. I know I had viewed
7-Zip's SHA-256 code but back then the C code has been identical
enough with Crypto++, so I don't why I thought the author info
would need that extra step via 7-Zip for this single file.

Another error is that I had mixed sha.* and shacal2.* files
when checking for author info in Crypto++. The shacal2.* files
aren't related to liblzma's sha256.c and thus Kevin Springle's
code in Crypto++ isn't either.

(cherry picked from commit 76946dc433)
(cherry picked from commit 402fb45c74)
2024-05-07 19:57:27 +03:00
Lasse Collin 2c89f377cd xzless: Use ||- in LESSOPEN with with "less" 451 and newer.
(cherry picked from commit 9860d418d2)
(cherry picked from commit e5ba545f16)
2024-05-07 19:57:27 +03:00
Lasse Collin 3af41a23c4 xzless: Use --show-preproc-errors with "less" 632 and newer.
This makes "less" show a warning if a decompression error occurred.

(cherry picked from commit fd0692b052)
(cherry picked from commit 5e7a8c0869)
2024-05-07 19:57:27 +03:00
Lasse Collin 74d36a57c5 liblzma: Set all values in lzma_lz_encoder to NULL after allocation.
This is unlikely to be a bug in an existing application since it relies
on calling lzma_filters_update() on an LZMA1 encoder in the first place.
For instance, it does not affect xz because lzma_filters_update() can
only be used when encoding to the .xz format.

(based on commit 8191720eac)
2024-05-07 19:56:46 +03:00
Jia Tan 176ae9073c liblzma: Make parameter names in function definition match declaration.
lzma_raw_encoder() and lzma_raw_encoder_init() used "options" as the
parameter name instead of "filters" (used by the declaration). "filters"
is more clear since the parameter represents the list of filters passed
to the raw encoder, each of which contains filter options.

(cherry picked from commit 27ab54af84)
2024-05-07 17:57:51 +03:00
Jia Tan 94c8503486 liblzma: Improve lzma encoder init function consistency.
lzma_encoder_init() did not check for NULL options, but
lzma2_encoder_init() did. This is more of a code style improvement than
anything else to help make lzma_encoder_init() and lzma2_encoder_init()
more similar.

(cherry picked from commit 019afd72e0)
2024-05-07 17:57:51 +03:00
Jia Tan fa91e29dba Docs: Update repository URL in Changelog.
(cherry picked from commit 6af9a4cbe5)
2024-05-07 17:57:51 +03:00
Jia Tan 6a7c0a9ab2 xz: Use is_tty() in message.c.
(cherry picked from commit 7dc466d621)
2024-05-07 17:57:51 +03:00
Jia Tan 9f00ad72f0 xz: Create separate is_tty() function.
The new is_tty() will report if a file descriptor is a terminal or not.
On POSIX systems, it is a wrapper around isatty(). However, the native
Windows implementation of isatty() will return true for all character
devices, not just terminals. So is_tty() has a special case for Windows
so it can use alternative Windows API functions to determine if a file
descriptor is a terminal.

This fixes a bug with MSVC and MinGW-w64 builds that refused to read from
or write to non-terminal character devices because xz thought it was a
terminal. For instance:

    xz foo -c > /dev/null

would fail because /dev/null was assumed to be a terminal.

(cherry picked from commit 0ecfaa6df9)
2024-05-07 17:57:49 +03:00
Jia Tan aa036419c2 Tests: Fix typo in a comment.
(cherry picked from commit 9b469da8f3)
2024-05-07 17:50:45 +03:00
Jia Tan 9c47c0ea18 liblzma: Add missing comments to lz_encoder.h.
(cherry picked from commit 84196e8c09)
2024-05-07 17:50:45 +03:00
Lasse Collin 290c954289 liblzma: Fix compilation of fastpos_tablegen.c.
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.

fastpos_tablegen.c is never built by the included build systems
and so the problem wasn't noticed earlier. It's just a standalone
program for generating fastpos_table.c.

Fixes: https://github.com/tukaani-project/xz/pull/69
Thanks to GitHub user Jamaika1.

(cherry picked from commit d90ed84db9)
2024-05-07 17:50:45 +03:00
Lasse Collin d7bff1341e liblzma: Use lzma_always_inline in memcmplen.h.
(cherry picked from commit 068ee436f4)
2024-05-07 17:50:45 +03:00
Lasse Collin ce8d257cbb liblzma: #define lzma_always_inline in common.h.
(cherry picked from commit 6cdf0a7b79)
2024-05-07 17:50:45 +03:00
Lasse Collin 47b3d2761e liblzma: Use lzma_attr_visibility_hidden on private extern declarations.
These variables are internal to liblzma and not exposed in the API.

(cherry picked from commit 33daad3961)
2024-05-07 17:50:45 +03:00
Lasse Collin 44c98e9399 liblzma: #define lzma_attr_visibility_hidden in common.h.
In ELF shared libs:

-fvisibility=hidden affects definitions of symbols but not
declarations.[*] This doesn't affect direct calls to functions
inside liblzma as a linker can replace a call to lzma_foo@plt
with a call directly to lzma_foo when -fvisibility=hidden is used.

[*] It has to be like this because otherwise every installed
    header file would need to explictly set the symbol visibility
    to default.

When accessing extern variables that aren't defined in the
same translation unit, compiler assumes that the variable has
the default visibility and thus indirection is needed. Unlike
function calls, linker cannot optimize this.

Using __attribute__((__visibility__("hidden"))) with the extern
variable declarations tells the compiler that indirection isn't
needed because the definition is in the same shared library.

About 15+ years ago, someone told me that it would be good if
the CRC tables would be defined in the same translation unit
as the C code of the CRC functions. While I understood that it
could help a tiny amount, I didn't want to change the code because
a separate translation unit for the CRC tables was needed for the
x86 assembly code anyway. But when visibility attributes are
supported, simply marking the extern declaration with the
hidden attribute will get identical result. When there are only
a few affected variables, this is trivial to do. I wish I had
understood this back then already.

(cherry picked from commit 6961a5ac7d)
2024-05-07 17:50:45 +03:00