From cbcce337550e5bc91a8ffc1cb1d52cbc949ee1f1 Mon Sep 17 00:00:00 2001 From: maqi Date: Fri, 28 Feb 2025 10:49:51 +0800 Subject: [PATCH] Add sw_64 support (cherry picked from commit 293eae3476027c34868b47f71d0cd949e0c95653) --- add-sw_64-support.patch | 28 ++++++++++++++++++++++++++++ xz.spec | 6 +++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 add-sw_64-support.patch diff --git a/add-sw_64-support.patch b/add-sw_64-support.patch new file mode 100644 index 0000000..128af37 --- /dev/null +++ b/add-sw_64-support.patch @@ -0,0 +1,28 @@ +From fdcfd8436a5030701cea06248563a25c44eea966 Mon Sep 17 00:00:00 2001 +From: mahailiang +Date: Wed, 30 Oct 2024 21:02:03 +0800 +Subject: [PATCH] add sw_64 support + +--- + src/liblzma/api/lzma/bcj.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/liblzma/api/lzma/bcj.h b/src/liblzma/api/lzma/bcj.h +index 0c84e0c..95cb413 100644 +--- a/src/liblzma/api/lzma/bcj.h ++++ b/src/liblzma/api/lzma/bcj.h +@@ -15,6 +15,11 @@ + # error Never include this file directly. Use instead. + #endif + ++#define LZMA_FILTER_SW_64 LZMA_VLI_C(0x04) ++ /**< ++ * Filter for sw_64 binaries ++ */ ++ + + /* Filter IDs for lzma_filter.id */ + +-- +2.20.1 + diff --git a/xz.spec b/xz.spec index 56869c5..310c454 100644 --- a/xz.spec +++ b/xz.spec @@ -1,6 +1,6 @@ Name: xz Version: 5.4.7 -Release: 3 +Release: 4 Summary: A free general-purpose data compreession software with LZMA2 algorithm License: GPL-3.0-only URL: http://tukaani.org/xz @@ -12,6 +12,7 @@ Source2: colorxzgrep.csh # https://github.com/tukaani-project/xz/releases/download/v5.4.7/xz-5213-547-562-libtool.patch Patch0: xz-5213-547-562-libtool.patch Patch1: 0001-fix-CVE-2024-47611.patch +Patch2: add-sw_64-support.patch BuildRequires: perl-interpreter gcc # Patch1 modified Makefile.am so we need this @@ -112,6 +113,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs %make_build check %lang(pt_BR) %{_mandir}/pt_BR/man1/* %changelog +* Fri Feb 28 2025 maqi - 5.4.7-4 +- Add sw_64 support + * Tue Nov 5 15:46:38 2024 Kai Liu - 5.4.7-3 - Add BuildRequires for automake as patch1 modified Makefile.am. -- Gitee