diff -Nru zlib-1.2.11.dfsg/debian/changelog zlib-1.2.11.dfsg/debian/changelog
--- zlib-1.2.11.dfsg/debian/changelog	2020-08-19 23:52:59.000000000 +0000
+++ zlib-1.2.11.dfsg/debian/changelog	2020-10-15 10:10:29.000000000 +0000
@@ -1,3 +1,12 @@
+zlib (1:1.2.11.dfsg-2ubuntu1.2) focal; urgency=medium
+
+  * Cherrypick update of s390x hw acceleration #410 pull request patch,
+    which corrects inflateSyncPoint() return value to always gracefully
+    fail when hw acceleration is in use. This fixes rsync failure with
+    zlib compression on hw accelerated s390x. LP: #1899621
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 15 Oct 2020 11:10:29 +0100
+
 zlib (1:1.2.11.dfsg-2ubuntu1.1) focal; urgency=medium
 
   * Update d/patches/410.patch to current state to fix issues with hardware
diff -Nru zlib-1.2.11.dfsg/debian/patches/410-lp1899621.patch zlib-1.2.11.dfsg/debian/patches/410-lp1899621.patch
--- zlib-1.2.11.dfsg/debian/patches/410-lp1899621.patch	1970-01-01 00:00:00.000000000 +0000
+++ zlib-1.2.11.dfsg/debian/patches/410-lp1899621.patch	2020-10-15 10:10:05.000000000 +0000
@@ -0,0 +1,34 @@
+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..c9d6ae2 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;
+ }
diff -Nru zlib-1.2.11.dfsg/debian/patches/series zlib-1.2.11.dfsg/debian/patches/series
--- zlib-1.2.11.dfsg/debian/patches/series	2020-08-19 23:07:11.000000000 +0000
+++ zlib-1.2.11.dfsg/debian/patches/series	2020-10-15 10:10:05.000000000 +0000
@@ -2,4 +2,5 @@
 use-dso-really
 Permit-a-deflateParams-parameter-change-asap.patch
 410.patch
+410-lp1899621.patch
 335.diff