From 360116b72271e739cb7084d8ab1438f781cb44a6 Mon Sep 17 00:00:00 2001
From: aekoroglu <aekoroglu@linux.intel.com>
Date: Feb 18 2023 10:04:59 +0000
Subject: patch file fix


---

diff --git a/SOURCES/zlib-1.2.11-x86_64-accelrated-slide-hash.patch b/SOURCES/zlib-1.2.11-x86_64-accelrated-slide-hash.patch
index c9c362a..c8e793d 100644
--- a/SOURCES/zlib-1.2.11-x86_64-accelrated-slide-hash.patch
+++ b/SOURCES/zlib-1.2.11-x86_64-accelrated-slide-hash.patch
@@ -21,11 +21,11 @@
      *)
        echo "unknown option: $1" | tee -a configure.log
        echo "$0 --help for help" | tee -a configure.log
---- a/Makefile.in	2022-04-11 18:00:47.184530801 +0300
-+++ b/Makefile.in	2022-04-11 18:02:47.815927655 +0300
-@@ -151,6 +151,14 @@
- 	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/dfltcc.o $(SRCDIR)contrib/s390/dfltcc.c
- 	-@mv objs/dfltcc.o $@
+--- a/Makefile.in	2023-02-18 10:35:58.873281584 +0200
++++ b/Makefile.in	2023-02-18 11:48:00.796154526 +0200
+@@ -144,6 +144,14 @@
+ 	mv _match.o match.lo
+ 	rm -f _match.s
  
 +slide_sse.o: $(SRCDIR)slide_sse.c
 +	$(CC) $(CFLAGS) $(ZINC) -msse2 -c -o $@ $(SRCDIR)slide_sse.c
@@ -35,8 +35,8 @@
 +	$(CC) $(SFLAGS) $(ZINC) -DPIC -msse2 -c -o objs/slide_sse.o $(SRCDIR)slide_sse.c
 +	-@mv objs/slide_sse.o $@
 +
- example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
- 	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
+ dfltcc.o: $(SRCDIR)contrib/s390/dfltcc.c $(SRCDIR)zlib.h zconf.h
+ 	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)contrib/s390/dfltcc.c
  
 --- a/deflate.c	2022-04-19 11:43:42.333320519 +0300
 +++ b/deflate.c	2022-04-19 15:55:30.636531139 +0300
diff --git a/SPECS/zlib.spec b/SPECS/zlib.spec
index 7ca3996..7f33421 100644
--- a/SPECS/zlib.spec
+++ b/SPECS/zlib.spec
@@ -13,14 +13,11 @@ Source: https://www.zlib.net/fossils/zlib-%{version}.tar.gz
 Patch0: zlib-1.2.5-minizip-fixuncrypt.patch
 # resolves: #805113
 Patch1: zlib-1.2.11-optimized-s390.patch
+# Backport upstream commit 2d80d3f6b52f9fa454c26c89d2d6a1790e1cecb0
+# Reason: Fuzzer founds issues with unknown memory access
+Patch5: zlib-1.2.11-Limit-hash-table-inserts.patch
 # IBM Z optimalizations
 Patch7: zlib-1.2.11-IBM-Z-hw-accelrated-deflate-s390x.patch
-# IBM CRC32 optimalization for POWER archs
-Patch8: zlib-1.2.11-optimized-CRC32-framework.patch
-# fixed firefox crash + added test case
-Patch9: zlib-1.2.11-firefox-crash-fix.patch
-# fixed covscan issues
-Patch10: zlib-1.2.11-covscan-issues.patch
 # fix for IBM Z optimalizations
 Patch11: zlib-1.2.11-IBM-Z-hw-accelrated-deflate-fix.patch
 # permit a deflateParams() parameter change
@@ -33,12 +30,10 @@ Patch14: zlib-1.2.11-inflateSyncPoint-return-value-fix.patch
 # fixed issues found by covscan for rhel-9
 # ref: https://github.com/madler/zlib/pull/554
 Patch15: zlib-1.2.11-covscan-issues-rhel9.patch
-# Fix for s390x vectorize CRC32
-Patch16: zlib-1.2.11-s390x-vectorize-crc32.patch
 # fix for IBM Z optimalizations
 Patch17: zlib-1.2.11-IBM-Z-hw-accelrated-deflate-compressBound-fix.patch
+# Fix for CVE-2018-25032
 Patch18: zlib-1.2.11-CVE-2018-25032.patch
-
 # Fix for CVE-2022-37434
 Patch19: zlib-1.2.11-cve-2022-37434.patch
 Patch20: zlib-1.2.11-cve-2022-37434_2.patch
@@ -125,16 +120,13 @@ developing applications which use minizip.
 %ifarch s390 s390x
 %patch1 -p1 -b .optimized-deflate
 %endif
+%patch5 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
@@ -147,7 +139,7 @@ developing applications which use minizip.
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
-%patch100 -p1
+#%patch100 -p1
 
 
 iconv -f iso-8859-2 -t utf-8 < ChangeLog > ChangeLog.tmp