5 changed files with 23 additions and 236 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1 @@
-/*.sig
-/*.tar.gz
-/*.tar.xz
-/xz-*/
+/xz-5.2.5.tar.xz
--- a/colorxzgrep.sh
+++ b/colorxzgrep.sh
@ -1,4 +1,3 @@
-# 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
--- a/lasse_collin_pubkey.txt
+++ b/lasse_collin_pubkey.txt
@ -1,52 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-888/gToe5kb8qYwy
-=6rZC
-----END PGP PUBLIC KEY BLOCK-----
--- a/3
+++ b/3
@ -1,2 +1 @@
-SHA512 (xz-5.8.2.tar.gz) = 0b808fc8407e7c50da3a7b2db05be732c2fcd41850b92c7f5647181443483848ff359e176c816ce2038c115273f51575877c14f1356417cc9d53845841acb063
-SHA512 (xz-5.8.2.tar.gz.sig) = 91c8d49d8ad0eb1e128203cf2c051fb200ec0e2b5eebea10a39945a998d24f11652a000faefa688d129327593043271314cbf115d78c21eeed738476dd2defb6
+SHA512 (xz-5.2.5.tar.xz) = 59266068a51cb616eb31b67cd8f07ffeb2288d1391c61665ae2ec6814465afac80fec69248f6a2f2db45b44475af001296a99af6a32287226a9c41419173ccbb
--- a/xz.spec
+++ b/xz.spec
@ -3,40 +3,29 @@

 Summary:	LZMA compression utilities
 Name:		xz
-Epoch:		1
-Version:	5.8.2
+Version:	5.2.5
 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:	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
+Source0:	http://tukaani.org/%{name}/%{name}-%{version}.tar.xz

 Source100:	colorxzgrep.sh
 Source101:	colorxzgrep.csh

-URL:		https://tukaani.org/%{name}/
-Requires:	%{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+URL:		http://tukaani.org/%{name}/
+Requires:	%{name}-libs%{?_isa} = %{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
@ -52,7 +41,7 @@ decompression speed fast.

 %package 	libs
 Summary:	Libraries for decoding LZMA compression
-License:	0BSD
+License:	Public Domain
 Obsoletes:	%{name}-compat-libs < %{version}-%{release}

 %description 	libs
@ -61,7 +50,7 @@ Libraries for decoding files compressed with LZMA or XZ utils.

 %package 	static
 Summary:	Statically linked library for decoding LZMA compression
-License:	0BSD
+License:	Public Domain

 %description 	static
 Statically linked library for decoding files compressed with LZMA or
@ -70,8 +59,8 @@ XZ utils.  Most users should *not* install this.

 %package 	devel
 Summary:	Devel libraries & headers for liblzma
-License:	0BSD
-Requires:	%{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+License:	Public Domain
+Requires:	%{name}-libs%{?_isa} = %{version}-%{release}

 %description	devel
 Devel libraries and headers for liblzma.
@ -79,9 +68,9 @@ Devel libraries and headers for liblzma.

 %package 	lzma-compat
 Summary:	Older LZMA format compatibility binaries
-# 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}
+# Just a set of symlinks to 'xz' + two Public Domain binaries.
+License:	Public Domain
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 Obsoletes:	lzma < %{version}
 Provides:	lzma = %{version}

@ -91,14 +80,16 @@ commands that deal with the older LZMA format.


 %prep
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%autosetup -p1
-autoreconf -fi
+%autosetup


 %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:
@ -136,15 +127,6 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check
 %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}/*


@ -170,147 +152,10 @@ 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*
+%{_mandir}/de/man1/*


 %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)

@ -353,7 +198,6 @@ Resolves: rhbz#2341818
 - 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