From cf026644e5c267c2496aba410af2a3d864945215 Mon Sep 17 00:00:00 2001 From: zhoupengcheng Date: Thu, 19 Oct 2023 20:04:16 +0800 Subject: [PATCH] remove unapplied patch (cherry picked from commit 4bfb7f1bca7fdb8d9f4981cee443850d0cabad35) --- zlib-1.2.11-optimized-s390.patch | 41 -------------------------------- zlib.spec | 9 ++++--- 2 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 zlib-1.2.11-optimized-s390.patch diff --git a/zlib-1.2.11-optimized-s390.patch b/zlib-1.2.11-optimized-s390.patch deleted file mode 100644 index 50a5151..0000000 --- a/zlib-1.2.11-optimized-s390.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/deflate.c b/deflate.c -index 1ec7614..b724c8d 100644 ---- a/deflate.c -+++ b/deflate.c -@@ -1233,15 +1233,16 @@ local void lm_init (s) - /* For 80x86 and 680x0, an optimized version will be provided in match.asm or - * match.S. The code will be functionally equivalent. - */ --local uInt longest_match(s, cur_match) -+local uInt longest_match(s, pcur_match) - deflate_state *s; -- IPos cur_match; /* current match */ -+ IPos pcur_match; /* current match */ - { -+ ptrdiff_t cur_match = pcur_match; /* extend to pointer width */ - unsigned chain_length = s->max_chain_length;/* max hash chain length */ - register Bytef *scan = s->window + s->strstart; /* current string */ - register Bytef *match; /* matched string */ - register int len; /* length of current match */ -- int best_len = (int)s->prev_length; /* best match length so far */ -+ ptrdiff_t best_len = s->prev_length; /* best match length so far */ - int nice_match = s->nice_match; /* stop if match long enough */ - IPos limit = s->strstart > (IPos)MAX_DIST(s) ? - s->strstart - (IPos)MAX_DIST(s) : NIL; -@@ -1256,12 +1257,12 @@ local uInt longest_match(s, cur_match) - * Try with and without -DUNALIGNED_OK to check. - */ - register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1; -- register ush scan_start = *(ushf*)scan; -- register ush scan_end = *(ushf*)(scan+best_len-1); -+ register uInt scan_start = *(ushf*)scan; -+ register uInt scan_end = *(ushf*)(scan+best_len-1); - #else - register Bytef *strend = s->window + s->strstart + MAX_MATCH; -- register Byte scan_end1 = scan[best_len-1]; -- register Byte scan_end = scan[best_len]; -+ register uInt scan_end1 = scan[best_len-1]; -+ register uInt scan_end = scan[best_len]; - #endif - - /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. diff --git a/zlib.spec b/zlib.spec index 225052b..b6d8467 100644 --- a/zlib.spec +++ b/zlib.spec @@ -1,6 +1,6 @@ Name: zlib Version: 1.2.11 -Release: 23 +Release: 24 Summary: A lossless data-compression library License: zlib and Boost URL: http://www.zlib.net @@ -137,8 +137,11 @@ make test %{_libdir}/pkgconfig/minizip.pc %changelog -* Tue Oct 17 2023 liningjie - 1.2.11-23 -- Fix CVE-2023-45853 +* Tue Oct 17 2023 liningjie - 1.2.11-24 +- DESC:Fix CVE-2023-45853 + +* Mon Dec 26 2022 zhoupengcheng - 1.2.11-23 +- DESC:remove unapplied patch * Fri Aug 12 2022 dongyuzhen - 1.2.11-22 - fix CVE-2022-37434 -- Gitee