From 1c3af89309eddf0dcf24837ee1480d528939251c132f76715e113640bf8dcfaf Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 26 Nov 2009 23:54:06 +0000 Subject: [PATCH] Accepting request 25075 from Archiving Copy from Archiving/zlib based on submit request 25075 from user msmeissn OBS-URL: https://build.opensuse.org/request/show/25075 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zlib?expand=0&rev=13 --- zlib-1.2.1-CFLAGS.dif | 10 ++- zlib-1.2.1-make-test.patch | 10 ++- zlib-1.2.1-vsnprintf.patch | 10 ++- zlib-1.2.2-format.patch | 8 +- zlib-1.2.3-686.patch | 16 ++-- zlib-1.2.3-visibility-support.patch | 14 +-- zlib.changes | 5 ++ zlib.spec | 133 ++-------------------------- 8 files changed, 52 insertions(+), 154 deletions(-) diff --git a/zlib-1.2.1-CFLAGS.dif b/zlib-1.2.1-CFLAGS.dif index f0975b8..39888f3 100644 --- a/zlib-1.2.1-CFLAGS.dif +++ b/zlib-1.2.1-CFLAGS.dif @@ -1,6 +1,8 @@ ---- configure -+++ configure 2003/11/21 14:06:46 -@@ -69,7 +69,7 @@ +Index: configure +=================================================================== +--- configure.orig 2005-07-11 22:11:57.000000000 +0200 ++++ configure 2009-11-24 17:22:26.143484000 +0100 +@@ -73,7 +73,7 @@ esac if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then CC="$cc" @@ -8,4 +10,4 @@ + SFLAGS="-fPIC "${CFLAGS-"-O3"} CFLAGS="$cflags" case `(uname -s || echo unknown) 2>/dev/null` in - Linux | linux) LDSHARED=${LDSHARED-"gcc -shared -Wl,-soname,libz.so.1"};; + Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};; diff --git a/zlib-1.2.1-make-test.patch b/zlib-1.2.1-make-test.patch index c11355f..a3b8954 100644 --- a/zlib-1.2.1-make-test.patch +++ b/zlib-1.2.1-make-test.patch @@ -1,7 +1,9 @@ ---- zlib-1.1.4/Makefile.in.jj Mon Mar 11 08:58:30 2002 -+++ zlib-1.1.4/Makefile.in Fri Apr 26 06:53:12 2002 -@@ -62,13 +62,16 @@ all: example minigzip - +Index: Makefile.in +=================================================================== +--- Makefile.in.orig 2005-07-18 04:25:21.000000000 +0200 ++++ Makefile.in 2009-11-24 17:22:25.561564000 +0100 +@@ -59,13 +59,16 @@ all: example$(EXE) minigzip$(EXE) + check: test test: all @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ - echo hello world | ./minigzip | ./minigzip -d || \ diff --git a/zlib-1.2.1-vsnprintf.patch b/zlib-1.2.1-vsnprintf.patch index 379ce86..8c3ac96 100644 --- a/zlib-1.2.1-vsnprintf.patch +++ b/zlib-1.2.1-vsnprintf.patch @@ -1,6 +1,8 @@ ---- gzio.c -+++ gzio.c -@@ -606,16 +606,19 @@ +Index: gzio.c +=================================================================== +--- gzio.c.orig 2005-07-11 22:31:48.000000000 +0200 ++++ gzio.c 2009-11-24 17:22:25.927568000 +0100 +@@ -610,16 +610,19 @@ int ZEXPORTVA gzprintf (gzFile file, con va_start(va, format); #ifdef NO_vsnprintf # ifdef HAS_vsprintf_void @@ -20,7 +22,7 @@ (void)vsnprintf(buf, sizeof(buf), format, va); va_end(va); len = strlen(buf); -@@ -643,16 +646,19 @@ +@@ -647,16 +650,19 @@ int ZEXPORTVA gzprintf (file, format, a1 buf[sizeof(buf) - 1] = 0; #ifdef NO_snprintf # ifdef HAS_sprintf_void diff --git a/zlib-1.2.2-format.patch b/zlib-1.2.2-format.patch index b34755c..44ef873 100644 --- a/zlib-1.2.2-format.patch +++ b/zlib-1.2.2-format.patch @@ -1,6 +1,8 @@ ---- zlib-1.2.2/zlib.h.xx 2005-02-23 12:52:02.889385975 +0100 -+++ zlib-1.2.2/zlib.h 2005-02-23 12:55:14.227599948 +0100 -@@ -986,7 +986,12 @@ +Index: zlib.h +=================================================================== +--- zlib.h.orig 2005-07-18 04:26:49.000000000 +0200 ++++ zlib.h 2009-11-24 17:22:26.357480000 +0100 +@@ -1119,7 +1119,12 @@ ZEXTERN int ZEXPORT gzwrite OF((gzFil (0 in case of error). */ diff --git a/zlib-1.2.3-686.patch b/zlib-1.2.3-686.patch index d0a20af..c4a2ae5 100644 --- a/zlib-1.2.3-686.patch +++ b/zlib-1.2.3-686.patch @@ -1,6 +1,7 @@ -diff -uNr zlib-1.2.3/contrib/asm686/match.S zlib-1.2.3-686/contrib/asm686/match.S ---- zlib-1.2.3/contrib/asm686/match.S 2005-07-12 11:08:20.000000000 -0700 -+++ zlib-1.2.3-686/contrib/asm686/match.S 2007-04-10 22:48:15.000000000 -0700 +Index: contrib/asm686/match.S +=================================================================== +--- contrib/asm686/match.S.orig 2005-07-12 20:08:20.000000000 +0200 ++++ contrib/asm686/match.S 2009-11-24 17:22:26.833478000 +0100 @@ -1,9 +1,23 @@ -/* match.s -- Pentium-Pro-optimized version of longest_match() - * Written for zlib 1.1.2 @@ -30,10 +31,11 @@ diff -uNr zlib-1.2.3/contrib/asm686/match.S zlib-1.2.3-686/contrib/asm686/match. */ #ifndef NO_UNDERLINE -diff -uNr zlib-1.2.3/contrib/asm686/README.686 zlib-1.2.3-686/contrib/asm686/README.686 ---- zlib-1.2.3/contrib/asm686/README.686 1998-06-19 07:47:27.000000000 -0700 -+++ zlib-1.2.3-686/contrib/asm686/README.686 2007-04-10 22:33:54.000000000 -0700 -@@ -32,3 +32,20 @@ +Index: contrib/asm686/README.686 +=================================================================== +--- contrib/asm686/README.686.orig 1998-06-19 16:47:27.000000000 +0200 ++++ contrib/asm686/README.686 2009-11-24 17:22:26.838475000 +0100 +@@ -32,3 +32,20 @@ then do: CFLAGS="-O3 -DASMV" ./configure make OBJA=match.o diff --git a/zlib-1.2.3-visibility-support.patch b/zlib-1.2.3-visibility-support.patch index 7a98288..e16caf9 100644 --- a/zlib-1.2.3-visibility-support.patch +++ b/zlib-1.2.3-visibility-support.patch @@ -5,9 +5,11 @@ Patch by Mike Frysinger http://bugs.gentoo.org/32764 http://bugs.gentoo.org/149929 ---- zlib-1.2.3/configure -+++ zlib-1.2.3/configure -@@ -209,6 +209,20 @@ +Index: configure +=================================================================== +--- configure.orig 2009-11-24 17:22:26.143484000 +0100 ++++ configure 2009-11-24 17:22:26.578476000 +0100 +@@ -204,6 +204,20 @@ else fi cat > $test.c < #include #include "zconf.h" ---- zlib-1.2.3/zconf.in.h -+++ zlib-1.2.3/zconf.in.h +Index: zconf.in.h +=================================================================== +--- zconf.in.h.orig 2005-05-28 08:40:35.000000000 +0200 ++++ zconf.in.h 2009-11-24 17:22:26.582476000 +0100 @@ -244,7 +244,11 @@ #endif diff --git a/zlib.changes b/zlib.changes index c01463f..7fcba2b 100644 --- a/zlib.changes +++ b/zlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 24 16:23:32 UTC 2009 - crrodriguez@opensuse.org + +- refresh patches with fuzz=0 + ------------------------------------------------------------------- Fri Apr 24 10:33:06 CEST 2009 - mseben@suse.cz diff --git a/zlib.spec b/zlib.spec index 455323c..98dc663 100644 --- a/zlib.spec +++ b/zlib.spec @@ -19,7 +19,7 @@ Name: zlib -License: zlib/libpng License; zlib license. See http://zlib.net/zlib_license.html +License: Zlib ; zlib license. See http://zlib.net/zlib_license.html Group: System/Libraries Provides: libz Obsoletes: libz @@ -30,7 +30,7 @@ Obsoletes: zlib-64bit %endif # Version: 1.2.3 -Release: 139 +Release: 140 Summary: Data Compression Library Source: zlib-%{version}.tar.bz2 Source1: LICENSE @@ -93,12 +93,12 @@ libraries. %prep %setup -q -%patch -p1 +%patch %patch1 %patch2 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%patch3 +%patch4 +%patch5 %build CFLAGS="$RPM_OPT_FLAGS" ./configure --shared @@ -149,124 +149,3 @@ rm -rf %{buildroot} %{_libdir}/libz.a %changelog -* Fri Apr 24 2009 mseben@suse.cz -- added LICENSE file, for GPL licensed contrib files, however - they are not used to build our zlib library (bnc#490107) -- added zlib-1.2.3-686.patch - update license text (bnc#490107) -* Sat Mar 21 2009 crrodriguez@suse.de -- there is one valid use case of static zlib in "qemu" package - split a -devel-static subpackage, please do not BuildRequire - this package unless you are 100%% sure you need it, if in doubt - mail either the security team or me. -* Fri Feb 27 2009 crrodriguez@suse.de -- add patch from gentoo that makes zlib to only export - its public API using GCC visibility features, this will - of course break wrong code that uses private symbols -- exclude static zlib, at least temporarily, in order to clearly know - what is using it. -* Wed Jan 07 2009 olh@suse.de -- obsolete old -XXbit packages (bnc#437293) -* Thu Apr 10 2008 ro@suse.de -- added baselibs.conf file to build xxbit packages - for multilib support -* Sat Jan 12 2008 crrodriguez@suse.de -- fix library-without-ldconfig-* errors -- do not delete buildroot on install section -- run make test in the check section. -* Thu May 03 2007 rguenther@suse.de -- move documentation files to zlib-devel package -* Wed Jan 31 2007 ro@suse.de -- remove libgz completely (obsolete long ago) -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Sat Dec 17 2005 kukuk@suse.de -- Remove unpackaged libz.so symlink -* Wed Jul 20 2005 meissner@suse.de -- Upgraded to 1.2.3. Security fix is now in mainline. -* Mon Jul 04 2005 meissner@suse.de -- fixed memory corruption problem #94926, CAN-2005-2096. -* Fri Apr 01 2005 kukuk@suse.de -- Remove movage of setting CFLAGS -* Tue Mar 29 2005 kukuk@suse.de -- Update to 1.2.2.2 -- Fix compiling with gcc 3.3 and 4.0 -* Mon Feb 28 2005 meissner@suse.de -- Use __printf__ in format attribute to avoid printf defines. -* Wed Feb 23 2005 meissner@suse.de -- supply format arguments to gzprintf(). -* Tue Feb 08 2005 ro@suse.de -- update to 1.2.2 -* Wed Aug 25 2004 ro@suse.de -- updated crash patch to version from Dmitry (#44087) -* Mon Aug 23 2004 ro@suse.de -- added fix for crash on invalid input (#44087) -* Thu Dec 04 2003 ro@suse.de -- update to 1.2.1 -* Fri Nov 21 2003 kukuk@suse.de -- Use RPM_OPT_FLAGS -- Compile with no execstack -* Mon Oct 20 2003 ro@suse.de -- don't build as root -* Mon May 12 2003 kukuk@suse.de -- Add defattr -* Mon Mar 03 2003 ro@suse.de -- do use vsnprintf -* Sun Feb 16 2003 olh@suse.de -- no absolute symlinks for libz.so -* Thu Jul 25 2002 kukuk@suse.de -- Rename to zlib -- Splitt off zlib-devel -* Fri Jul 05 2002 bk@suse.de -- enable make test -* Mon May 27 2002 ro@suse.de -- update to 1.1.4 including the previous security patch -- Returned incorrect error (Z_MEM_ERROR) on some invalid data -- Avoid accesses before window for invalid distances with inflate window - less than 32K. -- force windowBits > 8 to avoid a bug in the encoder for a window size - of 256 bytes. (A complete fix will be available in 1.1.5). -* Mon Feb 25 2002 ro@suse.de -- remove executable bits from manpage and include file -* Thu Feb 07 2002 draht@suse.de -- prevent double free() (security problem) with - zlib-1.1.3-zfree.dif -* Tue Dec 11 2001 froh@suse.de -- fixed specfile to use %%_libdir for make install for - the sake of lib64 on S/390. also updated old sparc64 %%ifarch at - this point. -* Tue Dec 04 2001 ro@suse.de -- added Provides zlib-devel for compatibility -* Tue May 01 2001 kukuk@suse.de -- Minor spec file fixes for sparc64 -* Thu Dec 07 2000 kukuk@suse.de -- Install only shared library in /%%{_lib} -* Wed Dec 06 2000 ro@suse.de -- install main lib in /%%{_lib} not /usr/%%{_lib} -* Mon Oct 02 2000 kukuk@suse.de -- Use %%{_lib} macro -* Mon Sep 25 2000 ro@suse.de -- sorted -* Wed Apr 05 2000 bk@suse.de -- fixed BuildRoot support -* Mon Apr 03 2000 bk@suse.de -- added buildroot for build with dynamically linked rpm which uses libz(s390) -* Thu Jan 20 2000 aj@suse.de -- /usr/man -> /usr/share/man -* Mon Sep 13 1999 bs@suse.de -- ran old prepare_spec on spec file to switch to new prepare_spec. -* Tue Jul 13 1999 ro@suse.de -- added zutil.h -* Thu Mar 04 1999 ro@suse.de -- moved from /usr/X11R6 to usr -- libgz is now only a link to libz -- "libgz.so.1" is provided from specfile -* Tue Aug 25 1998 ro@suse.de -- update to 1.1.3 -* Fri Mar 20 1998 ro@suse.de -- update to 1.1.2 -* Mon Mar 02 1998 ro@suse.de -- update to 1.1.1 -* Fri Feb 27 1998 ro@suse.de -- update to version 1.0.9 - created own specfile for easier maintenance - included man-pages