From ede5ef902a02949e58dc264643090c4c9f075eb7 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 19 Oct 2023 17:58:57 +0200 Subject: [PATCH 01/33] 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 --- xz.spec | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/xz.spec b/xz.spec index 0fc1124..ee90e88 100644 --- a/xz.spec +++ b/xz.spec @@ -6,7 +6,7 @@ Name: xz # **PLEASE NOTE**: when bumping xz version, please rebuild # perl-Compress-Raw-Lzma, it has a strict xz version dep Version: 5.4.4 -Release: 1%{?dist} +Release: 2%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -130,12 +130,12 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %exclude %_pkgdocdir/examples* %{_bindir}/*xz* %{_mandir}/man1/*xz* -%{_mandir}/de/man1/*xz* -%{_mandir}/fr/man1/*xz* -%{_mandir}/ko/man1/*xz* -%{_mandir}/ro/man1/*xz* -%{_mandir}/uk/man1/*xz* -%{_mandir}/pt_BR/man1/*xz* +%lang(de) %{_mandir}/de/man1/*xz* +%lang(fr) %{_mandir}/fr/man1/*xz* +%lang(ko) %{_mandir}/ko/man1/*xz* +%lang(ro) %{_mandir}/ro/man1/*xz* +%lang(uk) %{_mandir}/uk/man1/*xz* +%lang(pt_BR) %{_mandir}/pt_BR/man1/*xz* %{profiledir}/* @@ -161,15 +161,18 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %files lzma-compat %{_bindir}/*lz* %{_mandir}/man1/*lz* -%{_mandir}/de/man1/*lz* -%{_mandir}/fr/man1/*lz* -%{_mandir}/ko/man1/*lz* -%{_mandir}/ro/man1/*lz* -%{_mandir}/uk/man1/*lz* -%{_mandir}/pt_BR/man1/*lz* +%lang(de) %{_mandir}/de/man1/*lz* +%lang(fr) %{_mandir}/fr/man1/*lz* +%lang(ko) %{_mandir}/ko/man1/*lz* +%lang(ro) %{_mandir}/ro/man1/*lz* +%lang(uk) %{_mandir}/uk/man1/*lz* +%lang(pt_BR) %{_mandir}/pt_BR/man1/*lz* %changelog +* Thu Oct 19 2023 Debarshi Ray - 5.4.4-2 +- Mark translations of manuals with %%lang() + * Wed Aug 02 2023 Richard W.M. Jones - 5.4.4-1 - New version 5.4.4 (RHBZ#2228542) From 8942220b0eadade84ae9a2af4c8ab96cc59396c3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 1 Nov 2023 20:07:55 +0000 Subject: [PATCH 02/33] New version 5.4.5 (RHBZ#2247487) --- sources | 4 ++-- xz.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index c9e4858..8d8b379 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xz-5.4.4.tar.xz) = 2b233a924b82190ff15e970c5a4a59f1c53a0b39a96bde228c9dfc9b103b4a3e5888f5024da4834e180f6010620ff23caf9f7135a38724eb2c8d01bff7a9a9e1 -SHA512 (xz-5.4.4.tar.xz.sig) = dfe89d565e915e95ea6e83cbae8787ebb26b2d398d754f70370c2bfc732f7eb040a1fd963c6bd2a02c2d7fe0b420119e2cac919044dc8401726ba0074de0756d +SHA512 (xz-5.4.5.tar.xz) = 5cbc3b5bb35a9f5773ad657788fe77013471e3b621c5a8149deb7389d48535926e5bed103456fcfe5ecb044b236b1055b03938a6cc877cfc749372b899fc79e5 +SHA512 (xz-5.4.5.tar.xz.sig) = 12899cd4a3f5fffdb518bd4f1f17c6f329a2b14ce4e2f0c2c778c1a1b8b601bcd2df43de62e20f95fdf6cccd5c27eebe950544382714785e50cf66f13d1ef285 diff --git a/xz.spec b/xz.spec index ee90e88..efc5e03 100644 --- a/xz.spec +++ b/xz.spec @@ -5,8 +5,8 @@ Summary: LZMA compression utilities Name: xz # **PLEASE NOTE**: when bumping xz version, please rebuild # perl-Compress-Raw-Lzma, it has a strict xz version dep -Version: 5.4.4 -Release: 2%{?dist} +Version: 5.4.5 +Release: 1%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -170,6 +170,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Wed Nov 01 2023 Richard W.M. Jones - 5.4.5-1 +- New version 5.4.5 (RHBZ#2247487) + * Thu Oct 19 2023 Debarshi Ray - 5.4.4-2 - Mark translations of manuals with %%lang() From 1fdaced3e72aac8648a5d87f4bdbd738c230e2e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 10:35:01 +0000 Subject: [PATCH 03/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index efc5e03..9eb6dc0 100644 --- a/xz.spec +++ b/xz.spec @@ -6,7 +6,7 @@ Name: xz # **PLEASE NOTE**: when bumping xz version, please rebuild # perl-Compress-Raw-Lzma, it has a strict xz version dep Version: 5.4.5 -Release: 1%{?dist} +Release: 2%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -170,6 +170,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 5.4.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Nov 01 2023 Richard W.M. Jones - 5.4.5-1 - New version 5.4.5 (RHBZ#2247487) From 0c09a6280b4a0c4fd7a9fc742c09469c95ff431f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 29 Jan 2024 11:28:12 +0000 Subject: [PATCH 04/33] New version 5.4.6 (RHBZ#2260521) Fix Source URLs. --- .gitignore | 1 + sources | 4 ++-- xz.spec | 12 ++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 32cf204..41b1ddb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /*.sig +/*.tar.gz /*.tar.xz /xz-*/ diff --git a/sources b/sources index 8d8b379..e857edd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xz-5.4.5.tar.xz) = 5cbc3b5bb35a9f5773ad657788fe77013471e3b621c5a8149deb7389d48535926e5bed103456fcfe5ecb044b236b1055b03938a6cc877cfc749372b899fc79e5 -SHA512 (xz-5.4.5.tar.xz.sig) = 12899cd4a3f5fffdb518bd4f1f17c6f329a2b14ce4e2f0c2c778c1a1b8b601bcd2df43de62e20f95fdf6cccd5c27eebe950544382714785e50cf66f13d1ef285 +SHA512 (xz-5.4.6.tar.gz) = b08a61d8d478d3b4675cb1ddacdbbd98dc6941a55bcdd81a28679e54e9367d3a595fa123ac97874a17da571c1b712e2a3e901c2737099a9d268616a1ba3de497 +SHA512 (xz-5.4.6.tar.gz.sig) = d5e32b944e7492a32c40f675d918796e077f63490a23c6fce5c4d6d1eebc443f129d27a2e888913c5a36c3ffdac75b9c96c1749402283445e0ba9ff72b965741 diff --git a/xz.spec b/xz.spec index 9eb6dc0..2efadbc 100644 --- a/xz.spec +++ b/xz.spec @@ -5,16 +5,16 @@ Summary: LZMA compression utilities Name: xz # **PLEASE NOTE**: when bumping xz version, please rebuild # perl-Compress-Raw-Lzma, it has a strict xz version dep -Version: 5.4.5 -Release: 2%{?dist} +Version: 5.4.6 +Release: 1%{?dist} # 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: https://tukaani.org/%{name}/%{name}-%{version}.tar.xz -Source1: https://tukaani.org/%{name}/%{name}-%{version}.tar.xz.sig +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/jia_tan_pubkey.txt Source100: colorxzgrep.sh @@ -170,6 +170,10 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Mon Jan 29 2024 Richard W.M. Jones - 5.4.6-1 +- New version 5.4.6 (RHBZ#2260521) +- Fix Source URLs. + * Sat Jan 27 2024 Fedora Release Engineering - 5.4.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From de73aff0c7dc3a64f7a15c65c431cd73e96a3b9b Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Tue, 27 Feb 2024 10:18:13 +0100 Subject: [PATCH 05/33] xz-5.6.0-1.fc41 - Rebase to version 5.6.0 Signed-off-by: Jindrich Novy --- sources | 4 ++-- xz.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index e857edd..217faae 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xz-5.4.6.tar.gz) = b08a61d8d478d3b4675cb1ddacdbbd98dc6941a55bcdd81a28679e54e9367d3a595fa123ac97874a17da571c1b712e2a3e901c2737099a9d268616a1ba3de497 -SHA512 (xz-5.4.6.tar.gz.sig) = d5e32b944e7492a32c40f675d918796e077f63490a23c6fce5c4d6d1eebc443f129d27a2e888913c5a36c3ffdac75b9c96c1749402283445e0ba9ff72b965741 +SHA512 (xz-5.6.0.tar.gz) = 1ef3cd3607818314e55b28c20263a9088d4b6e5362a45fbd37c17e799e26b4a7579928b99925ffe71e7804b0db2f65936f66a825bac9b23b7b0664f902925de8 +SHA512 (xz-5.6.0.tar.gz.sig) = 2800c3f440b6b17b61c418e12945f136535cc5a59069be2ee0de37e312e9ad16a29338152990eeb22ebe6cc3513679bdc40336cfa089a279d3b3476ac9d13ed0 diff --git a/xz.spec b/xz.spec index 2efadbc..f3512fc 100644 --- a/xz.spec +++ b/xz.spec @@ -5,7 +5,7 @@ Summary: LZMA compression utilities Name: xz # **PLEASE NOTE**: when bumping xz version, please rebuild # perl-Compress-Raw-Lzma, it has a strict xz version dep -Version: 5.4.6 +Version: 5.6.0 Release: 1%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are @@ -170,6 +170,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Tue Feb 27 2024 Jindrich Novy - 5.6.0-1 +- Rebase to version 5.6.0 + * Mon Jan 29 2024 Richard W.M. Jones - 5.4.6-1 - New version 5.4.6 (RHBZ#2260521) - Fix Source URLs. From ae7ee1da3c0d9d3621e099ffafbc41c5ffee3591 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 29 Feb 2024 14:36:12 -0800 Subject: [PATCH 06/33] Bump with no changes so we can do a side tag build --- xz.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index f3512fc..a4e2082 100644 --- a/xz.spec +++ b/xz.spec @@ -5,8 +5,10 @@ Summary: LZMA compression utilities Name: xz # **PLEASE NOTE**: when bumping xz version, please rebuild # perl-Compress-Raw-Lzma, it has a strict xz version dep +# do this on a side tag, according to +# https://docs.fedoraproject.org/en-US/package-maintainers/Package_Update_Guide/#multiple_packages Version: 5.6.0 -Release: 1%{?dist} +Release: 2%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -170,6 +172,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Thu Feb 29 2024 Adam Williamson - 5.6.0-2 +- Rebuild on a side tag to create a coherent update + * Tue Feb 27 2024 Jindrich Novy - 5.6.0-1 - Rebase to version 5.6.0 From e61eb7cedcc6e94bd493abfd52504fa37382be90 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 Mar 2024 17:08:13 +0000 Subject: [PATCH 07/33] Rerun autoreconf unconditionally when building --- xz.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xz.spec b/xz.spec index a4e2082..f718ef1 100644 --- a/xz.spec +++ b/xz.spec @@ -34,6 +34,7 @@ BuildRequires: make BuildRequires: gcc BuildRequires: gnupg2 BuildRequires: perl-interpreter +BuildRequires: autoconf automake libtool gettext-devel %description @@ -90,6 +91,7 @@ commands that deal with the older LZMA format. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 +autoreconf -fi %build From 6db19f2231927b4d93e9c021d32cb7433708e26f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 Mar 2024 17:39:05 +0000 Subject: [PATCH 08/33] --disable-ifunc (workaround for 2267598) --- xz.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xz.spec b/xz.spec index f718ef1..e0b8200 100644 --- a/xz.spec +++ b/xz.spec @@ -8,7 +8,7 @@ Name: xz # do this on a side tag, according to # https://docs.fedoraproject.org/en-US/package-maintainers/Package_Update_Guide/#multiple_packages Version: 5.6.0 -Release: 2%{?dist} +Release: 3%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -103,7 +103,10 @@ export CFLAGS="%optflags" CFLAGS="$CFLAGS -Wa,--generate-missing-build-notes=yes" %endif -%configure +# --disable-ifunc is temporarily required to work around +# https://bugzilla.redhat.com/show_bug.cgi?id=2267598 +# Can be removed when we understand what is really causing that bug. +%configure --disable-ifunc sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %make_build @@ -174,6 +177,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Mon Mar 04 2024 Richard W.M. Jones - 5.6.0-3 +- --disable-ifunc (workaround for 2267598) + * Thu Feb 29 2024 Adam Williamson - 5.6.0-2 - Rebuild on a side tag to create a coherent update From 3d6d772a738dbd9a31bbdc5e55b8c9c6139740bc Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 9 Mar 2024 12:25:42 +0000 Subject: [PATCH 09/33] Revert "--disable-ifunc (workaround for 2267598)" This reverts commit 6db19f2231927b4d93e9c021d32cb7433708e26f. --- xz.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/xz.spec b/xz.spec index e0b8200..304e518 100644 --- a/xz.spec +++ b/xz.spec @@ -103,10 +103,7 @@ export CFLAGS="%optflags" CFLAGS="$CFLAGS -Wa,--generate-missing-build-notes=yes" %endif -# --disable-ifunc is temporarily required to work around -# https://bugzilla.redhat.com/show_bug.cgi?id=2267598 -# Can be removed when we understand what is really causing that bug. -%configure --disable-ifunc +%configure sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %make_build From d86c40e1d5057547f5dc0404db68b8c42041c254 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 9 Mar 2024 12:28:42 +0000 Subject: [PATCH 10/33] New version 5.6.1 (RHBZ#2267598) Reenable ifunc as it is supposed to be fixed in 5.6.1. --- sources | 4 ++-- xz.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 217faae..980dc05 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xz-5.6.0.tar.gz) = 1ef3cd3607818314e55b28c20263a9088d4b6e5362a45fbd37c17e799e26b4a7579928b99925ffe71e7804b0db2f65936f66a825bac9b23b7b0664f902925de8 -SHA512 (xz-5.6.0.tar.gz.sig) = 2800c3f440b6b17b61c418e12945f136535cc5a59069be2ee0de37e312e9ad16a29338152990eeb22ebe6cc3513679bdc40336cfa089a279d3b3476ac9d13ed0 +SHA512 (xz-5.6.1.tar.gz) = 8af100eb83288f032e4813be2bf8de7d733c8761f77f078776c1391709241ad8fe3192d107664786e2543677915c5eeb3fe7add5c53b48b50c10a9de7c9f4fda +SHA512 (xz-5.6.1.tar.gz.sig) = 73f50ff5ce7f9d0a3bed1bc7d9e26de2217915517d2057f0c7102374eb20de1bb8b02a2f78680aae80b55913b2ede5141a118c51a2f565c6eba6ae8406474938 diff --git a/xz.spec b/xz.spec index 304e518..5d9e68f 100644 --- a/xz.spec +++ b/xz.spec @@ -7,8 +7,8 @@ Name: xz # perl-Compress-Raw-Lzma, it has a strict xz version dep # do this on a side tag, according to # https://docs.fedoraproject.org/en-US/package-maintainers/Package_Update_Guide/#multiple_packages -Version: 5.6.0 -Release: 3%{?dist} +Version: 5.6.1 +Release: 1%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -174,6 +174,10 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Sat Mar 09 2024 Richard W.M. Jones - 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 - 5.6.0-3 - --disable-ifunc (workaround for 2267598) From b23eb66cb0536135bc0bb09db2298c6b41434a66 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 28 Mar 2024 20:57:30 +0000 Subject: [PATCH 11/33] Revert to 5.4.6, bump epoch --- sources | 4 ++-- xz.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 980dc05..e857edd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xz-5.6.1.tar.gz) = 8af100eb83288f032e4813be2bf8de7d733c8761f77f078776c1391709241ad8fe3192d107664786e2543677915c5eeb3fe7add5c53b48b50c10a9de7c9f4fda -SHA512 (xz-5.6.1.tar.gz.sig) = 73f50ff5ce7f9d0a3bed1bc7d9e26de2217915517d2057f0c7102374eb20de1bb8b02a2f78680aae80b55913b2ede5141a118c51a2f565c6eba6ae8406474938 +SHA512 (xz-5.4.6.tar.gz) = b08a61d8d478d3b4675cb1ddacdbbd98dc6941a55bcdd81a28679e54e9367d3a595fa123ac97874a17da571c1b712e2a3e901c2737099a9d268616a1ba3de497 +SHA512 (xz-5.4.6.tar.gz.sig) = d5e32b944e7492a32c40f675d918796e077f63490a23c6fce5c4d6d1eebc443f129d27a2e888913c5a36c3ffdac75b9c96c1749402283445e0ba9ff72b965741 diff --git a/xz.spec b/xz.spec index 5d9e68f..083b50a 100644 --- a/xz.spec +++ b/xz.spec @@ -7,7 +7,8 @@ Name: xz # perl-Compress-Raw-Lzma, it has a strict xz version dep # do this on a side tag, according to # https://docs.fedoraproject.org/en-US/package-maintainers/Package_Update_Guide/#multiple_packages -Version: 5.6.1 +Epoch: 1 +Version: 5.4.6 Release: 1%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are @@ -174,6 +175,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Thu Mar 28 2024 Richard W.M. Jones - 1:5.4.6-1 +- Revert to 5.4.6, bump epoch + * Sat Mar 09 2024 Richard W.M. Jones - 5.6.1-1 - New version 5.6.1 (RHBZ#2267598) - Reenable ifunc as it is supposed to be fixed in 5.6.1. From 6837d4efbe41805efee9ea44c4a845e5e0c66d47 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 28 Mar 2024 21:20:54 +0000 Subject: [PATCH 12/33] Release 2 (Koji bug with epochs) --- xz.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xz.spec b/xz.spec index 083b50a..39aebf7 100644 --- a/xz.spec +++ b/xz.spec @@ -9,7 +9,7 @@ Name: xz # https://docs.fedoraproject.org/en-US/package-maintainers/Package_Update_Guide/#multiple_packages Epoch: 1 Version: 5.4.6 -Release: 1%{?dist} +Release: 2%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -175,7 +175,7 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog -* Thu Mar 28 2024 Richard W.M. Jones - 1:5.4.6-1 +* Thu Mar 28 2024 Richard W.M. Jones - 1:5.4.6-2 - Revert to 5.4.6, bump epoch * Sat Mar 09 2024 Richard W.M. Jones - 5.6.1-1 From 91940317881fb3fd42e1cd9453e52a62b0a4deb1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 28 Mar 2024 21:39:27 +0000 Subject: [PATCH 13/33] Use %{epoch} in runtime Requires --- xz.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xz.spec b/xz.spec index 39aebf7..761bf37 100644 --- a/xz.spec +++ b/xz.spec @@ -9,7 +9,7 @@ Name: xz # https://docs.fedoraproject.org/en-US/package-maintainers/Package_Update_Guide/#multiple_packages Epoch: 1 Version: 5.4.6 -Release: 2%{?dist} +Release: 3%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -24,7 +24,7 @@ Source100: colorxzgrep.sh Source101: colorxzgrep.csh URL: https://tukaani.org/%{name}/ -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +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 @@ -70,7 +70,7 @@ 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} +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} %description devel Devel libraries and headers for liblzma. @@ -80,7 +80,7 @@ Devel libraries and headers for liblzma. 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} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Obsoletes: lzma < %{version} Provides: lzma = %{version} @@ -175,7 +175,7 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog -* Thu Mar 28 2024 Richard W.M. Jones - 1:5.4.6-2 +* Thu Mar 28 2024 Richard W.M. Jones - 1:5.4.6-3 - Revert to 5.4.6, bump epoch * Sat Mar 09 2024 Richard W.M. Jones - 5.6.1-1 From 2b38ff05a2d8a94b05cd9db861806b82454757bc Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 20 Jun 2024 12:47:16 +0100 Subject: [PATCH 14/33] New upstream version 5.6.2 (RHBZ#2283854) Remove "Jia Tan" pubkey, replace with Lasse Collin's. --- jia_tan_pubkey.txt | 52 ----------------------------------------- lasse_collin_pubkey.txt | 52 +++++++++++++++++++++++++++++++++++++++++ sources | 4 ++-- xz.spec | 10 +++++--- 4 files changed, 61 insertions(+), 57 deletions(-) delete mode 100644 jia_tan_pubkey.txt create mode 100644 lasse_collin_pubkey.txt diff --git a/jia_tan_pubkey.txt b/jia_tan_pubkey.txt deleted file mode 100644 index b032610..0000000 --- a/jia_tan_pubkey.txt +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -aK5MKg== -=d3XT ------END PGP PUBLIC KEY BLOCK----- diff --git a/lasse_collin_pubkey.txt b/lasse_collin_pubkey.txt new file mode 100644 index 0000000..4a391c6 --- /dev/null +++ b/lasse_collin_pubkey.txt @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +888/gToe5kb8qYwy +=6rZC +-----END PGP PUBLIC KEY BLOCK----- diff --git a/sources b/sources index e857edd..0d4bfbd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xz-5.4.6.tar.gz) = b08a61d8d478d3b4675cb1ddacdbbd98dc6941a55bcdd81a28679e54e9367d3a595fa123ac97874a17da571c1b712e2a3e901c2737099a9d268616a1ba3de497 -SHA512 (xz-5.4.6.tar.gz.sig) = d5e32b944e7492a32c40f675d918796e077f63490a23c6fce5c4d6d1eebc443f129d27a2e888913c5a36c3ffdac75b9c96c1749402283445e0ba9ff72b965741 +SHA512 (xz-5.6.2.tar.gz) = c32c32c95e3541b906e0284e66a953ace677e0ce6af2084e7b122600047bf7542c1b0fabb5909b19ff79fba6def530be674df1c675b22a47a8d57f3f0b736a82 +SHA512 (xz-5.6.2.tar.gz.sig) = f3d1055a2a6e96eec2fd5c0b733f2ab5e150bac9645f1fe9a7558ed6f34a241b4f57e17fd4504f311be26cf1e2b9b797f2e78b1b9d2db02e9cd0c1548cb6160b diff --git a/xz.spec b/xz.spec index 761bf37..c97c03a 100644 --- a/xz.spec +++ b/xz.spec @@ -8,8 +8,8 @@ Name: xz # do this on a side tag, according to # https://docs.fedoraproject.org/en-US/package-maintainers/Package_Update_Guide/#multiple_packages Epoch: 1 -Version: 5.4.6 -Release: 3%{?dist} +Version: 5.6.2 +Release: 1%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -18,7 +18,7 @@ License: GPLv2+ and Public Domain # official upstream release 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/jia_tan_pubkey.txt +Source2: https://tukaani.org/misc/lasse_collin_pubkey.txt Source100: colorxzgrep.sh Source101: colorxzgrep.csh @@ -175,6 +175,10 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Thu Jun 20 2024 Richard W.M. Jones - 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 - 1:5.4.6-3 - Revert to 5.4.6, bump epoch From 54d5874123642746b45113ce809bb7cb51da6bcb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 16 Jul 2024 09:05:45 +0100 Subject: [PATCH 15/33] Synch gating.yaml with RHEL 10 --- gating.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gating.yaml b/gating.yaml index 70ba11e..4ca9235 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,7 +1,6 @@ --- !Policy product_versions: - - fedora-* -decision_context: bodhi_update_push_stable -subject_type: koji_build + - rhel-10 +decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} From 3f4f5bde457c822f8c0143e70e26892f64950589 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 16 Jul 2024 09:05:59 +0100 Subject: [PATCH 16/33] Use SPDX license field --- xz.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index c97c03a..2bbe1d5 100644 --- a/xz.spec +++ b/xz.spec @@ -14,7 +14,7 @@ Release: 1%{?dist} # 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 +License: GPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain # official upstream release 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 From b6270c0554959c1376c235d90d21d1a7f369225a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 16 Jul 2024 09:08:11 +0100 Subject: [PATCH 17/33] Tabs vs spaces in Source2 line To match adjacent Source lines. --- xz.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index 2bbe1d5..c332d3b 100644 --- a/xz.spec +++ b/xz.spec @@ -18,7 +18,7 @@ License: GPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain # official upstream release 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 +Source2: https://tukaani.org/misc/lasse_collin_pubkey.txt Source100: colorxzgrep.sh Source101: colorxzgrep.csh From 56abe645b0b7a2f7f466bb18787edad58f513639 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 16 Jul 2024 09:10:01 +0100 Subject: [PATCH 18/33] Revert "Synch gating.yaml with RHEL 10" This reverts commit 54d5874123642746b45113ce809bb7cb51da6bcb. --- gating.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gating.yaml b/gating.yaml index 4ca9235..70ba11e 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,6 +1,7 @@ --- !Policy product_versions: - - rhel-10 -decision_context: osci_compose_gate + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} From 402958c776ef988060efd4160305d565a697d06e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:36:24 +0000 Subject: [PATCH 19/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index c332d3b..fa13b88 100644 --- a/xz.spec +++ b/xz.spec @@ -9,7 +9,7 @@ Name: xz # https://docs.fedoraproject.org/en-US/package-maintainers/Package_Update_Guide/#multiple_packages Epoch: 1 Version: 5.6.2 -Release: 1%{?dist} +Release: 2%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -175,6 +175,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1:5.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jun 20 2024 Richard W.M. Jones - 1:5.6.2-1 - New upstream version 5.6.2 (RHBZ#2283854) - Remove "Jia Tan" pubkey, replace with Lasse Collin's. From 1904db7c75ca93ac1f4e2277a6945826414d5366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Thu, 8 Aug 2024 10:37:41 +0200 Subject: [PATCH 20/33] fix licenses and finish SPDX license conversion --- xz.spec | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/xz.spec b/xz.spec index fa13b88..4b129f8 100644 --- a/xz.spec +++ b/xz.spec @@ -9,12 +9,17 @@ Name: xz # https://docs.fedoraproject.org/en-US/package-maintainers/Package_Update_Guide/#multiple_packages Epoch: 1 Version: 5.6.2 -Release: 2%{?dist} +Release: 3%{?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: GPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain # official upstream release 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 @@ -51,7 +56,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 @@ -60,7 +65,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 @@ -69,7 +74,7 @@ XZ utils. Most users should *not* install this. %package devel Summary: Devel libraries & headers for liblzma -License: Public Domain +License: 0BSD Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} %description devel @@ -78,8 +83,8 @@ 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 +# 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} @@ -175,6 +180,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Thu Aug 08 2024 Lukáš Zaoral - 1:5.6.2-3 +- fix licenses and finish SPDX license conversion + * Sat Jul 20 2024 Fedora Release Engineering - 1:5.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From af339afd3c1df228138de25c0d8f89ad7c773212 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 2 Oct 2024 11:30:41 +0100 Subject: [PATCH 21/33] New upstream version 5.6.3 (RHBZ#2316069) --- sources | 4 ++-- xz.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 0d4bfbd..b114b4a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xz-5.6.2.tar.gz) = c32c32c95e3541b906e0284e66a953ace677e0ce6af2084e7b122600047bf7542c1b0fabb5909b19ff79fba6def530be674df1c675b22a47a8d57f3f0b736a82 -SHA512 (xz-5.6.2.tar.gz.sig) = f3d1055a2a6e96eec2fd5c0b733f2ab5e150bac9645f1fe9a7558ed6f34a241b4f57e17fd4504f311be26cf1e2b9b797f2e78b1b9d2db02e9cd0c1548cb6160b +SHA512 (xz-5.6.3.tar.gz) = b07b45e18615d1946e9d12157af99b54700d757832a638fccab70549574dcd7f28e69e71cc4c0b9c808959f818e79b668a5ccf108429ea0f40b6125bfd55d274 +SHA512 (xz-5.6.3.tar.gz.sig) = 65a0eb674b804309417d736b3ec9edb9c9bf39485593d81f352ee847662f5a95b3d5084fab21451e3510d74e4e2ee8f9cf4e8615d1128b6e16d5c211481481db diff --git a/xz.spec b/xz.spec index 4b129f8..9763fbd 100644 --- a/xz.spec +++ b/xz.spec @@ -8,8 +8,8 @@ Name: xz # do this on a side tag, according to # https://docs.fedoraproject.org/en-US/package-maintainers/Package_Update_Guide/#multiple_packages Epoch: 1 -Version: 5.6.2 -Release: 3%{?dist} +Version: 5.6.3 +Release: 1%{?dist} # liblzma - 0BSD # xz{,dec}, lzma{dec,info} - 0BSD @@ -180,6 +180,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Wed Oct 02 2024 Richard W.M. Jones - 1:5.6.3-1 +- New upstream version 5.6.3 (RHBZ#2316069) + * Thu Aug 08 2024 Lukáš Zaoral - 1:5.6.2-3 - fix licenses and finish SPDX license conversion From 236e0d31de4c21c670e4cae908114f3261345609 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 11 Oct 2024 09:54:36 +0100 Subject: [PATCH 22/33] perl-Compress-Raw-Lzma dep has been removed, rebuild https://src.fedoraproject.org/rpms/perl-Compress-Raw-Lzma/pull-request/3 --- xz.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xz.spec b/xz.spec index 9763fbd..4a13c80 100644 --- a/xz.spec +++ b/xz.spec @@ -3,13 +3,9 @@ Summary: LZMA compression utilities Name: xz -# **PLEASE NOTE**: when bumping xz version, please rebuild -# perl-Compress-Raw-Lzma, it has a strict xz version dep -# do this on a side tag, according to -# https://docs.fedoraproject.org/en-US/package-maintainers/Package_Update_Guide/#multiple_packages Epoch: 1 Version: 5.6.3 -Release: 1%{?dist} +Release: 2%{?dist} # liblzma - 0BSD # xz{,dec}, lzma{dec,info} - 0BSD @@ -180,6 +176,10 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Fri Oct 11 2024 Richard W.M. Jones - 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 - 1:5.6.3-1 - New upstream version 5.6.3 (RHBZ#2316069) From 61a897b0a98b7710fce6a90e977c6c94e92b4020 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:27:35 +0000 Subject: [PATCH 23/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index 4a13c80..1f27150 100644 --- a/xz.spec +++ b/xz.spec @@ -5,7 +5,7 @@ Summary: LZMA compression utilities Name: xz Epoch: 1 Version: 5.6.3 -Release: 2%{?dist} +Release: 3%{?dist} # liblzma - 0BSD # xz{,dec}, lzma{dec,info} - 0BSD @@ -176,6 +176,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1:5.6.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Oct 11 2024 Richard W.M. Jones - 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 From 40e1f5b4b5bec3949d387b3a2499667bb483a3c1 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Wed, 26 Mar 2025 18:43:25 +0100 Subject: [PATCH 24/33] New upstream version 5.8.0 --- sources | 4 ++-- xz.spec | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sources b/sources index b114b4a..d639299 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xz-5.6.3.tar.gz) = b07b45e18615d1946e9d12157af99b54700d757832a638fccab70549574dcd7f28e69e71cc4c0b9c808959f818e79b668a5ccf108429ea0f40b6125bfd55d274 -SHA512 (xz-5.6.3.tar.gz.sig) = 65a0eb674b804309417d736b3ec9edb9c9bf39485593d81f352ee847662f5a95b3d5084fab21451e3510d74e4e2ee8f9cf4e8615d1128b6e16d5c211481481db +SHA512 (xz-5.8.0.tar.gz.sig) = 88eb39a2078ff235f1ae9222e789d06f55d225845072a96b0e6ef8f218781aad04cc53623537b0b18607d3cd7c51b6cee3c07b36d912b3a8b7c9991ebfe795d3 +SHA512 (xz-5.8.0.tar.gz) = ea9a0ba73529c12df776cd2b5088726e253b5517653700676db77780d5bd13db54e36b427bbf934eb1e17f6330767d097ea8720e43c3052c6f58f4c7fc53f7b1 diff --git a/xz.spec b/xz.spec index 1f27150..d3bfc4c 100644 --- a/xz.spec +++ b/xz.spec @@ -4,8 +4,8 @@ Summary: LZMA compression utilities Name: xz Epoch: 1 -Version: 5.6.3 -Release: 3%{?dist} +Version: 5.8.0 +Release: 1%{?dist} # liblzma - 0BSD # xz{,dec}, lzma{dec,info} - 0BSD @@ -141,6 +141,8 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %lang(ko) %{_mandir}/ko/man1/*xz* %lang(ro) %{_mandir}/ro/man1/*xz* %lang(uk) %{_mandir}/uk/man1/*xz* +%lang(it) %{_mandir}/it/man1/*xz* +%lang(sr) %{_mandir}/sr/man1/*xz* %lang(pt_BR) %{_mandir}/pt_BR/man1/*xz* %{profiledir}/* @@ -172,10 +174,16 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %lang(ko) %{_mandir}/ko/man1/*lz* %lang(ro) %{_mandir}/ro/man1/*lz* %lang(uk) %{_mandir}/uk/man1/*lz* +%lang(it) %{_mandir}/it/man1/*lz* +%lang(sr) %{_mandir}/sr/man1/*lz* %lang(pt_BR) %{_mandir}/pt_BR/man1/*lz* %changelog +* Wed Mar 26 2025 Jakub Martisko - 1:5.8.0-1 +- New upstream version 5.8.0 +Resolves: rhbz#2341818 + * Sun Jan 19 2025 Fedora Release Engineering - 1:5.6.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From db2ce28cedb7baf90cc48ceef9ab343fd30cabac Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 3 Apr 2025 19:40:02 +0100 Subject: [PATCH 25/33] New upstream version 5.8.1 Fixes CVE-2025-31115 heap-use-after-free bug in threaded .xz decoder --- sources | 4 ++-- xz.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index d639299..5e6df97 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xz-5.8.0.tar.gz.sig) = 88eb39a2078ff235f1ae9222e789d06f55d225845072a96b0e6ef8f218781aad04cc53623537b0b18607d3cd7c51b6cee3c07b36d912b3a8b7c9991ebfe795d3 -SHA512 (xz-5.8.0.tar.gz) = ea9a0ba73529c12df776cd2b5088726e253b5517653700676db77780d5bd13db54e36b427bbf934eb1e17f6330767d097ea8720e43c3052c6f58f4c7fc53f7b1 +SHA512 (xz-5.8.1.tar.gz) = 151b2a47fdf00274c4fd71ceada8fb6c892bdac44070847ebf3259e602b97c95ee5ee88974e03d7aa821ab4f16d5c38e50dfb2baf660cf39c199878a666e19ad +SHA512 (xz-5.8.1.tar.gz.sig) = 4a67ed623841d64a5826cef1d5e21f3567ba275ee8f725a1217f76ce2ba25a41c6e22e62f8c7cca74d0d6e8398e8ee8926eab722cc8c1b10c42e990c32765efd diff --git a/xz.spec b/xz.spec index d3bfc4c..ea1edae 100644 --- a/xz.spec +++ b/xz.spec @@ -4,7 +4,7 @@ Summary: LZMA compression utilities Name: xz Epoch: 1 -Version: 5.8.0 +Version: 5.8.1 Release: 1%{?dist} # liblzma - 0BSD @@ -180,6 +180,10 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Thu Apr 03 2025 Richard W.M. Jones - 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 - 1:5.8.0-1 - New upstream version 5.8.0 Resolves: rhbz#2341818 From c19b7d7f71a18408ec77171f3ff89492fc3d5081 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 14 Apr 2025 10:56:26 +0100 Subject: [PATCH 26/33] Remove accidental ANSI escape sequence in comment Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2359454 --- xz.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index ea1edae..c13497b 100644 --- a/xz.spec +++ b/xz.spec @@ -11,7 +11,7 @@ Release: 1%{?dist} # 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 +# 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 From 781e3e45cdbf645fd6c374f03a2e3800299918cb Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 23 Apr 2025 23:32:23 -0700 Subject: [PATCH 27/33] 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. --- gating.yaml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 gating.yaml diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 70ba11e..0000000 --- a/gating.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_stable -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} From 93e837ea6db3aeade3e6fbec5666174faf5f9ff6 Mon Sep 17 00:00:00 2001 From: Siteshwar Vashisht Date: Thu, 8 May 2025 10:23:58 +0200 Subject: [PATCH 28/33] 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 --- colorxzgrep.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/colorxzgrep.sh b/colorxzgrep.sh index 4a91d70..cdbc14f 100644 --- a/colorxzgrep.sh +++ b/colorxzgrep.sh @@ -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 From b7202e887415c38a857bffe8036b37fd65ad95b6 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 24 Apr 2025 09:34:17 -0700 Subject: [PATCH 29/33] Empty rebuild to try and fix gating issue --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index c13497b..64f2231 100644 --- a/xz.spec +++ b/xz.spec @@ -5,7 +5,7 @@ Summary: LZMA compression utilities Name: xz Epoch: 1 Version: 5.8.1 -Release: 1%{?dist} +Release: 2%{?dist} # liblzma - 0BSD # xz{,dec}, lzma{dec,info} - 0BSD @@ -180,6 +180,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Thu Apr 24 2025 Adam Williamson - 1:5.8.1-2 +- Empty rebuild to try and fix gating issue + * Thu Apr 03 2025 Richard W.M. Jones - 1:5.8.1-1 - New upstream version 5.8.1 - Fixes CVE-2025-31115 heap-use-after-free bug in threaded .xz decoder From 6b51ecaa475fc01fa36a320e6393a0db23ebfcdd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 22 Nov 2025 19:32:47 +0000 Subject: [PATCH 30/33] Add workaround for "Failed to enable the sandbox" (RHEL-125143) Thanks: Lasse Collin --- 0001-Landlock-Cache-the-ABI-version.patch | 46 +++++++++++ ...ck-Workaround-a-bug-in-RHEL-9-kernel.patch | 80 +++++++++++++++++++ xz.spec | 11 ++- 3 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 0001-Landlock-Cache-the-ABI-version.patch create mode 100644 0002-Landlock-Workaround-a-bug-in-RHEL-9-kernel.patch diff --git a/0001-Landlock-Cache-the-ABI-version.patch b/0001-Landlock-Cache-the-ABI-version.patch new file mode 100644 index 0000000..137629d --- /dev/null +++ b/0001-Landlock-Cache-the-ABI-version.patch @@ -0,0 +1,46 @@ +From 19daf4ace85df69a6582375f1f2329205fe7e92f Mon Sep 17 00:00:00 2001 +From: Lasse Collin +Date: Sat, 22 Nov 2025 12:57:51 +0200 +Subject: [PATCH 1/2] Landlock: Cache the ABI version + +In xz it can avoid up to two syscalls that query the ABI version. +--- + src/common/my_landlock.h | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/src/common/my_landlock.h b/src/common/my_landlock.h +index e135d08c..379d7bd4 100644 +--- a/src/common/my_landlock.h ++++ b/src/common/my_landlock.h +@@ -4,6 +4,10 @@ + // + /// \file my_landlock.h + /// \brief Linux Landlock sandbox helper functions ++/// ++/// \note This uses static variables to cache the Landlock ABI version. ++/// Only one file in an application should include this header. ++/// Only one thread should call these functions. + // + // Author: Lasse Collin + // +@@ -32,8 +36,16 @@ my_landlock_ruleset_attr_forbid_all(struct landlock_ruleset_attr *attr) + { + memzero(attr, sizeof(*attr)); + +- const int abi_version = syscall(SYS_landlock_create_ruleset, ++ // Cache the Landlock ABI version: ++ // 0 = not checked yet ++ // -1 = Landlock not supported ++ // >0 = Landlock ABI version ++ static int abi_version = 0; ++ ++ if (abi_version == 0) ++ abi_version = syscall(SYS_landlock_create_ruleset, + (void *)NULL, 0, LANDLOCK_CREATE_RULESET_VERSION); ++ + if (abi_version <= 0) + return -1; + +-- +2.47.3 + diff --git a/0002-Landlock-Workaround-a-bug-in-RHEL-9-kernel.patch b/0002-Landlock-Workaround-a-bug-in-RHEL-9-kernel.patch new file mode 100644 index 0000000..926351c --- /dev/null +++ b/0002-Landlock-Workaround-a-bug-in-RHEL-9-kernel.patch @@ -0,0 +1,80 @@ +From d18502bc62f49c626900994cf5a2b940b3c56cdf Mon Sep 17 00:00:00 2001 +From: Lasse Collin +Date: Sat, 22 Nov 2025 13:21:06 +0200 +Subject: [PATCH 2/2] Landlock: Workaround a bug in RHEL 9 kernel + +RHEL 9 kernel since 5.14.0-603.el9 (2025-07-30) claims to support +Landlock ABI version 6, but it lacks support for LANDLOCK_SCOPE_SIGNAL. +The issue is still present in 5.14.0-642.el9 (2025-11-20). + +If one runs xz 5.8.0 or 5.8.1 from some other distribution in a container +on RHEL 9, xz will fail with the message "Failed to enable the sandbox". +The sandbox is meant to be transparent to users, thus there isn't and +won't be a command line option to disable it. Instead, add a workaround +to keep xz working on the buggy RHEL 9 kernels. + +Fixes: https://github.com/tukaani-project/xz/issues/199 +Link: https://issues.redhat.com/browse/RHEL-125143 +Link: https://bugzilla.redhat.com/show_bug.cgi?id=2407105 +--- + src/common/my_landlock.h | 27 ++++++++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) + +diff --git a/src/common/my_landlock.h b/src/common/my_landlock.h +index 379d7bd4..a11077c4 100644 +--- a/src/common/my_landlock.h ++++ b/src/common/my_landlock.h +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + + /// \brief Initialize Landlock ruleset attributes to forbid everything +@@ -42,10 +43,28 @@ my_landlock_ruleset_attr_forbid_all(struct landlock_ruleset_attr *attr) + // >0 = Landlock ABI version + static int abi_version = 0; + +- if (abi_version == 0) ++ // Red Hat Enterprise Linux 9 kernel since 5.14.0-603.el9 (2025-07-30) ++ // claims ABI version 6 support, but as of 5.14.0-642.el9 (2025-11-20) ++ // it lacks LANDLOCK_SCOPE_SIGNAL. ABI version 6 was added in upstream ++ // Linux 6.12 while RHEL 9 has Linux 5.14 with lots of backports. ++ // We assume that any kernel version 5.14 with ABI version 6 is buggy. ++ static bool is_rhel9 = false; ++ ++ if (abi_version == 0) { + abi_version = syscall(SYS_landlock_create_ruleset, + (void *)NULL, 0, LANDLOCK_CREATE_RULESET_VERSION); + ++ if (abi_version == 6) { ++ static const char rel[] = "5.14."; ++ const size_t rel_len = sizeof(rel) - 1; ++ ++ struct utsname un; ++ if (uname(&un) == 0 && strncmp( ++ un.release, rel, rel_len) == 0) ++ is_rhel9 = true; ++ } ++ } ++ + if (abi_version <= 0) + return -1; + +@@ -121,6 +140,12 @@ my_landlock_ruleset_attr_forbid_all(struct landlock_ruleset_attr *attr) + #endif + FALLTHROUGH; + ++ case 6: ++ if (is_rhel9) ++ attr->scoped &= ~LANDLOCK_SCOPE_SIGNAL; ++ ++ FALLTHROUGH; ++ + default: + // We only know about the features of the ABIs 1-6. + break; +-- +2.47.3 + diff --git a/xz.spec b/xz.spec index 64f2231..2623b1f 100644 --- a/xz.spec +++ b/xz.spec @@ -5,7 +5,7 @@ Summary: LZMA compression utilities Name: xz Epoch: 1 Version: 5.8.1 -Release: 2%{?dist} +Release: 3%{?dist} # liblzma - 0BSD # xz{,dec}, lzma{dec,info} - 0BSD @@ -24,6 +24,12 @@ Source2: https://tukaani.org/misc/lasse_collin_pubkey.txt Source100: colorxzgrep.sh Source101: colorxzgrep.csh +# https://github.com/tukaani-project/xz/issues/199 +# https://issues.redhat.com/browse/RHEL-125143 +# (Upstream, but in the rhel9landlock branch) +Patch: 0001-Landlock-Cache-the-ABI-version.patch +Patch: 0002-Landlock-Workaround-a-bug-in-RHEL-9-kernel.patch + URL: https://tukaani.org/%{name}/ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} @@ -180,6 +186,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Sat Nov 22 2025 Richard W.M. Jones - 1:5.8.1-3 +- Add workaround for "Failed to enable the sandbox" (RHEL-125143) + * Thu Apr 24 2025 Adam Williamson - 1:5.8.1-2 - Empty rebuild to try and fix gating issue From 4dbfb6665e5f3442572c735c859a245125bd563f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 23 Nov 2025 19:09:03 +0000 Subject: [PATCH 31/33] Add final workaround for "Failed to enable the sandbox" (RHEL-125143) --- 0001-Landlock-Cache-the-ABI-version.patch | 8 +-- ...ck-Workaround-a-bug-in-RHEL-9-kernel.patch | 27 +++++---- 0004-Landlock-Add-missing-ifdefs.patch | 59 +++++++++++++++++++ xz.spec | 9 ++- 4 files changed, 87 insertions(+), 16 deletions(-) create mode 100644 0004-Landlock-Add-missing-ifdefs.patch diff --git a/0001-Landlock-Cache-the-ABI-version.patch b/0001-Landlock-Cache-the-ABI-version.patch index 137629d..0caa634 100644 --- a/0001-Landlock-Cache-the-ABI-version.patch +++ b/0001-Landlock-Cache-the-ABI-version.patch @@ -1,7 +1,7 @@ -From 19daf4ace85df69a6582375f1f2329205fe7e92f Mon Sep 17 00:00:00 2001 +From ee75c76958dd891906745125590563ab64e85995 Mon Sep 17 00:00:00 2001 From: Lasse Collin -Date: Sat, 22 Nov 2025 12:57:51 +0200 -Subject: [PATCH 1/2] Landlock: Cache the ABI version +Date: Sun, 23 Nov 2025 20:13:37 +0200 +Subject: [PATCH 1/4] Landlock: Cache the ABI version In xz it can avoid up to two syscalls that query the ABI version. --- @@ -42,5 +42,5 @@ index e135d08c..379d7bd4 100644 return -1; -- -2.47.3 +2.51.1 diff --git a/0002-Landlock-Workaround-a-bug-in-RHEL-9-kernel.patch b/0002-Landlock-Workaround-a-bug-in-RHEL-9-kernel.patch index 926351c..ec3fe51 100644 --- a/0002-Landlock-Workaround-a-bug-in-RHEL-9-kernel.patch +++ b/0002-Landlock-Workaround-a-bug-in-RHEL-9-kernel.patch @@ -1,27 +1,34 @@ -From d18502bc62f49c626900994cf5a2b940b3c56cdf Mon Sep 17 00:00:00 2001 +From 2b2652e914b1c38d4c009a8dcac11dfee9c7e008 Mon Sep 17 00:00:00 2001 From: Lasse Collin -Date: Sat, 22 Nov 2025 13:21:06 +0200 -Subject: [PATCH 2/2] Landlock: Workaround a bug in RHEL 9 kernel - -RHEL 9 kernel since 5.14.0-603.el9 (2025-07-30) claims to support -Landlock ABI version 6, but it lacks support for LANDLOCK_SCOPE_SIGNAL. -The issue is still present in 5.14.0-642.el9 (2025-11-20). +Date: Sun, 23 Nov 2025 20:13:49 +0200 +Subject: [PATCH 2/4] Landlock: Workaround a bug in RHEL 9 kernel If one runs xz 5.8.0 or 5.8.1 from some other distribution in a container on RHEL 9, xz will fail with the message "Failed to enable the sandbox". + +RHEL 9 kernel since 5.14.0-603.el9 (2025-07-30) claims to support +Landlock ABI version 6, but it lacks support for LANDLOCK_SCOPE_SIGNAL. +The issue is still present in 5.14.0-643.el9 (2025-11-22). Red Hat is +aware of the issue, but I don't know when it will be fixed. + The sandbox is meant to be transparent to users, thus there isn't and won't be a command line option to disable it. Instead, add a workaround to keep xz working on the buggy RHEL 9 kernels. +Reported-by: Richard W.M. Jones +Thanks-to: Pavel Raiskup +Tested-by: Orgad Shaneh +Tested-by: Richard W.M. Jones Fixes: https://github.com/tukaani-project/xz/issues/199 Link: https://issues.redhat.com/browse/RHEL-125143 Link: https://bugzilla.redhat.com/show_bug.cgi?id=2407105 +Link: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/65BDSY56R5ZJRTUC4B6CIVCVLY4LG4ME/ --- src/common/my_landlock.h | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/src/common/my_landlock.h b/src/common/my_landlock.h -index 379d7bd4..a11077c4 100644 +index 379d7bd4..0f8e04e0 100644 --- a/src/common/my_landlock.h +++ b/src/common/my_landlock.h @@ -21,6 +21,7 @@ @@ -38,7 +45,7 @@ index 379d7bd4..a11077c4 100644 - if (abi_version == 0) + // Red Hat Enterprise Linux 9 kernel since 5.14.0-603.el9 (2025-07-30) -+ // claims ABI version 6 support, but as of 5.14.0-642.el9 (2025-11-20) ++ // claims ABI version 6 support, but as of 5.14.0-643.el9 (2025-11-22) + // it lacks LANDLOCK_SCOPE_SIGNAL. ABI version 6 was added in upstream + // Linux 6.12 while RHEL 9 has Linux 5.14 with lots of backports. + // We assume that any kernel version 5.14 with ABI version 6 is buggy. @@ -76,5 +83,5 @@ index 379d7bd4..a11077c4 100644 // We only know about the features of the ABIs 1-6. break; -- -2.47.3 +2.51.1 diff --git a/0004-Landlock-Add-missing-ifdefs.patch b/0004-Landlock-Add-missing-ifdefs.patch new file mode 100644 index 0000000..977ce96 --- /dev/null +++ b/0004-Landlock-Add-missing-ifdefs.patch @@ -0,0 +1,59 @@ +From 8bb516887c1912106a72db96216cab46954e6190 Mon Sep 17 00:00:00 2001 +From: Lasse Collin +Date: Sun, 23 Nov 2025 20:39:28 +0200 +Subject: [PATCH 4/4] Landlock: Add missing #ifdefs + +The build was broken on distros that have an old . + +Fixes: 2b2652e914b1 ("Landlock: Workaround a bug in RHEL 9 kernel") +--- + src/common/my_landlock.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/common/my_landlock.h b/src/common/my_landlock.h +index 0f8e04e0..5f761695 100644 +--- a/src/common/my_landlock.h ++++ b/src/common/my_landlock.h +@@ -43,17 +43,20 @@ my_landlock_ruleset_attr_forbid_all(struct landlock_ruleset_attr *attr) + // >0 = Landlock ABI version + static int abi_version = 0; + ++#ifdef LANDLOCK_SCOPE_SIGNAL + // Red Hat Enterprise Linux 9 kernel since 5.14.0-603.el9 (2025-07-30) + // claims ABI version 6 support, but as of 5.14.0-643.el9 (2025-11-22) + // it lacks LANDLOCK_SCOPE_SIGNAL. ABI version 6 was added in upstream + // Linux 6.12 while RHEL 9 has Linux 5.14 with lots of backports. + // We assume that any kernel version 5.14 with ABI version 6 is buggy. + static bool is_rhel9 = false; ++#endif + + if (abi_version == 0) { + abi_version = syscall(SYS_landlock_create_ruleset, + (void *)NULL, 0, LANDLOCK_CREATE_RULESET_VERSION); + ++#ifdef LANDLOCK_SCOPE_SIGNAL + if (abi_version == 6) { + static const char rel[] = "5.14."; + const size_t rel_len = sizeof(rel) - 1; +@@ -63,6 +66,7 @@ my_landlock_ruleset_attr_forbid_all(struct landlock_ruleset_attr *attr) + un.release, rel, rel_len) == 0) + is_rhel9 = true; + } ++#endif + } + + if (abi_version <= 0) +@@ -141,8 +145,10 @@ my_landlock_ruleset_attr_forbid_all(struct landlock_ruleset_attr *attr) + FALLTHROUGH; + + case 6: ++#ifdef LANDLOCK_SCOPE_SIGNAL + if (is_rhel9) + attr->scoped &= ~LANDLOCK_SCOPE_SIGNAL; ++#endif + + FALLTHROUGH; + +-- +2.51.1 + diff --git a/xz.spec b/xz.spec index 2623b1f..9631178 100644 --- a/xz.spec +++ b/xz.spec @@ -5,7 +5,7 @@ Summary: LZMA compression utilities Name: xz Epoch: 1 Version: 5.8.1 -Release: 3%{?dist} +Release: 4%{?dist} # liblzma - 0BSD # xz{,dec}, lzma{dec,info} - 0BSD @@ -26,9 +26,11 @@ Source101: colorxzgrep.csh # https://github.com/tukaani-project/xz/issues/199 # https://issues.redhat.com/browse/RHEL-125143 -# (Upstream, but in the rhel9landlock branch) +# Upstream in > 5.8.1 Patch: 0001-Landlock-Cache-the-ABI-version.patch Patch: 0002-Landlock-Workaround-a-bug-in-RHEL-9-kernel.patch +#Patch: 0003-Update-THANKS.patch +Patch: 0004-Landlock-Add-missing-ifdefs.patch URL: https://tukaani.org/%{name}/ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} @@ -186,6 +188,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Sun Nov 23 2025 Richard W.M. Jones - 1:5.8.1-4 +- Add final workaround for "Failed to enable the sandbox" (RHEL-125143) + * Sat Nov 22 2025 Richard W.M. Jones - 1:5.8.1-3 - Add workaround for "Failed to enable the sandbox" (RHEL-125143) From b3257761cf2028e4a01679211d8868657f5333ed Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 5 Jan 2026 11:51:24 +0000 Subject: [PATCH 32/33] New upstream version 5.8.2 (RHBZ#2423317) Remove patches which are included in this release. --- 0001-Landlock-Cache-the-ABI-version.patch | 46 ---------- ...ck-Workaround-a-bug-in-RHEL-9-kernel.patch | 87 ------------------- 0004-Landlock-Add-missing-ifdefs.patch | 59 ------------- sources | 4 +- xz.spec | 16 ++-- 5 files changed, 8 insertions(+), 204 deletions(-) delete mode 100644 0001-Landlock-Cache-the-ABI-version.patch delete mode 100644 0002-Landlock-Workaround-a-bug-in-RHEL-9-kernel.patch delete mode 100644 0004-Landlock-Add-missing-ifdefs.patch diff --git a/0001-Landlock-Cache-the-ABI-version.patch b/0001-Landlock-Cache-the-ABI-version.patch deleted file mode 100644 index 0caa634..0000000 --- a/0001-Landlock-Cache-the-ABI-version.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ee75c76958dd891906745125590563ab64e85995 Mon Sep 17 00:00:00 2001 -From: Lasse Collin -Date: Sun, 23 Nov 2025 20:13:37 +0200 -Subject: [PATCH 1/4] Landlock: Cache the ABI version - -In xz it can avoid up to two syscalls that query the ABI version. ---- - src/common/my_landlock.h | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/src/common/my_landlock.h b/src/common/my_landlock.h -index e135d08c..379d7bd4 100644 ---- a/src/common/my_landlock.h -+++ b/src/common/my_landlock.h -@@ -4,6 +4,10 @@ - // - /// \file my_landlock.h - /// \brief Linux Landlock sandbox helper functions -+/// -+/// \note This uses static variables to cache the Landlock ABI version. -+/// Only one file in an application should include this header. -+/// Only one thread should call these functions. - // - // Author: Lasse Collin - // -@@ -32,8 +36,16 @@ my_landlock_ruleset_attr_forbid_all(struct landlock_ruleset_attr *attr) - { - memzero(attr, sizeof(*attr)); - -- const int abi_version = syscall(SYS_landlock_create_ruleset, -+ // Cache the Landlock ABI version: -+ // 0 = not checked yet -+ // -1 = Landlock not supported -+ // >0 = Landlock ABI version -+ static int abi_version = 0; -+ -+ if (abi_version == 0) -+ abi_version = syscall(SYS_landlock_create_ruleset, - (void *)NULL, 0, LANDLOCK_CREATE_RULESET_VERSION); -+ - if (abi_version <= 0) - return -1; - --- -2.51.1 - diff --git a/0002-Landlock-Workaround-a-bug-in-RHEL-9-kernel.patch b/0002-Landlock-Workaround-a-bug-in-RHEL-9-kernel.patch deleted file mode 100644 index ec3fe51..0000000 --- a/0002-Landlock-Workaround-a-bug-in-RHEL-9-kernel.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 2b2652e914b1c38d4c009a8dcac11dfee9c7e008 Mon Sep 17 00:00:00 2001 -From: Lasse Collin -Date: Sun, 23 Nov 2025 20:13:49 +0200 -Subject: [PATCH 2/4] Landlock: Workaround a bug in RHEL 9 kernel - -If one runs xz 5.8.0 or 5.8.1 from some other distribution in a container -on RHEL 9, xz will fail with the message "Failed to enable the sandbox". - -RHEL 9 kernel since 5.14.0-603.el9 (2025-07-30) claims to support -Landlock ABI version 6, but it lacks support for LANDLOCK_SCOPE_SIGNAL. -The issue is still present in 5.14.0-643.el9 (2025-11-22). Red Hat is -aware of the issue, but I don't know when it will be fixed. - -The sandbox is meant to be transparent to users, thus there isn't and -won't be a command line option to disable it. Instead, add a workaround -to keep xz working on the buggy RHEL 9 kernels. - -Reported-by: Richard W.M. Jones -Thanks-to: Pavel Raiskup -Tested-by: Orgad Shaneh -Tested-by: Richard W.M. Jones -Fixes: https://github.com/tukaani-project/xz/issues/199 -Link: https://issues.redhat.com/browse/RHEL-125143 -Link: https://bugzilla.redhat.com/show_bug.cgi?id=2407105 -Link: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/65BDSY56R5ZJRTUC4B6CIVCVLY4LG4ME/ ---- - src/common/my_landlock.h | 27 ++++++++++++++++++++++++++- - 1 file changed, 26 insertions(+), 1 deletion(-) - -diff --git a/src/common/my_landlock.h b/src/common/my_landlock.h -index 379d7bd4..0f8e04e0 100644 ---- a/src/common/my_landlock.h -+++ b/src/common/my_landlock.h -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - - /// \brief Initialize Landlock ruleset attributes to forbid everything -@@ -42,10 +43,28 @@ my_landlock_ruleset_attr_forbid_all(struct landlock_ruleset_attr *attr) - // >0 = Landlock ABI version - static int abi_version = 0; - -- if (abi_version == 0) -+ // Red Hat Enterprise Linux 9 kernel since 5.14.0-603.el9 (2025-07-30) -+ // claims ABI version 6 support, but as of 5.14.0-643.el9 (2025-11-22) -+ // it lacks LANDLOCK_SCOPE_SIGNAL. ABI version 6 was added in upstream -+ // Linux 6.12 while RHEL 9 has Linux 5.14 with lots of backports. -+ // We assume that any kernel version 5.14 with ABI version 6 is buggy. -+ static bool is_rhel9 = false; -+ -+ if (abi_version == 0) { - abi_version = syscall(SYS_landlock_create_ruleset, - (void *)NULL, 0, LANDLOCK_CREATE_RULESET_VERSION); - -+ if (abi_version == 6) { -+ static const char rel[] = "5.14."; -+ const size_t rel_len = sizeof(rel) - 1; -+ -+ struct utsname un; -+ if (uname(&un) == 0 && strncmp( -+ un.release, rel, rel_len) == 0) -+ is_rhel9 = true; -+ } -+ } -+ - if (abi_version <= 0) - return -1; - -@@ -121,6 +140,12 @@ my_landlock_ruleset_attr_forbid_all(struct landlock_ruleset_attr *attr) - #endif - FALLTHROUGH; - -+ case 6: -+ if (is_rhel9) -+ attr->scoped &= ~LANDLOCK_SCOPE_SIGNAL; -+ -+ FALLTHROUGH; -+ - default: - // We only know about the features of the ABIs 1-6. - break; --- -2.51.1 - diff --git a/0004-Landlock-Add-missing-ifdefs.patch b/0004-Landlock-Add-missing-ifdefs.patch deleted file mode 100644 index 977ce96..0000000 --- a/0004-Landlock-Add-missing-ifdefs.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 8bb516887c1912106a72db96216cab46954e6190 Mon Sep 17 00:00:00 2001 -From: Lasse Collin -Date: Sun, 23 Nov 2025 20:39:28 +0200 -Subject: [PATCH 4/4] Landlock: Add missing #ifdefs - -The build was broken on distros that have an old . - -Fixes: 2b2652e914b1 ("Landlock: Workaround a bug in RHEL 9 kernel") ---- - src/common/my_landlock.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/common/my_landlock.h b/src/common/my_landlock.h -index 0f8e04e0..5f761695 100644 ---- a/src/common/my_landlock.h -+++ b/src/common/my_landlock.h -@@ -43,17 +43,20 @@ my_landlock_ruleset_attr_forbid_all(struct landlock_ruleset_attr *attr) - // >0 = Landlock ABI version - static int abi_version = 0; - -+#ifdef LANDLOCK_SCOPE_SIGNAL - // Red Hat Enterprise Linux 9 kernel since 5.14.0-603.el9 (2025-07-30) - // claims ABI version 6 support, but as of 5.14.0-643.el9 (2025-11-22) - // it lacks LANDLOCK_SCOPE_SIGNAL. ABI version 6 was added in upstream - // Linux 6.12 while RHEL 9 has Linux 5.14 with lots of backports. - // We assume that any kernel version 5.14 with ABI version 6 is buggy. - static bool is_rhel9 = false; -+#endif - - if (abi_version == 0) { - abi_version = syscall(SYS_landlock_create_ruleset, - (void *)NULL, 0, LANDLOCK_CREATE_RULESET_VERSION); - -+#ifdef LANDLOCK_SCOPE_SIGNAL - if (abi_version == 6) { - static const char rel[] = "5.14."; - const size_t rel_len = sizeof(rel) - 1; -@@ -63,6 +66,7 @@ my_landlock_ruleset_attr_forbid_all(struct landlock_ruleset_attr *attr) - un.release, rel, rel_len) == 0) - is_rhel9 = true; - } -+#endif - } - - if (abi_version <= 0) -@@ -141,8 +145,10 @@ my_landlock_ruleset_attr_forbid_all(struct landlock_ruleset_attr *attr) - FALLTHROUGH; - - case 6: -+#ifdef LANDLOCK_SCOPE_SIGNAL - if (is_rhel9) - attr->scoped &= ~LANDLOCK_SCOPE_SIGNAL; -+#endif - - FALLTHROUGH; - --- -2.51.1 - diff --git a/sources b/sources index 5e6df97..f0abd9a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xz-5.8.1.tar.gz) = 151b2a47fdf00274c4fd71ceada8fb6c892bdac44070847ebf3259e602b97c95ee5ee88974e03d7aa821ab4f16d5c38e50dfb2baf660cf39c199878a666e19ad -SHA512 (xz-5.8.1.tar.gz.sig) = 4a67ed623841d64a5826cef1d5e21f3567ba275ee8f725a1217f76ce2ba25a41c6e22e62f8c7cca74d0d6e8398e8ee8926eab722cc8c1b10c42e990c32765efd +SHA512 (xz-5.8.2.tar.gz) = 0b808fc8407e7c50da3a7b2db05be732c2fcd41850b92c7f5647181443483848ff359e176c816ce2038c115273f51575877c14f1356417cc9d53845841acb063 +SHA512 (xz-5.8.2.tar.gz.sig) = 91c8d49d8ad0eb1e128203cf2c051fb200ec0e2b5eebea10a39945a998d24f11652a000faefa688d129327593043271314cbf115d78c21eeed738476dd2defb6 diff --git a/xz.spec b/xz.spec index 9631178..12f2654 100644 --- a/xz.spec +++ b/xz.spec @@ -4,8 +4,8 @@ Summary: LZMA compression utilities Name: xz Epoch: 1 -Version: 5.8.1 -Release: 4%{?dist} +Version: 5.8.2 +Release: 1%{?dist} # liblzma - 0BSD # xz{,dec}, lzma{dec,info} - 0BSD @@ -24,14 +24,6 @@ Source2: https://tukaani.org/misc/lasse_collin_pubkey.txt Source100: colorxzgrep.sh Source101: colorxzgrep.csh -# https://github.com/tukaani-project/xz/issues/199 -# https://issues.redhat.com/browse/RHEL-125143 -# Upstream in > 5.8.1 -Patch: 0001-Landlock-Cache-the-ABI-version.patch -Patch: 0002-Landlock-Workaround-a-bug-in-RHEL-9-kernel.patch -#Patch: 0003-Update-THANKS.patch -Patch: 0004-Landlock-Add-missing-ifdefs.patch - URL: https://tukaani.org/%{name}/ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} @@ -188,6 +180,10 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog +* Mon Jan 05 2026 Richard W.M. Jones - 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 - 1:5.8.1-4 - Add final workaround for "Failed to enable the sandbox" (RHEL-125143) From 8829c783ae6726a78d030f5be0ae76c0970ff696 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 5 Jan 2026 12:03:32 +0000 Subject: [PATCH 33/33] Add sv (Swedish) translations of man pages --- xz.spec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/xz.spec b/xz.spec index 12f2654..d75d810 100644 --- a/xz.spec +++ b/xz.spec @@ -138,12 +138,13 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_mandir}/man1/*xz* %lang(de) %{_mandir}/de/man1/*xz* %lang(fr) %{_mandir}/fr/man1/*xz* -%lang(ko) %{_mandir}/ko/man1/*xz* -%lang(ro) %{_mandir}/ro/man1/*xz* -%lang(uk) %{_mandir}/uk/man1/*xz* %lang(it) %{_mandir}/it/man1/*xz* -%lang(sr) %{_mandir}/sr/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}/* @@ -171,12 +172,13 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_mandir}/man1/*lz* %lang(de) %{_mandir}/de/man1/*lz* %lang(fr) %{_mandir}/fr/man1/*lz* -%lang(ko) %{_mandir}/ko/man1/*lz* -%lang(ro) %{_mandir}/ro/man1/*lz* -%lang(uk) %{_mandir}/uk/man1/*lz* %lang(it) %{_mandir}/it/man1/*lz* -%lang(sr) %{_mandir}/sr/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