Accepting request 448535 from home:pluskalm
OBS-URL: https://build.opensuse.org/request/show/448535 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zlib?expand=0&rev=38
This commit is contained in:
parent
c871182653
commit
15e133c89d
20
zlib-format.patch
Normal file
20
zlib-format.patch
Normal file
@ -0,0 +1,20 @@
|
||||
From: meissner@suse.de
|
||||
Subject: supply format arguments to gzprintf().
|
||||
|
||||
Index: zlib.h
|
||||
===================================================================
|
||||
--- zlib.h.orig
|
||||
+++ zlib.h
|
||||
@@ -1463,7 +1463,11 @@ ZEXTERN z_size_t ZEXPORT gzfwrite OF((vo
|
||||
is returned, and the error state is set to Z_STREAM_ERROR.
|
||||
*/
|
||||
|
||||
-ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
|
||||
+ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...))
|
||||
+#ifdef __GNUC__
|
||||
+ __attribute__((__format__(__printf__,2,3)))
|
||||
+#endif
|
||||
+;
|
||||
/*
|
||||
Converts, formats, and writes the arguments to the compressed file under
|
||||
control of the format string, as in fprintf. gzprintf returns the number of
|
@ -17,7 +17,6 @@ Mon Jan 2 09:08:50 UTC 2017 - mpluskal@suse.com
|
||||
* zlib-bnc1003579.patch
|
||||
* zlib-bnc1003580.patch
|
||||
* zlib-bnc1013882.patch
|
||||
* zlib-format.patch
|
||||
- Drop zlib-1.2.7-improve-longest_match-performance.patch
|
||||
* not accepted by upstream for two releases
|
||||
* rebasing no longer possible
|
||||
|
@ -28,6 +28,8 @@ Source0: http://zlib.net/zlib-%{version}.tar.gz
|
||||
Source1: LICENSE
|
||||
Source2: baselibs.conf
|
||||
Source3: zlib-rpmlintrc
|
||||
#PATCH-FIX-SUSE: compiler check of varguments passed to gzprintf
|
||||
Patch1: zlib-format.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: libtool
|
||||
@ -109,6 +111,7 @@ developing applications which use minizip.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1
|
||||
|
||||
%build
|
||||
export LDFLAGS="-Wl,-z,relro,-z,now"
|
||||
|
Loading…
Reference in New Issue
Block a user