From 33c882bb12f79c507aa5c89f689292b91fe16505 Mon Sep 17 00:00:00 2001 From: wxiat Date: Tue, 1 Aug 2023 16:56:38 +0800 Subject: [PATCH] add sw Signed-off-by: Weisson --- zziplib-0.13.71-sw.patch | 24 ++++++++++++++++++++++++ zziplib.spec | 10 +++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 zziplib-0.13.71-sw.patch diff --git a/zziplib-0.13.71-sw.patch b/zziplib-0.13.71-sw.patch new file mode 100644 index 0000000..39ecb27 --- /dev/null +++ b/zziplib-0.13.71-sw.patch @@ -0,0 +1,24 @@ +diff -Nuar zziplib-0.13.71.org/configure zziplib-0.13.71.sw/configure +--- zziplib-0.13.71.org/configure 2023-08-01 16:51:10.648917042 +0800 ++++ zziplib-0.13.71.sw/configure 2023-08-01 16:52:46.743310515 +0800 +@@ -14802,7 +14802,7 @@ + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = "yes"; then +- case "$host_cpu" in alpha*|arm*|bfin*|hp*|mips*|sh*|sparc*|ia64|nv1) ++ case "$host_cpu" in sw_64*|alpha*|arm*|bfin*|hp*|mips*|sh*|sparc*|ia64|nv1) + ax_cv_have_aligned_access_required="yes" + ;; esac + else +diff -Nuar zziplib-0.13.71.org/m4/ax_check_aligned_access_required.m4 zziplib-0.13.71.sw/m4/ax_check_aligned_access_required.m4 +--- zziplib-0.13.71.org/m4/ax_check_aligned_access_required.m4 2023-08-01 16:51:10.645916936 +0800 ++++ zziplib-0.13.71.sw/m4/ax_check_aligned_access_required.m4 2023-08-01 16:54:22.015674958 +0800 +@@ -29,7 +29,7 @@ + [AC_CACHE_CHECK([if pointers to integers require aligned access], + [ax_cv_have_aligned_access_required], + [if test "$cross_compiling" = "yes"; then +- case "$host_cpu" in alpha*|arm*|bfin*|hp*|mips*|sh*|sparc*|ia64|nv1) ++ case "$host_cpu" in sw_64*|alpha*|arm*|bfin*|hp*|mips*|sh*|sparc*|ia64|nv1) + ax_cv_have_aligned_access_required="yes" + ;; esac + else diff --git a/zziplib.spec b/zziplib.spec index ba18d9c..5a2414c 100644 --- a/zziplib.spec +++ b/zziplib.spec @@ -1,7 +1,9 @@ +%define anolis_release .0.1 + Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.71 -Release: 11%{?dist} +Release: 11%{?anolis_release}%{?dist} License: LGPLv2+ or MPLv1.1 URL: http://zziplib.sourceforge.net/ #Source: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz @@ -19,6 +21,8 @@ Patch2: CVE-2020-18770.patch Patch100: multilib-32.patch Patch101: multilib-64.patch +Patch1000: zziplib-0.13.71-sw.patch + BuildRequires: make BuildRequires: gcc BuildRequires: perl-interpreter @@ -77,6 +81,7 @@ cp %{SOURCE2} docs/zzipdoc/ %patch1 -p1 %patch2 -p1 +%patch1000 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -124,6 +129,9 @@ popd %{_mandir}/man3/* %changelog +* Fri Nov 15 2024 wxiat - 0.13.71-11.0.1 +- cherry pick `add sw #4a81c729f6935d5698fa3c4fadd8602a3d3fafb5`. + * Wed Feb 28 2024 Jakub Martisko - 0.13.71-11 - Fix CVE-2020-18770 Previous patch was causing segfault -- Gitee