SHA256
1
0
forked from pool/zlib

- zlib-format.patch, backport missing sle11 feature back to openSUSE

bnc#831880

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zlib?expand=0&rev=21
This commit is contained in:
Michal Vyskocil 2013-07-29 12:38:12 +00:00 committed by Git OBS Bridge
parent b3d0f9e7f8
commit 77dce2c25a
3 changed files with 29 additions and 0 deletions

20
zlib-format.patch Normal file
View File

@ -0,0 +1,20 @@
From: meissner@suse.de
Subject: supply format arguments to gzprintf().
Index: zlib-1.2.7/zlib.h
===================================================================
--- zlib-1.2.7.orig/zlib.h 2012-05-03 06:12:35.000000000 +0200
+++ zlib-1.2.7/zlib.h 2012-09-27 13:12:58.187146312 +0200
@@ -1329,7 +1329,11 @@
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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jul 29 12:37:19 UTC 2013 - mvyskocil@suse.com
- zlib-format.patch, backport missing sle11 feature back to openSUSE
bnc#831880
-------------------------------------------------------------------
Sat May 11 11:51:40 UTC 2013 - idonmez@suse.com

View File

@ -31,6 +31,8 @@ Source2: baselibs.conf
Source3: zlib-rpmlintrc
#PATCH-FIX-SUSE: fate#314093, sent upstream by IBM
Patch0: zlib-1.2.7-improve-longest_match-performance.patch
#PATCH-FIX-SUSE: compiler check of varguments passed to gzprintf
Patch1: zlib-format.patch
BuildRequires: pkgconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# bug437293
@ -95,6 +97,7 @@ libraries.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
export LDFLAGS="-Wl,-z,relro,-z,now"