diff --git a/SOURCES/zlib-1.2.11-IBM-DFLTCC-compression-level-switching-issues.patch b/SOURCES/zlib-1.2.11-IBM-DFLTCC-compression-level-switching-issues.patch index f347d42..c69d9bc 100644 --- a/SOURCES/zlib-1.2.11-IBM-DFLTCC-compression-level-switching-issues.patch +++ b/SOURCES/zlib-1.2.11-IBM-DFLTCC-compression-level-switching-issues.patch @@ -1,17 +1,26 @@ Subject: [PATCH] Fixed DFLTCC compression level switching issues --- - configure | 2 +- + configure | 4 +-- contrib/s390/dfltcc.c | 52 ++++++++++++++++++++++++++++++----- contrib/s390/dfltcc_deflate.h | 2 ++ deflate.c | 12 ++++---- test/infcover.c | 2 +- - 5 files changed, 56 insertions(+), 14 deletions(-) + 5 files changed, 57 insertions(+), 15 deletions(-) diff --git a/configure b/configure -index bfe4386..6fa0474 100755 +index bfe4386..70ed86b 100755 --- a/configure +++ b/configure +@@ -139,7 +139,7 @@ case "$1" in + -w* | --warn) warn=1; shift ;; + -d* | --debug) debug=1; shift ;; + --dfltcc) +- CFLAGS="$CFLAGS -DDFLTCC" ++ CFLAGS="$CFLAGS -DDFLTCC -DDFLTCC_LEVEL_MASK=0x7e" + OBJC="$OBJC dfltcc.o" + PIC_OBJC="$PIC_OBJC dfltcc.lo" + shift @@ -838,7 +838,7 @@ cat > $test.c << EOF #include int main() { return 0; } diff --git a/SPECS/zlib.spec b/SPECS/zlib.spec index 430856e..d04aeea 100644 --- a/SPECS/zlib.spec +++ b/SPECS/zlib.spec @@ -3,7 +3,7 @@ Name: zlib Version: 1.2.11 -Release: 16.2%{?dist} +Release: 17%{?dist} Summary: The compression and decompression library # /contrib/dotzlib/ have Boost license License: zlib and Boost @@ -27,6 +27,7 @@ Patch6: zlib-1.2.11-IBM-Z-hw-accelrated-deflate-fix.patch # permit a deflateParams() parameter change Patch7: zlib-1.2.11-permit-deflateParams-change.patch # fixed DFLTCC compression level switching issues +# enabled HW compression for compression levels 1 through 6 Patch8: zlib-1.2.11-IBM-DFLTCC-compression-level-switching-issues.patch # fixed inflateSyncPoint() bad return value on z15 Patch9: zlib-1.2.11-inflateSyncPoint-return-value-fix.patch @@ -171,11 +172,10 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %changelog -* Wed Feb 24 2021 Ondrej Dubaj - 1.2.11-16.2 -- Fixed inflateSyncPoint() bad return value on z15 (#1932270) - -* Mon Jun 15 2020 Ondrej Dubaj - 1.2.11-16.1 -- Fixed DFLTCC compression level switching issues (#1926104) +* Mon Jun 15 2020 Ondrej Dubaj - 1.2.11-17 +- Fixed DFLTCC compression level switching issues (#1875492) +- Enabled HW compression for compression levels 1 through 6 (#1847438) +- Fixed inflateSyncPoint() bad return value on z15 (#1888930) * Mon Jun 15 2020 Ondrej Dubaj - 1.2.11-16 - Permit a deflateParams() parameter change