diff --git a/zlib-1.2.13.tar.xz b/zlib-1.2.13.tar.xz deleted file mode 100644 index c01659e5852d0d97ea690c0149293be33e16f37b..0000000000000000000000000000000000000000 Binary files a/zlib-1.2.13.tar.xz and /dev/null differ diff --git a/zlib-1.2.11-SIMD.patch b/zlib-1.3-SIMD.patch similarity index 99% rename from zlib-1.2.11-SIMD.patch rename to zlib-1.3-SIMD.patch index df0bf7a6aa988f090876ac81c97ce00c4830b48a..3d4ec3e7d7da90b5c49774f8488379f05fd2aae9 100644 --- a/zlib-1.2.11-SIMD.patch +++ b/zlib-1.3-SIMD.patch @@ -204,9 +204,9 @@ index d0be438..6ced75d 100644 +} +#endif + - uLong ZEXPORT adler32_z(adler, buf, len) - uLong adler; - const Bytef *buf; + uLong ZEXPORT adler32_z(uLong adler, const Bytef *buf, z_size_t len) { + unsigned long sum2; + unsigned n; @@ -68,6 +230,11 @@ uLong ZEXPORT adler32_z(adler, buf, len) unsigned long sum2; unsigned n; @@ -381,7 +381,7 @@ index e5c1aa4..259882c 100644 + * input data in 64-bit (8 byte) chunks. + */ + - void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start)); + void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start); + +#if defined(INFLATE_CHUNK_SIMD_NEON) + diff --git a/zlib-1.3.tar.xz b/zlib-1.3.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..d5b8a34f1f65ff64dbe9c7fa69deece86a3afdfd Binary files /dev/null and b/zlib-1.3.tar.xz differ diff --git a/zlib-Optimize-CRC32.patch b/zlib-Optimize-CRC32.patch index 16d66b48c1ec24209e8065e466dc5ad13380386b..c0495a6822edefc28991bed6c82bdaf7572803d7 100644 --- a/zlib-Optimize-CRC32.patch +++ b/zlib-Optimize-CRC32.patch @@ -79,9 +79,9 @@ index f8357b0..5c53068 100644 * Use ARM machine instructions if available. This will compute the CRC about * ten times faster than the braided calculation. This code does not check for @@ -750,6 +794,10 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) - const unsigned char FAR *buf; - z_size_t len; - { + z_size_t last, last2, i; + z_size_t num; + + #ifdef __aarch64__ + return crc32_neon(crc, buf, len); + #endif diff --git a/zlib.spec b/zlib.spec index 8cd5494975ee6ff0367a520107cc545daa1e995c..b5bfa2c4ec7baf707f3384ccde4dcf43a9ea83cd 100644 --- a/zlib.spec +++ b/zlib.spec @@ -1,5 +1,5 @@ Name: zlib -Version: 1.2.13 +Version: 1.3 Release: 1 Summary: A lossless data-compression library License: zlib and Boost @@ -11,7 +11,7 @@ Patch6000: backport-zlib-1.2.5-minizip-fixuncrypt.patch Patch6001: backport-fix-undefined-buffer-detected-by-oss-fuzz.patch Patch9000: zlib-Optimize-CRC32.patch -Patch9001: zlib-1.2.11-SIMD.patch +Patch9001: zlib-1.3-SIMD.patch BuildRequires: automake, autoconf, libtool @@ -54,7 +54,7 @@ Requires: %{name}-devel = %{version}-%{release} This package contains the development-related content related to minizip. %prep -%setup -n %{name}-%{version} +%setup -qn %{name}-%{version} %autosetup -b 0 -n %{name}-%{version} -p1 %build @@ -76,14 +76,13 @@ autoreconf --install %make_install -C contrib/minizip rm -f $RPM_BUILD_ROOT%_includedir/minizip/crypt.h - -find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f +rm -f $RPM_BUILD_ROOT%_libdir/libminizip.la %check -make test +%make_build test %files -%defattr(-,root,root) +%license LICENSE %doc README ChangeLog FAQ %{_libdir}/libz.so.* @@ -112,6 +111,9 @@ make test %{_libdir}/pkgconfig/minizip.pc %changelog +* Sat Aug 19 2023 Funda Wang - 1.3-1 +- update to 1.3 + * Thu Dec 29 2022 zhoupengcheng - 1.2.13-1 - update to zlib-1.2.13 - remove openEuler uncompiled patch : 0005-Accelerate-Adler32-using-arm64-SVE-instructions.patch