commit zlib for openSUSE:Factory
Hello community, here is the log from the commit of package zlib for openSUSE:Factory checked in at 2019-11-03 10:47:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zlib (Old) and /work/SRC/openSUSE:Factory/.zlib.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zlib" Sun Nov 3 10:47:30 2019 rev:75 rq:743812 version:1.2.11 Changes: -------- --- /work/SRC/openSUSE:Factory/zlib/zlib.changes 2019-10-25 18:37:55.223658737 +0200 +++ /work/SRC/openSUSE:Factory/.zlib.new.2990/zlib.changes 2019-11-03 10:47:32.574217888 +0100 @@ -1,0 +2,6 @@ +Tue Oct 29 10:47:18 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com> + +- Update the zlib-no-version-check.patch to be even more forgiving + with the versions on the zlib to allow updates without rebuilds + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zlib-no-version-check.patch ++++++ --- /var/tmp/diff_new_pack.jlz33E/_old 2019-11-03 10:47:33.226218673 +0100 +++ /var/tmp/diff_new_pack.jlz33E/_new 2019-11-03 10:47:33.226218673 +0100 @@ -2,35 +2,35 @@ =================================================================== --- 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 @@ - 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;
participants (1)
-
root