From 8e96ef7ece387627d814041009f805fb5e56e34f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 14 Jul 2020 02:08:57 +0000 Subject: [PATCH] import zlib-1.2.11-15.el8 --- SOURCES/zlib-1.2.11-IBM-Z-hw-accelrated-deflate-fix.patch | 2 +- SPECS/zlib.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/SOURCES/zlib-1.2.11-IBM-Z-hw-accelrated-deflate-fix.patch b/SOURCES/zlib-1.2.11-IBM-Z-hw-accelrated-deflate-fix.patch index 927cde1..92fa27c 100644 --- a/SOURCES/zlib-1.2.11-IBM-Z-hw-accelrated-deflate-fix.patch +++ b/SOURCES/zlib-1.2.11-IBM-Z-hw-accelrated-deflate-fix.patch @@ -273,7 +273,7 @@ index 9b09718..9284483 100644 - if ((strategy != s->strategy || func != configuration_table[level].func) && - s->high_water) { + if ((strategy != s->strategy || func != configuration_table[level].func || -+ hook_flush != Z_NO_FLUSH) && s->last_flush != -2) { ++ hook_flush != Z_NO_FLUSH) && s->high_water) { /* Flush the last buffer: */ - int err = deflate(strm, Z_BLOCK); + int err = deflate(strm, RANK(hook_flush) > RANK(Z_BLOCK) ? diff --git a/SPECS/zlib.spec b/SPECS/zlib.spec index cf54db5..d85c90a 100644 --- a/SPECS/zlib.spec +++ b/SPECS/zlib.spec @@ -3,7 +3,7 @@ Name: zlib Version: 1.2.11 -Release: 14%{?dist} +Release: 15%{?dist} Summary: The compression and decompression library # /contrib/dotzlib/ have Boost license License: zlib and Boost @@ -162,6 +162,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %changelog +* Mon Jun 15 2020 Ondrej Dubaj - 1.2.11-15 +- Another fix for Z hardware-accelerated deflate for s390x architectures + * Mon May 25 2020 Ondrej Dubaj - 1.2.11-14 - Fix for Z hardware-accelerated deflate for s390x architectures