Hello community, here is the log from the commit of package zlib for openSUSE:Factory checked in at 2011-11-21 12:51:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zlib (Old) and /work/SRC/openSUSE:Factory/.zlib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zlib", Maintainer is "MVyskocil@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/zlib/zlib.changes 2011-11-14 13:51:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes 2011-11-21 12:52:07.000000000 +0100 @@ -1,0 +2,28 @@ +Sat Nov 19 20:00:11 UTC 2011 - crrodriguez@opensuse.org + +- Do not include the codename in soversion. + +------------------------------------------------------------------- +Sat Nov 19 18:42:12 UTC 2011 - crrodriguez@opensuse.org + +- This is zlib 1.2.5.2 codename "motley" +- Fix bug and add consts in contrib/puff [Oberhumer] +- Fix static-only-build install in Makefile.in +- Add libz.a dependency to shared in Makefile.in for parallel builds +- Spell out "number" (instead of "nb") in zlib.h for total_in, total_out +- Fix bug in zlib.h for _FILE_OFFSET_BITS set and _LARGEFILE64_SOURCE not +- Add comment in zlib.h that adler32_combine with len2 < 0 makes no sense +- Make NO_DIVIDE option in adler32.c much faster (thanks to John Reiser) +- Fix zlib.h LFS support when Z_PREFIX used +- Avoid deflate sensitivity to volatile input data +- Avoid division in adler32_combine for NO_DIVIDE +- Clarify the use of Z_FINISH with deflateBound() amount of space +- Use u4 type for crc_table to avoid conversion warnings +- Apply casts in zlib.h to avoid conversion warnings +- Add OF to prototypes for adler32_combine_ and crc32_combine_ [Miller] +- Improve inflateSync() documentation to note indeterminancy +- Add deflatePending() function to return the amount of pending output +- Check that pointers fit in ints when gzprint() compiled old style +- Add dummy name before $(SHAREDLIBV) in Makefile [Bar-Lev, Bowler] + +------------------------------------------------------------------- Old: ---- zlib-1.2.5-gzopen-null-check.patch zlib-1.2.5_git201105272030.tar.bz2 zlib-lfs.patch zlib-parallel.patch New: ---- zlib-1.2.5.2_git201109121534.tar.bz2 zlib-no-sslibsuffix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zlib.spec ++++++ --- /var/tmp/diff_new_pack.Ypd2uw/_old 2011-11-21 12:52:12.000000000 +0100 +++ /var/tmp/diff_new_pack.Ypd2uw/_new 2011-11-21 12:52:12.000000000 +0100 @@ -27,24 +27,19 @@ Obsoletes: zlib-64bit %endif # -Version: 1.2.5_git201105272030 +Version: 1.2.5.2_git201109121534 Release: 17 Summary: Data Compression Library Url: http://www.zlib.net/ -# git://github.com/kaffeemonster/zlib_adler32_vec.git +# git://github.com/kaffeemonster/zlib.git (branch adler32_vec) Source: zlib-%{version}.tar.bz2 Source1: LICENSE Source2: baselibs.conf # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches Patch0: zlib-1.2.2-format.patch -# PATCH-FIX-UPSTREAM zlib-lfs.patch dimstar@opensuse.org -- Properly define large file support. Patch taken from gentoo -Patch1: zlib-lfs.patch -# PATCH-FIX-JENGELH-PARALLEL-MAKE zlib-parallel.patch meissner@novell.com -- shared library links with libz.a -Patch2: zlib-parallel.patch -# PATCH-FIX-UPSTREAM: bnc#679345 --return NULL checks from 1.2.3 removed by upstream -Patch3: zlib-1.2.5-gzopen-null-check.patch Patch4: zlib-adler-target-attr.patch Patch5: zlib-ocloexec.patch +Patch6: zlib-no-sslibsuffix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkgconfig @@ -87,11 +82,9 @@ %prep %setup -q %patch0 -%patch1 -%patch2 -p1 -%patch3 -p1 %patch4 -p1 %patch5 +%patch6 %build export LDFLAGS="-Wl,-z,relro,-z,now" ++++++ zlib-1.2.2-format.patch ++++++ --- /var/tmp/diff_new_pack.Ypd2uw/_old 2011-11-21 12:52:12.000000000 +0100 +++ /var/tmp/diff_new_pack.Ypd2uw/_new 2011-11-21 12:52:12.000000000 +0100 @@ -1,17 +1,32 @@ -Index: zlib.h -=================================================================== --- zlib.h.orig +++ zlib.h -@@ -1256,7 +1256,11 @@ ZEXTERN int ZEXPORT gzwrite OF((gzFile f +@@ -696,7 +696,7 @@ ZEXTERN uLong ZEXPORT deflateBound OF((z + be larger than the value returned by deflateBound() if flush options other + than Z_FINISH or Z_NO_FLUSH are used. + */ +- ++ + ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm, + unsigned *pending, + int *bits)); +@@ -706,7 +706,7 @@ ZEXTERN int ZEXPORT deflatePending OF((z + provided would be due to the available output space having being consumed. + The number of bits of output not provided are between 0 and 7, where they + await more bits to join them in order to fill out a full byte. +- ++ + deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. + */ +@@ -1280,7 +1280,10 @@ ZEXTERN int ZEXPORT gzwrite OF((gzFile f error. */ --ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...)); -+ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...)) -+#ifdef __GNUC__ -+ __attribute__((__format__(__printf__,2,3))) -+#endif -+; +-ZEXTERN int ZEXPORTVA gzprintf ON((gzFile file, const char *format, ...)); ++ZEXTERN ++__attribute__((__format__(__printf__,2,3))) ++int ZEXPORTVA gzprintf ON((gzFile file, const char *format, ...)); ++ /* Converts, formats, and writes the arguments to the compressed file under control of the format string, as in fprintf. gzprintf returns the number of ++++++ zlib-1.2.5_git201105272030.tar.bz2 -> zlib-1.2.5.2_git201109121534.tar.bz2 ++++++ ++++ 5007 lines of diff (skipped) ++++++ zlib-no-sslibsuffix.patch ++++++ --- zlib.h.orig +++ zlib.h @@ -37,7 +37,7 @@ extern "C" { #endif -#define ZLIB_VERSION "1.2.5.2-motley" +#define ZLIB_VERSION "1.2.5.2" #define ZLIB_VERNUM 0x1252 #define ZLIB_VER_MAJOR 1 #define ZLIB_VER_MINOR 2 ++++++ zlib-ocloexec.patch ++++++ --- /var/tmp/diff_new_pack.Ypd2uw/_old 2011-11-21 12:52:12.000000000 +0100 +++ /var/tmp/diff_new_pack.Ypd2uw/_new 2011-11-21 12:52:12.000000000 +0100 @@ -1,6 +1,6 @@ --- gzlib.c.orig +++ gzlib.c -@@ -167,6 +167,7 @@ local gzFile gz_open(path, fd, mode) +@@ -168,6 +168,7 @@ local gzFile gz_open(path, fd, mode) #ifdef O_BINARY O_BINARY | #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org