pool/zlib
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 741412 from devel:libraries:c_c++

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/request/show/741412
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zlib?expand=0&rev=74
This commit is contained in:
Dominique Leuenberger 2019-10-25 16:37:54 +00:00 committed by Git OBS Bridge
commit 4a1f4551dd
3 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
zlib-no-version-check.patch Normal file
View File

@ -0,0 +1,49 @@
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;

8
zlib.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Oct 21 07:11:58 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- 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
-------------------------------------------------------------------
Wed Jul 17 07:26:35 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

4
zlib.spec
View File

@ -39,6 +39,9 @@ Patch2: 0001-Do-not-try-to-store-negative-values-in-unsigned-int.patch
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 @@ developing applications which use minizip.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
cp %{SOURCE4} .
%build