diff --git a/zlib-no-version-check.patch b/zlib-no-version-check.patch index a27638d..67a9661 100644 --- a/zlib-no-version-check.patch +++ b/zlib-no-version-check.patch @@ -2,35 +2,35 @@ Index: zlib-1.2.11/infback.c =================================================================== --- zlib-1.2.11.orig/infback.c +++ zlib-1.2.11/infback.c -@@ -34,8 +34,7 @@ int stream_size; +@@ -34,9 +34,6 @@ int stream_size; { struct inflate_state FAR *state; - if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || - stream_size != (int)(sizeof(z_stream))) -+ if (stream_size != (int)(sizeof(z_stream))) - return Z_VERSION_ERROR; +- return Z_VERSION_ERROR; if (strm == Z_NULL || window == Z_NULL || windowBits < 8 || windowBits > 15) + return Z_STREAM_ERROR; Index: zlib-1.2.11/inflate.c =================================================================== --- zlib-1.2.11.orig/inflate.c +++ zlib-1.2.11/inflate.c -@@ -219,8 +219,7 @@ int stream_size; +@@ -219,9 +219,6 @@ int stream_size; int ret; struct inflate_state FAR *state; - if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || - stream_size != (int)(sizeof(z_stream))) -+ if (stream_size != (int)(sizeof(z_stream))) - return Z_VERSION_ERROR; +- return Z_VERSION_ERROR; if (strm == Z_NULL) return Z_STREAM_ERROR; strm->msg = Z_NULL; /* in case we return an error */ + if (strm->zalloc == (alloc_func)0) { Index: zlib-1.2.11/deflate.c =================================================================== --- zlib-1.2.11.orig/deflate.c +++ zlib-1.2.11/deflate.c -@@ -263,15 +263,13 @@ int ZEXPORT deflateInit2_(strm, level, m +@@ -263,17 +263,12 @@ int ZEXPORT deflateInit2_(strm, level, m { deflate_state *s; int wrap = 1; @@ -43,7 +43,8 @@ Index: zlib-1.2.11/deflate.c - if (version == Z_NULL || version[0] != my_version[0] || - stream_size != sizeof(z_stream)) { -+ if (stream_size != sizeof(z_stream)) { - return Z_VERSION_ERROR; - } +- return Z_VERSION_ERROR; +- } if (strm == Z_NULL) return Z_STREAM_ERROR; + + strm->msg = Z_NULL; diff --git a/zlib.changes b/zlib.changes index aacac6c..3e00028 100644 --- a/zlib.changes +++ b/zlib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 29 10:47:18 UTC 2019 - Tomáš Chvátal + +- Update the zlib-no-version-check.patch to be even more forgiving + with the versions on the zlib to allow updates without rebuilds + ------------------------------------------------------------------- Mon Oct 21 07:11:58 UTC 2019 - Tomáš Chvátal