pool/zlib
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 847067 from home:alix82:branches:devel:libraries:c_c++

Browse Source 
Fix hw compression on z15 bsc#1176201

OBS-URL: https://build.opensuse.org/request/show/847067
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zlib?expand=0&rev=69
This commit is contained in:
Jan Engelhardt 2020-11-19 14:06:55 +00:00 committed by Git OBS Bridge
parent 3ab26512eb
commit 36ba017e87
3 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
zlib-s390x-z15-fix-hw-compression.patch Normal file
View File

@ -0,0 +1,47 @@
From 4a587d07b3774c603f1a33ab1648419064951988 Mon Sep 17 00:00:00 2001
From: Ilya Leoshkevich <iii@linux.ibm.com>
Date: Mon, 28 Sep 2020 19:32:44 +0200
Subject: [PATCH] wip
---
contrib/s390/dfltcc.h | 4 ++++
inflate.c | 2 ++
2 files changed, 6 insertions(+)
diff --git a/contrib/s390/dfltcc.h b/contrib/s390/dfltcc.h
index e4447dd..bf41272 100644
--- a/contrib/s390/dfltcc.h
+++ b/contrib/s390/dfltcc.h
@@ -51,5 +51,9 @@ int ZLIB_INTERNAL dfltcc_inflate_disable OF((z_streamp strm));
do { \
if (dfltcc_was_inflate_used((strm))) return -(1L << 16); \
} while (0)
+#define INFLATE_SYNC_POINT_HOOK(strm) \
+ do { \
+ if (dfltcc_was_inflate_used((strm))) return Z_STREAM_ERROR; \
+ } while (0)
#endif
diff --git a/inflate.c b/inflate.c
index 2b7d564..6f19a87 100644
--- a/inflate.c
+++ b/inflate.c
@@ -100,6 +100,7 @@
#define INFLATE_NEED_CHECKSUM(strm) 1
#define INFLATE_NEED_UPDATEWINDOW(strm) 1
#define INFLATE_MARK_HOOK(strm) do {} while (0)
+#define INFLATE_SYNC_POINT_HOOK(strm) do {} while (0)
#endif
#ifdef MAKEFIXED
@@ -1491,6 +1492,7 @@ z_streamp strm;
struct inflate_state FAR *state;
if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+ INFLATE_SYNC_POINT_HOOK(strm);
state = (struct inflate_state FAR *)strm->state;
return state->mode == STORED && state->bits == 0;
}
--
2.25.4

5
zlib.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Nov 9 08:00:35 UTC 2020 - Ali Abdallah <ali.abdallah@suse.com>
- Fix hw compression on z15 bsc#1176201
-------------------------------------------------------------------
Wed Sep 16 15:05:04 UTC 2020 - Stephan Kulow <coolo@suse.com>

3
zlib.spec
View File

@ -44,6 +44,8 @@ Patch5: zlib-no-version-check.patch
Patch6: bsc1174736-DFLTCC_LEVEL_MASK-set-to-0x1ff.patch
Patch7: bsc1174551-fxi-imcomplete-raw-streams.patch
Patch8: zlib-compression-switching.patch
#PATCH-FIX-SUSE: bsc#1176201, sent upstream by IBM
Patch9: zlib-s390x-z15-fix-hw-compression.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
@ -137,6 +139,7 @@ It should exit 0
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
cp %{SOURCE4} .
%build