.gitignore

@@ -1 +1 @@
-SOURCES/xz-5.2.4.tar.xz
+SOURCES/xz-5.2.5.tar.xz

.xz.metadata

@@ -1 +1 @@
-1d3a6910c28d40df0134f4a49e5570e8249120c5 SOURCES/xz-5.2.4.tar.xz
+0b9d1e06b59f7fe0796afe1d93851b9306b4a3b6 SOURCES/xz-5.2.5.tar.xz

SOURCES/xz-5.2.5-enable_CET.patch

@@ -0,0 +1,70 @@
+From: H.J. Lu <hjl.tools@gmail.com>
+Date: Wed, 23 Dec 2020 15:49:04 +0100 (06:49 -0800)
+Subject: [PATCH] liblzma: Enable Intel CET in x86 CRC assembly codes
+
+When Intel CET is enabled, we need to include <cet.h> in assembly codes
+to mark Intel CET support and add _CET_ENDBR to indirect jump targets.
+
+Tested on Intel Tiger Lake under CET enabled Linux.
+---
+ src/liblzma/check/crc32_x86.S | 9 +++++++++
+ src/liblzma/check/crc64_x86.S | 9 +++++++++
+ 2 files changed, 18 insertions(+)
+
+diff --git a/src/liblzma/check/crc32_x86.S b/src/liblzma/check/crc32_x86.S
+index 67f68a4..e3745e6 100644
+--- a/src/liblzma/check/crc32_x86.S
++++ b/src/liblzma/check/crc32_x86.S
+@@ -51,6 +51,14 @@ init_table(void)
+  * extern uint32_t lzma_crc32(const uint8_t *buf, size_t size, uint32_t crc);
+  */
+ 
++/* When Intel CET is enabled, include <cet.h> in assembly code to mark
++   Intel CET support.  */
++#ifdef __CET__
++# include <cet.h>
++#else
++# define _CET_ENDBR
++#endif
++
+ /*
+  * On some systems, the functions need to be prefixed. The prefix is
+  * usually an underscore.
+@@ -83,6 +91,7 @@ init_table(void)
+ 
+ 	ALIGN(4, 16)
+ LZMA_CRC32:
++	_CET_ENDBR
+ 	/*
+ 	 * Register usage:
+ 	 * %eax crc
+diff --git a/src/liblzma/check/crc64_x86.S b/src/liblzma/check/crc64_x86.S
+index f5bb84b..7ee08f6 100644
+--- a/src/liblzma/check/crc64_x86.S
++++ b/src/liblzma/check/crc64_x86.S
+@@ -41,6 +41,14 @@ init_table(void)
+  * extern uint64_t lzma_crc64(const uint8_t *buf, size_t size, uint64_t crc);
+  */
+ 
++/* When Intel CET is enabled, include <cet.h> in assembly code to mark
++   Intel CET support.  */
++#ifdef __CET__
++# include <cet.h>
++#else
++# define _CET_ENDBR
++#endif
++
+ /*
+  * On some systems, the functions need to be prefixed. The prefix is
+  * usually an underscore.
+@@ -73,6 +81,7 @@ init_table(void)
+ 
+ 	ALIGN(4, 16)
+ LZMA_CRC64:
++	_CET_ENDBR
+ 	/*
+ 	 * Register usage:
+ 	 * %eax crc LSB
+-- 
+2.26.0
+

SPECS/xz.spec

@@ -3,22 +3,23 @@
 
 Summary:	LZMA compression utilities
 Name:		xz
-Version:	5.2.4
+Version:	5.2.5
-Release:	4%{?dist}
+Release:	8%{?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:	http://tukaani.org/%{name}/%{name}-%{version}.tar.xz
+Source0:	https://tukaani.org/%{name}/%{name}-%{version}.tar.xz
 
 Source100:	colorxzgrep.sh
 Source101:	colorxzgrep.csh
 
-Patch1: xz-5.2.4-cve-2022-1271.patch
+Patch1:   xz-5.2.5-enable_CET.patch
+Patch2:   xz-5.2.5-cve-2022-1271.patch
 
-URL:		http://tukaani.org/%{name}/
+URL:		https://tukaani.org/%{name}/
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 # For /usr/libexec/grepconf.sh (RHBZ#1189120).
@@ -26,6 +27,7 @@ Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 # have grepconf, but we're only concerned with F22 here.
 Requires:	grep >= 2.20-5
 
+BuildRequires:  make
 BuildRequires:	gcc
 BuildRequires:	perl-interpreter
 
@@ -124,21 +126,22 @@ 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*
+%{_mandir}/de/man1/*xz*
 %{profiledir}/*
 
 
 %files libs
-%license %{_pkgdocdir}/COPYING
+%license COPYING
 %{_libdir}/lib*.so.5*
 
 
 %files static
-%license %{_pkgdocdir}/COPYING
+%license COPYING
 %{_libdir}/liblzma.a
 
 
@@ -154,19 +157,55 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check
 %files lzma-compat
 %{_bindir}/*lz*
 %{_mandir}/man1/*lz*
+%{_mandir}/de/man1/*lz*
 
 
 %changelog
-* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 5.2.4-4
+* Tue May 31 2022 Matej Mužila <mmuzila@redhat.com> - 5.2.5-8
-- Rebuilt for MSVSphere 8.8
-
-* Tue May 31 2022 Matej Mužila <mmuzila@redhat.com> - 5.2.4-4
 - Fix arbitrary file write vulnerability
   Resolves: CVE-2022-1271
 
-* Thu Nov 22 2018 Pavel Raiskup <praiskup@redhat.com> - 5.2.4-3
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 5.2.5-7
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.2.5-6
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* 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
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Nov 22 2018 Pavel Raiskup <praiskup@redhat.com> - 5.2.4-4
 - fix annocheck failures on i686 (rhbz#1630650)
 
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed May 09 2018 Pavel Raiskup <praiskup@redhat.com> - 5.2.4-2
 - drop ppc64p7 hack, per fedora devel list discussion:
   https://lists.fedoraproject.org/archives/list/