Fix missing patches due to different arch

(cherry picked from commit 1a19bafc6fea46e9c08e3b09066c95c55a34522c)
This commit is contained in:
shixuantong 2022-08-23 19:02:45 +08:00 committed by openeuler-sync-bot
parent 9aaf0f89dd
commit 7108534829

View File

@ -1,6 +1,6 @@
Name: zlib Name: zlib
Version: 1.2.11 Version: 1.2.11
Release: 22 Release: 23
Summary: A lossless data-compression library Summary: A lossless data-compression library
License: zlib and Boost License: zlib and Boost
URL: http://www.zlib.net URL: http://www.zlib.net
@ -8,7 +8,6 @@ Source0: http://www.zlib.net/zlib-%{version}.tar.xz
# Patch0 get from fedora # Patch0 get from fedora
Patch0: zlib-1.2.5-minizip-fixuncrypt.patch Patch0: zlib-1.2.5-minizip-fixuncrypt.patch
%ifarch aarch64
# Patch1 to Patch3 get from http://www.gildor.org/en/projects/zlib # Patch1 to Patch3 get from http://www.gildor.org/en/projects/zlib
Patch1: 0001-Neon-Optimized-hash-chain-rebase.patch Patch1: 0001-Neon-Optimized-hash-chain-rebase.patch
Patch2: 0002-Porting-optimized-longest_match.patch Patch2: 0002-Porting-optimized-longest_match.patch
@ -16,7 +15,6 @@ Patch3: 0003-arm64-specific-build-patch.patch
Patch4: 0004-zlib-Optimize-CRC32.patch Patch4: 0004-zlib-Optimize-CRC32.patch
Patch5: zlib-1.2.11-SIMD.patch Patch5: zlib-1.2.11-SIMD.patch
Patch6: 0005-Accelerate-Adler32-using-arm64-SVE-instructions.patch Patch6: 0005-Accelerate-Adler32-using-arm64-SVE-instructions.patch
%endif
Patch6000: fix-undefined-buffer-detected-by-oss-fuzz.patch Patch6000: fix-undefined-buffer-detected-by-oss-fuzz.patch
Patch6001: backport-0001-CVE-2018-25032.patch Patch6001: backport-0001-CVE-2018-25032.patch
@ -65,7 +63,21 @@ Requires: %{name}-devel = %{version}-%{release}
This package contains the development-related content related to minizip. This package contains the development-related content related to minizip.
%prep %prep
%autosetup -p1 %setup -n %{name}-%{version}
%patch0 -p1
%ifarch aarch64
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%endif
%patch6000 -p1
%patch6001 -p1
%patch6002 -p1
%patch6003 -p1
%patch6004 -p1
%build %build
export CFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS"
@ -123,6 +135,9 @@ make test
%{_libdir}/pkgconfig/minizip.pc %{_libdir}/pkgconfig/minizip.pc
%changelog %changelog
* Tue Aug 23 2022 shixuantong <shixuantong@h-partners.com> - 1.2.11-23
- Fix missing patches due to different arch
* Fri Aug 12 2022 dongyuzhen <dongyuzhen@h-partners.com> - 1.2.11-22 * Fri Aug 12 2022 dongyuzhen <dongyuzhen@h-partners.com> - 1.2.11-22
- fix CVE-2022-37434 - fix CVE-2022-37434