Compare commits

...
Sign in to create a new pull request.

62 commits

Author SHA1 Message Date
Richard W.M. Jones
8829c783ae Add sv (Swedish) translations of man pages 2026-01-05 12:09:50 +00:00
Richard W.M. Jones
b3257761cf New upstream version 5.8.2 (RHBZ#2423317)
Remove patches which are included in this release.
2026-01-05 11:51:24 +00:00
Richard W.M. Jones
4dbfb6665e Add final workaround for "Failed to enable the sandbox" (RHEL-125143) 2025-11-23 19:09:51 +00:00
Richard W.M. Jones
6b51ecaa47 Add workaround for "Failed to enable the sandbox" (RHEL-125143)
Thanks: Lasse Collin
2025-11-22 19:32:59 +00:00
Adam Williamson
b7202e8874 Empty rebuild to try and fix gating issue 2025-07-24 15:53:28 +01:00
Siteshwar Vashisht
93e837ea6d Fix a shellcheck warning
Error: SHELLCHECK_WARNING (CWE-758): [#def1]
/etc/profile.d/colorxzgrep.sh:1:1: error[SC2148]: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.

Related: https://github.com/tukaani-project/xz/issues/174#issuecomment-2848635721

Signed-off-by: Siteshwar Vashisht <svashisht@redhat.com>
2025-05-08 10:23:58 +02:00
Adam Williamson
781e3e45cd drop gating.yaml
the gate on rpmdeplint was added to guard against the strict
version tie in perl-Compress-Raw-Lzma, but we were able to
remove that recently, so it's no longer an issue. The gate
causes a problem because rpmdeplint is only run on Rawhide, but
the policy was written to apply the gate to all branches, so
this prevents updates for non-Rawhide branches from going stable.
For simplicity's sake, let's just get rid of it.
2025-04-23 23:32:23 -07:00
Richard W.M. Jones
c19b7d7f71 Remove accidental ANSI escape sequence in comment
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2359454
2025-04-14 10:56:26 +01:00
Richard W.M. Jones
db2ce28ced New upstream version 5.8.1
Fixes CVE-2025-31115 heap-use-after-free bug in threaded .xz decoder
2025-04-03 19:40:15 +01:00
Jakub Martisko
40e1f5b4b5 New upstream version 5.8.0 2025-03-26 18:43:25 +01:00
Fedora Release Engineering
61a897b0a9 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 16:27:35 +00:00
Richard W.M. Jones
236e0d31de perl-Compress-Raw-Lzma dep has been removed, rebuild
https://src.fedoraproject.org/rpms/perl-Compress-Raw-Lzma/pull-request/3
2024-10-11 09:54:36 +01:00
Richard W.M. Jones
af339afd3c New upstream version 5.6.3 (RHBZ#2316069) 2024-10-02 11:30:41 +01:00
Lukáš Zaoral
1904db7c75
fix licenses and finish SPDX license conversion 2024-08-08 10:37:41 +02:00
Fedora Release Engineering
402958c776 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 10:36:24 +00:00
Richard W.M. Jones
56abe645b0 Revert "Synch gating.yaml with RHEL 10"
This reverts commit 54d5874123.
2024-07-16 09:10:01 +01:00
Richard W.M. Jones
b6270c0554 Tabs vs spaces in Source2 line
To match adjacent Source lines.
2024-07-16 09:08:27 +01:00
Richard W.M. Jones
3f4f5bde45 Use SPDX license field 2024-07-16 09:05:59 +01:00
Richard W.M. Jones
54d5874123 Synch gating.yaml with RHEL 10 2024-07-16 09:05:45 +01:00
Richard W.M. Jones
2b38ff05a2 New upstream version 5.6.2 (RHBZ#2283854)
Remove "Jia Tan" pubkey, replace with Lasse Collin's.
2024-06-20 12:47:16 +01:00
Richard W.M. Jones
9194031788 Use %{epoch} in runtime Requires 2024-03-28 21:39:27 +00:00
Richard W.M. Jones
6837d4efbe Release 2 (Koji bug with epochs) 2024-03-28 21:20:54 +00:00
Richard W.M. Jones
b23eb66cb0 Revert to 5.4.6, bump epoch 2024-03-28 20:58:46 +00:00
Richard W.M. Jones
d86c40e1d5 New version 5.6.1 (RHBZ#2267598)
Reenable ifunc as it is supposed to be fixed in 5.6.1.
2024-03-09 12:32:37 +00:00
Richard W.M. Jones
3d6d772a73 Revert "--disable-ifunc (workaround for 2267598)"
This reverts commit 6db19f2231.
2024-03-09 12:26:05 +00:00
Richard W.M. Jones
6db19f2231 --disable-ifunc (workaround for 2267598) 2024-03-04 17:39:05 +00:00
Richard W.M. Jones
e61eb7cedc Rerun autoreconf unconditionally when building 2024-03-04 17:37:35 +00:00
Adam Williamson
ae7ee1da3c Bump with no changes so we can do a side tag build 2024-02-29 14:36:12 -08:00
Jindrich Novy
de73aff0c7 xz-5.6.0-1.fc41
- Rebase to version 5.6.0

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
2024-02-27 10:20:03 +01:00
Richard W.M. Jones
0c09a6280b New version 5.4.6 (RHBZ#2260521)
Fix Source URLs.
2024-01-29 11:28:48 +00:00
Fedora Release Engineering
1fdaced3e7 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 10:35:01 +00:00
Richard W.M. Jones
8942220b0e New version 5.4.5 (RHBZ#2247487) 2023-11-01 20:07:55 +00:00
Debarshi Ray
ede5ef902a Mark translations of manuals with %lang()
Minimal environments, like container images built for deploying
applications, may not want to install localization files.  eg., the
fedora base image sets the %_install_langs RPM macro to en_US in
/etc/rpm/macros.image-language-conf.

This requires localization files to be marked with %lang().  Otherwise,
they will still get installed regardless of %_install_langs.

https://src.fedoraproject.org/rpms/xz/pull-request/10
2023-10-19 18:11:00 +02:00
Richard W.M. Jones
748cb03a64 New version 5.4.4 (RHBZ#2228542) 2023-08-02 16:58:30 +01:00
Fedora Release Engineering
27be5da84e Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 19:25:27 +00:00
Richard W.M. Jones
01f277aa8e Rebase to version 5.4.3 (RHBZ#2179570)
- Update the pubkey which appears to have changed.
2023-05-04 18:59:06 +01:00
Adam Williamson
1be9f88345 Add a comment about rebuilding perl-Compress-Raw-Lzma
every time xz gets a version bump, FreeIPA dependencies break,
because perl-Compress-Raw-Lzma has a strict version dep on xz.
Every time I have to rediscover this and do the rebuild. So
let's do this to try and break the cycle!
2023-04-17 11:07:47 -07:00
Matej Mužila
f7632e4751 Rebase to version 5.4.2 (#2179570) 2023-04-17 16:25:39 +02:00
Petr Písař
8b9e0dff4f Enable gating on fedora-ci.koji-build.rpmdeplint.functional
perl-Compress-Raw-Lzma depends on an exact version of xz-libs and any
time xz is rebased the dependency breaks (bugs #2134183, #2149881).

Fedora CI already catches it
<https://artifacts.dev.testing-farm.io/cc6f0fc7-a772-4e21-843c-a97155e64c53/>:

Dependency problems with repos:
nothing provides xz-libs(x86-64) = 5.2.7 needed by perl-Compress-Raw-Lzma-2.201-4.fc38.x86_64
nothing provides xz-libs(x86-64) = 5.2.7 needed by perl-Compress-Raw-Lzma-2.201-4.fc38.x86_64

But CI results are ignored by default.

This patch turns respecting the dependency test retults on. Whenever
the test fails, Bodhi pauses the automtic move of the xz build into
a stable Fedora repository. Then the maintainer is supposed to unbreak
the test (i.e. rebuild perl-Compress-Raw-Lzma against the new xz in
a side tag) and add the new perl-Compress-Raw-Lzma build to the
paused update. Then Fedora CI will rerun the test and the test will pass.
2023-04-13 15:02:06 +02:00
Richard W.M. Jones
0eb90a9a21 Rebase to version 5.4.1 (#2142405) 2023-01-23 09:52:22 +00:00
Fedora Release Engineering
99c2c2751d Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 07:59:54 +00:00
Richard W.M. Jones
d89cab5614 Rebase to version 5.2.9 (#2142405) 2022-12-01 08:18:50 +00:00
Matej Mužila
61fc34c1ad Rebase to version 5.2.8 (#2142405) 2022-11-22 13:12:58 +01:00
Matej Mužila
93a4de004d Rebase to version 5.2.7 (#2131313) 2022-10-12 11:34:27 +02:00
Matej Mužila
69aef98696 Rebase to version 5.2.6 (#2117931) 2022-08-31 10:59:12 +02:00
Fedora Release Engineering
be49692558 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 13:39:42 +00:00
Todd Zullinger
6d37071e26 .gitignore: add expanded source dir 2022-04-16 14:37:34 -04:00
Todd Zullinger
581455111c xzgrep: arbitrary-file-write vulnerability (#2073310, CVE-2022-1271) 2022-04-16 14:35:59 -04:00
Todd Zullinger
5de70d5522 verify upstream GPG signature
Follow the "Source File Verification" packaging guidelines¹.  Adjust the
git ignore pattern to match the .sig file and use a glob to avoid neding
to update it for each upstream release.

While here, fix the make BR alignment (tabs are used in this spec file
rather than spaces).

¹ https://docs.fedoraproject.org/en-US/packaging-guidelines/#_source_file_verification
2022-04-16 14:34:25 -04:00
Fedora Release Engineering
992f194185 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 05:37:14 +00:00
Fedora Release Engineering
1279da681f - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 22:03:39 +00:00
c79fe5d5e0 Remove the ancient PPC64 hack
The package should honor the global build flags
2021-02-12 22:04:34 +01:00
Fedora Release Engineering
191ea0dfb3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-28 00:28:40 +00:00
Robert Scheck
74ead506a2 Minor spec file optimizations 2021-01-13 03:04:28 +00:00
Tom Stellard
f57c867623 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-09 01:43:49 +00:00
Ondrej Dubaj
654619b994 fixed date 2021-01-04 10:50:58 +01:00
Ondrej Dubaj
a1cb606d82 Enable Intel CET in i686
Resolves: #1910368
2021-01-04 09:17:14 +01:00
Fedora Release Engineering
61772e8d9a - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 15:09:53 +00:00
Richard W.M. Jones
2e194109c9 Fix location of German man pages (RHBZ#1844813). 2020-06-08 14:05:37 +01:00
Ondrej Dubaj
a06715cb23 Rebased to version 5.2.5 (#1818418) 2020-03-30 11:42:30 +02:00
Fedora Release Engineering
d98ae5b5cb - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-31 05:01:26 +00:00
Petr Kubat
e9c4d62f1d Use relative path for COPYING files so that rpm moves them to correct place
Related: rhbz#1741074
2019-08-21 11:45:10 +02:00
10 changed files with 250 additions and 253 deletions

5
.gitignore vendored
View file

@ -1 +1,4 @@
/xz-5.2.4.tar.xz
/*.sig
/*.tar.gz
/*.tar.xz
/xz-*/

View file

@ -1,3 +1,4 @@
# shellcheck shell=sh
/usr/libexec/grepconf.sh -c || return
alias xzgrep='xzgrep --color=auto' 2>/dev/null
alias xzegrep='xzegrep --color=auto' 2>/dev/null

52
lasse_collin_pubkey.txt Normal file
View file

@ -0,0 +1,52 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
888/gToe5kb8qYwy
=6rZC
-----END PGP PUBLIC KEY BLOCK-----

View file

@ -1 +1,2 @@
SHA512 (xz-5.2.4.tar.xz) = 00db7dd31a61541b1ce6946e0f21106f418dd1ac3f27cdb8682979cbc3bd777cd6dd1f04f9ba257a0a7e24041e15ca40d0dd5c130380dce62280af67a0beb97f
SHA512 (xz-5.8.2.tar.gz) = 0b808fc8407e7c50da3a7b2db05be732c2fcd41850b92c7f5647181443483848ff359e176c816ce2038c115273f51575877c14f1356417cc9d53845841acb063
SHA512 (xz-5.8.2.tar.gz.sig) = 91c8d49d8ad0eb1e128203cf2c051fb200ec0e2b5eebea10a39945a998d24f11652a000faefa688d129327593043271314cbf115d78c21eeed738476dd2defb6

View file

@ -1,13 +0,0 @@
diff --git a/src/scripts/xzless.in b/src/scripts/xzless.in
index a3da697..288dd87 100644
--- a/src/scripts/xzless.in
+++ b/src/scripts/xzless.in
@@ -46,7 +46,7 @@ if test "${LESSMETACHARS+set}" != set; then
LESSMETACHARS="$space$tab$nl'"';*?"()<>[|&^`#\$%=~'
fi
-if test "$(less -V | { read ver && echo ${ver#less }; })" -ge 429; then
+if test "$(less -V | { read less ver re && echo ${ver}; })" -ge 429; then
# less 429 or later: LESSOPEN pipe will be used on
# standard input if $LESSOPEN begins with |-.
LESSOPEN="|-$xz -cdfq -- %s"

View file

@ -1,81 +0,0 @@
diff --git a/src/xz/message.c b/src/xz/message.c
index abbd171..ce953ac 100644
--- a/src/xz/message.c
+++ b/src/xz/message.c
@@ -1110,7 +1110,8 @@ message_help(bool long_help)
puts(_(
" -z, --compress force compression\n"
-" -d, --decompress force decompression\n"
+" -d, --decompress, --uncompress\n"
+" force decompression\n"
" -t, --test test compressed file integrity\n"
" -l, --list list information about .xz files"));
@@ -1120,7 +1121,8 @@ message_help(bool long_help)
puts(_(
" -k, --keep keep (don't delete) input files\n"
" -f, --force force overwrite of output file and (de)compress links\n"
-" -c, --stdout write to standard output and don't delete input files"));
+" -c, --stdout, --to-stdout\n"
+" write to standard output and don't delete input files"));
if (long_help) {
puts(_(
@@ -1152,6 +1154,10 @@ message_help(bool long_help)
" -e, --extreme try to improve compression ratio by using more CPU time;\n"
" does not affect decompressor memory requirements"));
+ puts(_(
+" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n"
+" to use the number of processor cores"));
+
if (long_help) {
// FIXME? Mention something about threading?
puts(_(
@@ -1166,7 +1172,7 @@ message_help(bool long_help)
puts(_( // xgettext:no-c-format
" --memlimit-compress=LIMIT\n"
" --memlimit-decompress=LIMIT\n"
-" -M, --memlimit=LIMIT\n"
+" -M, --memlimit=LIMIT, (old alias --memory=LIMIT)\n"
" set memory usage limit for compression, decompression,\n"
" or both; LIMIT is in bytes, % of RAM, or 0 for defaults"));
diff --git a/src/xz/xz.1 b/src/xz/xz.1
index 0368f05..e5da140 100644
--- a/src/xz/xz.1
+++ b/src/xz/xz.1
@@ -912,7 +912,7 @@ See
for possible ways to specify the
.IR limit .
.TP
-\fB\-M\fR \fIlimit\fR, \fB\-\-memlimit=\fIlimit\fR, \fB\-\-memory=\fIlimit
+\fB\-M\fR \fIlimit\fR, \fB\-\-memlimit=\fIlimit\fR, (old alias \fB\-\-memory=\fIlimit\fR)
This is equivalent to specifying \fB\-\-memlimit\-compress=\fIlimit
\fB\-\-memlimit\-decompress=\fIlimit\fR.
.TP
diff --git a/src/xzdec/xzdec.c b/src/xzdec/xzdec.c
index b7830db..48ac1fe 100644
--- a/src/xzdec/xzdec.c
+++ b/src/xzdec/xzdec.c
@@ -64,13 +64,15 @@ help(void)
"Usage: %s [OPTION]... [FILE]...\n"
"Uncompress files in the ." TOOL_FORMAT " format to the standard output.\n"
"\n"
-" -c, --stdout (ignored)\n"
-" -d, --decompress (ignored)\n"
-" -k, --keep (ignored)\n"
" -q, --quiet specify *twice* to suppress errors\n"
-" -Q, --no-warn (ignored)\n"
" -h, --help display this help and exit\n"
" -V, --version display the version number and exit\n"
+" -c, --stdout, --to-stdout\n"
+" ignored, data are always written to standard output\n"
+" -d, --decompress, --uncompress\n"
+" ignored, only decompression is supported\n"
+" -k, --keep ignored, we never create/remove any files\n"
+" -Q, --no-warn ignored, we never use exit status 2\n"
"\n"
"With no FILE, or when FILE is -, read standard input.\n"
"\n"

View file

@ -1,23 +0,0 @@
commit 5019413a055ce29e660dbbf15e02443cb5a26c59
Author: Jeff Bastian <jbastian@redhat.com>
AuthorDate: Wed Apr 3 13:59:17 2013 +0200
Commit: Lasse Collin <lasse.collin@tukaani.org>
CommitDate: Fri Apr 5 19:14:50 2013 +0300
xzgrep: make the '-h' option to be --no-filename equivalent
* src/scripts/xzgrep.in: Accept the '-h' option in argument parsing.
diff --git a/src/scripts/xzgrep.in b/src/scripts/xzgrep.in
index d8e9bb5..951266b 100644
--- a/src/scripts/xzgrep.in
+++ b/src/scripts/xzgrep.in
@@ -109,7 +109,7 @@ while test $# -ne 0; do
files_with_matches=1;;
(-L | --files-witho*)
files_without_matches=1;;
- (--no-f*)
+ (-h | --no-f*)
no_filename=1;;
(-V | --v | --ve | --ver | --vers | --versi | --versio | --version)
echo "$version" || exit 2

View file

@ -1,60 +0,0 @@
commit 1e60f2c0a0ee6c18b02943ce56214799a70aac26 (HEAD, origin/master, origin/HEAD, master)
Author: Lasse Collin <lasse.collin@tukaani.org>
AuthorDate: Wed Jun 11 21:03:25 2014 +0300
Commit: Lasse Collin <lasse.collin@tukaani.org>
CommitDate: Wed Jun 11 21:03:25 2014 +0300
xzgrep: Add a test for the previous fix.
This is a simplified version of Pavel Raiskup's
original patch.
diff --git a/tests/test_scripts.sh b/tests/test_scripts.sh
index 293929e..7ac1fea 100755
--- a/tests/test_scripts.sh
+++ b/tests/test_scripts.sh
@@ -12,16 +12,18 @@
# If scripts weren't built, this test is skipped.
XZ=../src/xz/xz
XZDIFF=../src/scripts/xzdiff
-test -x "$XZ" || XZ=
-test -x "$XZDIFF" || XZDIFF=
-if test -z "$XZ" || test -z "$XZDIFF"; then
+XZGREP=../src/scripts/xzgrep
+
+for i in XZ XZDIFF XZGREP; do
+ eval test -x "\$$i" && continue
(exit 77)
exit 77
-fi
+done
PATH=`pwd`/../src/xz:$PATH
export PATH
+test -z "$srcdir" && srcdir=.
preimage=$srcdir/files/good-1-check-crc32.xz
samepostimage=$srcdir/files/good-1-check-crc64.xz
otherpostimage=$srcdir/files/good-1-lzma2-1.xz
@@ -50,5 +52,21 @@ if test "$status" != 2 ; then
exit 1
fi
+# The exit status must be 0 when a match was found at least from one file,
+# and 1 when no match was found in any file.
+for pattern in el Hello NOMATCH; do
+ for opts in "" "-l" "-h" "-H"; do
+ "$XZGREP" $opts $pattern \
+ "$srcdir/files/good-1-lzma2-1.xz" \
+ "$srcdir/files/good-2-lzma2.xz" > /dev/null 2>&1
+ status=$?
+ test $status = 0 && test $pattern != NOMATCH && continue
+ test $status = 1 && test $pattern = NOMATCH && continue
+ echo "wrong exit status from xzgrep"
+ (exit 1)
+ exit 1
+ done
+done
+
(exit 0)
exit 0

View file

@ -1,50 +0,0 @@
commit ceca37901783988204caaf40dff4623d535cc789
Author: Lasse Collin <lasse.collin@tukaani.org>
AuthorDate: Wed Jun 11 20:43:28 2014 +0300
Commit: Lasse Collin <lasse.collin@tukaani.org>
CommitDate: Wed Jun 11 20:43:28 2014 +0300
xzgrep: exit 0 when at least one file matches.
Mimic the original grep behavior and return exit_success when
at least one xz compressed file matches given pattern.
Original bugreport:
https://bugzilla.redhat.com/show_bug.cgi?id=1108085
Thanks to Pavel Raiskup for the patch.
diff --git a/src/scripts/xzgrep.in b/src/scripts/xzgrep.in
index 951266b..018915f 100644
--- a/src/scripts/xzgrep.in
+++ b/src/scripts/xzgrep.in
@@ -147,7 +147,9 @@ if test $# -eq 0; then
fi
exec 3>&1
-res=0
+
+# res=1 means that no file matched yet
+res=1
for i; do
case $i in
@@ -195,8 +197,17 @@ for i; do
fi >&3 5>&-
)
r=$?
+
+ # fail occured previously, nothing worse can happen
+ test $res -gt 1 && continue
+
test "$xz_status" -eq 0 || test "$xz_status" -eq 2 \
|| test "$(kill -l "$xz_status" 2> /dev/null)" = "PIPE" || r=2
- test $res -lt $r && res=$r
+
+ # still no match
+ test $r -eq 1 && continue
+
+ # 0 == match, >=2 == fail
+ res=$r
done
exit $res

215
xz.spec
View file

@ -3,29 +3,40 @@
Summary: LZMA compression utilities
Name: xz
Version: 5.2.4
Release: 6%{?dist}
Epoch: 1
Version: 5.8.2
Release: 1%{?dist}
# liblzma - 0BSD
# xz{,dec}, lzma{dec,info} - 0BSD
# - getopt_long - LGPL-2.1-or-later - not built in Fedora
# xz{grep,diff,less,more} - GPL-2.0-or-later
# docs - BSD0 AND LicenseRef-Fedora-Public-Domain
# man pages and translations - 0BSD AND LicenseRef-Fedora-Public-Domain
# See: https://gitlab.com/fedora/legal/fedora-license-data/-/issues/547
License: 0BSD AND GPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain
# Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are
# GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its
# OK), documentation is Public Domain.
License: GPLv2+ and Public Domain
# official upstream release
Source0: http://tukaani.org/%{name}/%{name}-%{version}.tar.xz
Source0: https://github.com/tukaani-project/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
Source1: https://github.com/tukaani-project/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz.sig
Source2: https://tukaani.org/misc/lasse_collin_pubkey.txt
Source100: colorxzgrep.sh
Source101: colorxzgrep.csh
URL: http://tukaani.org/%{name}/
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
URL: https://tukaani.org/%{name}/
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
# For /usr/libexec/grepconf.sh (RHBZ#1189120).
# Unfortunately F21 has a newer version of grep which doesn't
# have grepconf, but we're only concerned with F22 here.
Requires: grep >= 2.20-5
BuildRequires: make
BuildRequires: gcc
BuildRequires: gnupg2
BuildRequires: perl-interpreter
BuildRequires: autoconf automake libtool gettext-devel
%description
@ -41,7 +52,7 @@ decompression speed fast.
%package libs
Summary: Libraries for decoding LZMA compression
License: Public Domain
License: 0BSD
Obsoletes: %{name}-compat-libs < %{version}-%{release}
%description libs
@ -50,7 +61,7 @@ Libraries for decoding files compressed with LZMA or XZ utils.
%package static
Summary: Statically linked library for decoding LZMA compression
License: Public Domain
License: 0BSD
%description static
Statically linked library for decoding files compressed with LZMA or
@ -59,8 +70,8 @@ XZ utils. Most users should *not* install this.
%package devel
Summary: Devel libraries & headers for liblzma
License: Public Domain
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
License: 0BSD
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%description devel
Devel libraries and headers for liblzma.
@ -68,9 +79,9 @@ Devel libraries and headers for liblzma.
%package lzma-compat
Summary: Older LZMA format compatibility binaries
# Just a set of symlinks to 'xz' + two Public Domain binaries.
License: Public Domain
Requires: %{name}%{?_isa} = %{version}-%{release}
# Just a set of symlinks to some files in the 'xz' package.
License: 0BSD AND GPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
Obsoletes: lzma < %{version}
Provides: lzma = %{version}
@ -80,16 +91,14 @@ commands that deal with the older LZMA format.
%prep
%autosetup
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%autosetup -p1
autoreconf -fi
%build
export CFLAGS="%optflags"
%ifarch %{power64}
CFLAGS="$CFLAGS -O3"
%endif
%ifarch %ix86
# rhbz#1630650, annocheck reports the following message because liblzma uses
# crc*_x86.S asm code on i686:
@ -122,21 +131,30 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check
%files -f %{name}.lang
%license %{_pkgdocdir}/COPYING*
%license COPYING*
%doc %{_pkgdocdir}
%exclude %_pkgdocdir/examples*
%{_bindir}/*xz*
%{_mandir}/man1/*xz*
%lang(de) %{_mandir}/de/man1/*xz*
%lang(fr) %{_mandir}/fr/man1/*xz*
%lang(it) %{_mandir}/it/man1/*xz*
%lang(ko) %{_mandir}/ko/man1/*xz*
%lang(pt_BR) %{_mandir}/pt_BR/man1/*xz*
%lang(ro) %{_mandir}/ro/man1/*xz*
%lang(sr) %{_mandir}/sr/man1/*xz*
%lang(sv) %{_mandir}/sv/man1/*xz*
%lang(uk) %{_mandir}/uk/man1/*xz*
%{profiledir}/*
%files libs
%license %{_pkgdocdir}/COPYING
%license COPYING
%{_libdir}/lib*.so.5*
%files static
%license %{_pkgdocdir}/COPYING
%license COPYING
%{_libdir}/liblzma.a
@ -152,9 +170,157 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check
%files lzma-compat
%{_bindir}/*lz*
%{_mandir}/man1/*lz*
%lang(de) %{_mandir}/de/man1/*lz*
%lang(fr) %{_mandir}/fr/man1/*lz*
%lang(it) %{_mandir}/it/man1/*lz*
%lang(ko) %{_mandir}/ko/man1/*lz*
%lang(pt_BR) %{_mandir}/pt_BR/man1/*lz*
%lang(ro) %{_mandir}/ro/man1/*lz*
%lang(sr) %{_mandir}/sr/man1/*lz*
%lang(sv) %{_mandir}/sv/man1/*lz*
%lang(uk) %{_mandir}/uk/man1/*lz*
%changelog
* Mon Jan 05 2026 Richard W.M. Jones <rjones@redhat.com> - 1:5.8.2-1
- New upstream version 5.8.2 (RHBZ#2423317)
- Remove patches which are included in this release.
* Sun Nov 23 2025 Richard W.M. Jones <rjones@redhat.com> - 1:5.8.1-4
- Add final workaround for "Failed to enable the sandbox" (RHEL-125143)
* Sat Nov 22 2025 Richard W.M. Jones <rjones@redhat.com> - 1:5.8.1-3
- Add workaround for "Failed to enable the sandbox" (RHEL-125143)
* Thu Apr 24 2025 Adam Williamson <awilliam@redhat.com> - 1:5.8.1-2
- Empty rebuild to try and fix gating issue
* Thu Apr 03 2025 Richard W.M. Jones <rjones@redhat.com> - 1:5.8.1-1
- New upstream version 5.8.1
- Fixes CVE-2025-31115 heap-use-after-free bug in threaded .xz decoder
* Wed Mar 26 2025 Jakub Martisko <jamartis@redhat.com> - 1:5.8.0-1
- New upstream version 5.8.0
Resolves: rhbz#2341818
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.6.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Oct 11 2024 Richard W.M. Jones <rjones@redhat.com> - 1:5.6.3-2
- perl-Compress-Raw-Lzma dep has been removed, rebuild
https://src.fedoraproject.org/rpms/perl-Compress-Raw-Lzma/pull-request/3
* Wed Oct 02 2024 Richard W.M. Jones <rjones@redhat.com> - 1:5.6.3-1
- New upstream version 5.6.3 (RHBZ#2316069)
* Thu Aug 08 2024 Lukáš Zaoral <lzaoral@redhat.com> - 1:5.6.2-3
- fix licenses and finish SPDX license conversion
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.6.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Thu Jun 20 2024 Richard W.M. Jones <rjones@redhat.com> - 1:5.6.2-1
- New upstream version 5.6.2 (RHBZ#2283854)
- Remove "Jia Tan" pubkey, replace with Lasse Collin's.
* Thu Mar 28 2024 Richard W.M. Jones <rjones@redhat.com> - 1:5.4.6-3
- Revert to 5.4.6, bump epoch
* Sat Mar 09 2024 Richard W.M. Jones <rjones@redhat.com> - 5.6.1-1
- New version 5.6.1 (RHBZ#2267598)
- Reenable ifunc as it is supposed to be fixed in 5.6.1.
* Mon Mar 04 2024 Richard W.M. Jones <rjones@redhat.com> - 5.6.0-3
- --disable-ifunc (workaround for 2267598)
* Thu Feb 29 2024 Adam Williamson <awilliam@redhat.com> - 5.6.0-2
- Rebuild on a side tag to create a coherent update
* Tue Feb 27 2024 Jindrich Novy <jnovy@redhat.com> - 5.6.0-1
- Rebase to version 5.6.0
* Mon Jan 29 2024 Richard W.M. Jones <rjones@redhat.com> - 5.4.6-1
- New version 5.4.6 (RHBZ#2260521)
- Fix Source URLs.
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Nov 01 2023 Richard W.M. Jones <rjones@redhat.com> - 5.4.5-1
- New version 5.4.5 (RHBZ#2247487)
* Thu Oct 19 2023 Debarshi Ray <rishi@fedoraproject.org> - 5.4.4-2
- Mark translations of manuals with %%lang()
* Wed Aug 02 2023 Richard W.M. Jones <rjones@redhat.com> - 5.4.4-1
- New version 5.4.4 (RHBZ#2228542)
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu May 04 2023 Richard W.M. Jones <rjones@redhat.com> - 5.4.3-1
- Rebase to version 5.4.3 (RHBZ#2179570)
- Update the pubkey which appears to have changed.
* Mon Apr 17 2023 Matej Mužila <mmuzila@redhat.com> - 5.4.2-1
- Rebase to version 5.4.2 (#2179570)
* Mon Jan 23 2023 Richard W.M. Jones <rjones@redhat.com> - 5.4.1-1
- Rebase to version 5.4.1 (#2142405)
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Dec 01 2022 Richard W.M. Jones <rjones@redhat.com> - 5.2.9-1
- Rebase to version 5.2.9 (#2142405)
* Tue Nov 22 2022 Matej Mužila <mmuzila@redhat.com> - 5.2.8-1
- Rebase to version 5.2.8 (#2142405)
* Tue Aug 30 2022 Matej Mužila <mmuzila@redhat.com> - 5.2.7-1
- Rebase to version 5.2.7 (#2131313)
* Tue Aug 30 2022 Matej Mužila <mmuzila@redhat.com> - 5.2.6-1
- Rebase to version 5.2.6 (#2117931)
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.5-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Apr 16 2022 Todd Zullinger <tmz@pobox.com> - 5.2.5-9
- verify upstream GPG signature
- xzgrep: arbitrary-file-write vulnerability (#2073310, CVE-2022-1271)
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.5-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Feb 12 2021 Michal Schorm <mschorm@redhat.com> - 5.2.5-6
- Remove the ancient PPC64 hack
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jan 04 2021 Ondrej Dubaj <odubaj@redhat.com> - 5.2.5-4
- Enabled CET for i686 (#1910368)
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jun 8 2020 Richard W.M. Jones <rjones@redhat.com> - 5.2.5-2
- Fix location of German man pages (RHBZ#1844813).
* Mon Mar 30 2020 Ondrej Dubaj <odubaj@redhat.com> - 5.2.5-1
- Rebase to version 5.2.5 (#1818418)
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Aug 21 2019 Petr Kubat <pkubat@redhat.com> - 5.2.4-7
- Use relative path for COPYING files so that rpm moves them to correct place
Related: rhbz#1741074
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
@ -187,6 +353,7 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check
- Cleanup spec
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.3-3