import zlib-1.2.11-35.el9_1

SOURCES/zlib-1.2.11-IBM-Z-hw-accelrated-deflate-strm-adler-fix.patch

+--- a/contrib/s390/dfltcc.c
++++ b/contrib/s390/dfltcc.c
+@@ -623,7 +623,7 @@
+     state->bits = param->sbb;
+     state->whave = param->hl;
+     state->wnext = (param->ho + param->hl) & ((1 << HB_BITS) - 1);
+-    state->check = state->flags ? ZSWAP32(param->cv) : param->cv;
++    strm->adler = state->check = state->flags ? ZSWAP32(param->cv) : param->cv;
+     if (cc == DFLTCC_CC_OP2_CORRUPT && param->oesc != 0) {
+         /* Report an error if stream is corrupted */
+         state->mode = BAD;

SPECS/zlib.spec

@@ -2,7 +2,7 @@
 
 Name:    zlib
 Version: 1.2.11
-Release: 34%{?dist}
+Release: 35%{?dist}
 Summary: Compression and decompression library
 # /contrib/dotzlib/ have Boost license
 License: zlib and Boost
@@ -43,6 +43,9 @@ Patch18: zlib-1.2.11-CVE-2018-25032.patch
 Patch19: zlib-1.2.11-cve-2022-37434.patch
 Patch20: zlib-1.2.11-cve-2022-37434_2.patch
 
+# Fix setting strm.adler on z15
+Patch21: zlib-1.2.11-IBM-Z-hw-accelrated-deflate-strm-adler-fix.patch
+
 
 BuildRequires: make
 BuildRequires: automake, autoconf, libtool
@@ -115,6 +118,7 @@ developing applications which use minizip.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 
 iconv -f iso-8859-2 -t utf-8 < ChangeLog > ChangeLog.tmp
@@ -192,6 +196,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 
 
 %changelog
+* Wed Oct 12 2022 Ilya Leoshkevich <iii@linux.ibm.com> - 1.2.11-35
+- Fix for IBM strm.adler rhbz#2134074
+
 * Wed Aug 10 2022 Matej Mužila <mmuzila@redhat.com> - 1.2.11-34
 - Fix heap-based buffer over-read or buffer overflow in inflate in inflate.c
 - Resolves: CVE-2022-37434