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

Accepting request 743812 from devel:libraries:c_c++

Browse Source 
- Update the zlib-no-version-check.patch to be even more forgiving
  with the versions on the zlib to allow updates without rebuilds

OBS-URL: https://build.opensuse.org/request/show/743812
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zlib?expand=0&rev=75
This commit is contained in:
Dominique Leuenberger 2019-11-03 09:47:30 +00:00 committed by Git OBS Bridge
commit 69e0734bb1
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
zlib-no-version-check.patch
View File

@ -2,35 +2,35 @@ Index: zlib-1.2.11/infback.c
=================================================================== ===================================================================
--- zlib-1.2.11.orig/infback.c --- zlib-1.2.11.orig/infback.c
+++ zlib-1.2.11/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; struct inflate_state FAR *state;
- if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || - if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
- stream_size != (int)(sizeof(z_stream))) - 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 || if (strm == Z_NULL || window == Z_NULL ||
windowBits < 8 || windowBits > 15) windowBits < 8 || windowBits > 15)
return Z_STREAM_ERROR;
Index: zlib-1.2.11/inflate.c Index: zlib-1.2.11/inflate.c
=================================================================== ===================================================================
--- zlib-1.2.11.orig/inflate.c --- zlib-1.2.11.orig/inflate.c
+++ zlib-1.2.11/inflate.c +++ zlib-1.2.11/inflate.c
@@ -219,8 +219,7 @@ int stream_size; @@ -219,9 +219,6 @@ int stream_size;
int ret; int ret;
struct inflate_state FAR *state; struct inflate_state FAR *state;
- if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || - if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
- stream_size != (int)(sizeof(z_stream))) - 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; if (strm == Z_NULL) return Z_STREAM_ERROR;
strm->msg = Z_NULL; /* in case we return an error */ strm->msg = Z_NULL; /* in case we return an error */
if (strm->zalloc == (alloc_func)0) {
Index: zlib-1.2.11/deflate.c Index: zlib-1.2.11/deflate.c
=================================================================== ===================================================================
--- zlib-1.2.11.orig/deflate.c --- zlib-1.2.11.orig/deflate.c
+++ zlib-1.2.11/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; deflate_state *s;
int wrap = 1; int wrap = 1;
@ -43,7 +43,8 @@ Index: zlib-1.2.11/deflate.c
- if (version == Z_NULL || version[0] != my_version[0] || - if (version == Z_NULL || version[0] != my_version[0] ||
- stream_size != sizeof(z_stream)) { - 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; if (strm == Z_NULL) return Z_STREAM_ERROR;
strm->msg = Z_NULL;

6
zlib.changes
View File

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