Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2020-11-26 23:08:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and      /work/SRC/openSUSE:Factory/.zlib.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "zlib"

Thu Nov 26 23:08:35 2020 rev:80 rq:849446 version:1.2.11

Changes:
--------
--- /work/SRC/openSUSE:Factory/zlib/zlib.changes        2020-09-23 
18:39:43.673284146 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new.5913/zlib.changes      2020-11-26 
23:08:36.668783281 +0100
@@ -1,0 +2,6 @@
+Mon Nov  9 08:00:35 UTC 2020 - Ali Abdallah <[email protected]>
+
+- Fix hw compression on z15 bsc#1176201
+- Add zlib-s390x-z15-fix-hw-compression.patch
+
+-------------------------------------------------------------------

New:
----
  zlib-s390x-z15-fix-hw-compression.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ zlib.spec ++++++
--- /var/tmp/diff_new_pack.of2T2J/_old  2020-11-26 23:08:37.320783914 +0100
+++ /var/tmp/diff_new_pack.of2T2J/_new  2020-11-26 23:08:37.324783918 +0100
@@ -44,6 +44,8 @@
 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 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 cp %{SOURCE4} .
 
 %build


++++++ zlib-s390x-z15-fix-hw-compression.patch ++++++
From 4a587d07b3774c603f1a33ab1648419064951988 Mon Sep 17 00:00:00 2001
From: Ilya Leoshkevich <[email protected]>
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
_______________________________________________
openSUSE Commits mailing list -- [email protected]
To unsubscribe, email [email protected]
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives: 
https://lists.opensuse.org/archives/list/[email protected]

Reply via email to