Hello community, here is the log from the commit of package zlib for openSUSE:Factory checked in at 2019-10-25 18:37:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zlib (Old) and /work/SRC/openSUSE:Factory/.zlib.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zlib" Fri Oct 25 18:37:54 2019 rev:74 rq:741412 version:1.2.11 Changes: -------- --- /work/SRC/openSUSE:Factory/zlib/zlib.changes 2019-08-05 11:17:43.486527172 +0200 +++ /work/SRC/openSUSE:Factory/.zlib.new.2990/zlib.changes 2019-10-25 18:37:55.223658737 +0200 @@ -1,0 +2,8 @@ +Mon Oct 21 07:11:58 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Add SUSE specific patch to fix bsc#1138793, we simply don't want + to test if the app was linked with exactly same version of zlib + like the one that is present on the runtime: + * zlib-no-version-check.patch + +------------------------------------------------------------------- New: ---- zlib-no-version-check.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zlib.spec ++++++ --- /var/tmp/diff_new_pack.sElWB6/_old 2019-10-25 18:37:55.787659268 +0200 +++ /var/tmp/diff_new_pack.sElWB6/_new 2019-10-25 18:37:55.799659280 +0200 @@ -39,6 +39,9 @@ Patch3: zlib-power8-fate325307.patch #PATCH-FIX-UPSTREAM https://github.com/madler/zlib/pull/410 Patch4: 410.patch +#PATCH-FIX-SUSE do not check exact version match as the lib can be updated +# we should simply rely on soname versioning to protect us +Patch5: zlib-no-version-check.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -124,6 +127,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 cp %{SOURCE4} . %build ++++++ zlib-no-version-check.patch ++++++ 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; { 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; if (strm == Z_NULL || window == Z_NULL || windowBits < 8 || windowBits > 15) 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; 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; if (strm == Z_NULL) return Z_STREAM_ERROR; strm->msg = Z_NULL; /* in case we return an error */ 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 { deflate_state *s; int wrap = 1; - static const char my_version[] = ZLIB_VERSION; ushf *overlay; /* We overlay pending_buf and d_buf+l_buf. This works since the average * output size for (length,distance) codes is <= 24 bits. */ - if (version == Z_NULL || version[0] != my_version[0] || - stream_size != sizeof(z_stream)) { + if (stream_size != sizeof(z_stream)) { return Z_VERSION_ERROR; } if (strm == Z_NULL) return Z_STREAM_ERROR;
