subject:"commit zlib for openSUSE\:Factory"

commit zlib for openSUSE:Factory

2020-09-23 Thread root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2020-09-23 18:39:17

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new.4249 (New)


Package is "zlib"

Wed Sep 23 18:39:17 2020 rev:79 rq:834969 version:1.2.11

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2020-08-31 
16:47:49.420283833 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new.4249/zlib.changes  2020-09-23 
18:39:43.673284146 +0200
@@ -1,0 +2,5 @@
+Wed Sep 16 15:05:04 UTC 2020 - Stephan Kulow 
+
+- Provide a testsuite subpackage to run post-build validation
+
+---



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.vMQnbJ/_old  2020-09-23 18:39:45.433285765 +0200
+++ /var/tmp/diff_new_pack.vMQnbJ/_new  2020-09-23 18:39:45.437285769 +0200
@@ -117,6 +117,15 @@
 This package contains the libraries and header files needed for
 developing applications which use minizip.
 
+%package testsuite
+Summary:Provide the test examples to reproduce test suite
+Requires:   libz1 = %{version}
+
+%description testsuite
+To run the testsuite, execute %{_libexecdir}/%{name}/testsuite
+
+It should exit 0
+
 %prep
 %setup -q
 %patch0
@@ -185,6 +194,8 @@
 mkdir -p %{buildroot}%{_docdir}/%{name}
 cp -r examples/ %{buildroot}%{_docdir}/%{name}/
 
+install -D examplesh %{buildroot}%{_libexecdir}/%{name}/testsuite
+
 # Install minizip
 cd contrib/minizip
 %make_install
@@ -225,4 +236,8 @@
 %files devel-static
 %{_libdir}/libz.a
 
+%files testsuite
+%dir %{_libexecdir}/%{name}
+%{_libexecdir}/%{name}/testsuite
+
 %changelog

commit zlib for openSUSE:Factory

2020-08-31 Thread root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2020-08-31 16:47:31

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new.3399 (New)


Package is "zlib"

Mon Aug 31 16:47:31 2020 rev:78 rq:830216 version:1.2.11

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2020-08-17 
11:59:19.166491605 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new.3399/zlib.changes  2020-08-31 
16:47:49.420283833 +0200
@@ -1,0 +2,12 @@
+Fri Aug 28 07:58:23 UTC 2020 - Tomáš Chvátal 
+
+- Add patch to fix compression level switching
+  bsc#1175811 bsc#1175830 bsc#1175831
+  * zlib-compression-switching.patch
+
+---
+Thu Aug 27 06:55:29 UTC 2020 - Tomáš Chvátal 
+
+- Set -DDFLTCC_LEVEL_MASK=0x7e on s390/s390x jsc#13776
+
+---

New:

  zlib-compression-switching.patch



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.tRQDek/_old  2020-08-31 16:47:50.388284302 +0200
+++ /var/tmp/diff_new_pack.tRQDek/_new  2020-08-31 16:47:50.392284304 +0200
@@ -43,6 +43,7 @@
 Patch5: zlib-no-version-check.patch
 Patch6: bsc1174736-DFLTCC_LEVEL_MASK-set-to-0x1ff.patch
 Patch7: bsc1174551-fxi-imcomplete-raw-streams.patch
+Patch8: zlib-compression-switching.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -126,12 +127,17 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 cp %{SOURCE4} .
 
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
 export LDFLAGS="-Wl,-z,relro,-z,now"
-export CFLAGS="%{optflags}"
+%ifarch s390x s390
+  export CFLAGS="%{optflags} -DDFLTCC_LEVEL_MASK=0x7e"
+%else
+  export CFLAGS="%{optflags}"
+%endif
 # For sure not autotools build
 CC="cc" ./configure \
 --shared \


++ zlib-compression-switching.patch ++
Index: zlib-1.2.11/configure
===
--- zlib-1.2.11.orig/configure
+++ zlib-1.2.11/configure
@@ -923,7 +923,7 @@ cat > $test.c << EOF
 #include 
 int main() { return 0; }
 EOF
-if try ${CC} ${CFLAGS} $test.c; then
+if try $CC -c $CFLAGS $test.c; then
 echo "Checking for sys/sdt.h ... Yes." | tee -a configure.log
 CFLAGS="$CFLAGS -DHAVE_SYS_SDT_H"
 SFLAGS="$SFLAGS -DHAVE_SYS_SDT_H"
Index: zlib-1.2.11/contrib/s390/dfltcc.c
===
--- zlib-1.2.11.orig/contrib/s390/dfltcc.c
+++ zlib-1.2.11/contrib/s390/dfltcc.c
@@ -350,8 +350,12 @@ int ZLIB_INTERNAL dfltcc_deflate(strm, f
 int soft_bcc;
 int no_flush;
 
-if (!dfltcc_can_deflate(strm))
+if (!dfltcc_can_deflate(strm)) {
+/* Clear history. */
+if (flush == Z_FULL_FLUSH)
+param->hl = 0;
 return 0;
+}
 
 again:
 masked_avail_in = 0;
@@ -376,7 +380,8 @@ again:
 /* Clear history. */
 if (flush == Z_FULL_FLUSH)
 param->hl = 0;
-*result = need_more;
+/* Trigger block post-processing if necessary. */
+*result = no_flush ? need_more : block_done;
 return 1;
 }
 
@@ -403,13 +408,18 @@ again:
 param->bcf = 0;
 dfltcc_state->block_threshold =
 strm->total_in + dfltcc_state->block_size;
-if (strm->avail_out == 0) {
-*result = need_more;
-return 1;
-}
 }
 }
 
+/* No space for compressed data. If we proceed, dfltcc_cmpr() will return
+ * DFLTCC_CC_OP1_TOO_SHORT without buffering header bits, but we will still
+ * set BCF=1, which is wrong. Avoid complications and return early.
+ */
+if (strm->avail_out == 0) {
+*result = need_more;
+return 1;
+}
+
 /* The caller gave us too much data. Pass only one block worth of
  * uncompressed data to DFLTCC and mask the rest, so that on the next
  * iteration we start a new block.
@@ -679,10 +689,15 @@ local inline int is_dfltcc_enabled(void)
  * compiling with -m31, gcc defaults to ESA mode, however, since the kernel
  * is 64-bit, it's always z/Architecture mode at runtime.
  */
-__asm__ volatile(".machinemode push\n"
+__asm__ volatile(
+#ifndef __clang__
+ ".machinemode push\n"
  ".machinemode zarch\n"
+#endif
  "stfle %[facilities]\n"
+#ifndef __clang__
  ".machinemode pop\n"
+#endif
  : [facilities] "=Q" (facilities)
  , [r0] "+r" (r0)
  :
@@ -835,6 +850,28 @@ int ZLIB_INTERNAL

commit zlib for openSUSE:Factory

2020-08-17 Thread root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2020-08-17 11:58:55

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new.3399 (New)


Package is "zlib"

Mon Aug 17 11:58:55 2020 rev:77 rq:824669 version:1.2.11

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2020-04-27 
23:28:01.594310891 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new.3399/zlib.changes  2020-08-17 
11:59:19.166491605 +0200
@@ -1,0 +2,8 @@
+Thu Aug  6 08:36:48 UTC 2020 - Lidong Zhong 
+
+- Permit a deflateParams() parameter change as soon as possible(bsc#1174736)
+* bsc1174736-DFLTCC_LEVEL_MASK-set-to-0x1ff.patch
+  Fix DFLTCC not flushing EOBS when creating raw streams(bsc#1174551)
+* bsc1174551-fxi-imcomplete-raw-streams.patch
+
+---

New:

  bsc1174551-fxi-imcomplete-raw-streams.patch
  bsc1174736-DFLTCC_LEVEL_MASK-set-to-0x1ff.patch



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.aCqRgK/_old  2020-08-17 11:59:23.522494033 +0200
+++ /var/tmp/diff_new_pack.aCqRgK/_new  2020-08-17 11:59:23.526494034 +0200
@@ -41,6 +41,8 @@
 #PATCH-FIX-SUSE do not check exact version match as the lib can be updated
 #   we should simply rely on soname versioning to protect us
 Patch5: zlib-no-version-check.patch
+Patch6: bsc1174736-DFLTCC_LEVEL_MASK-set-to-0x1ff.patch
+Patch7: bsc1174551-fxi-imcomplete-raw-streams.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -122,6 +124,8 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 cp %{SOURCE4} .
 
 %build

++ bsc1174551-fxi-imcomplete-raw-streams.patch ++
diff --git a/deflate.c b/deflate.c
index 3c302bc..1ab1635 100644
--- a/deflate.c
+++ b/deflate.c
@@ -1110,7 +1110,6 @@ int ZEXPORT deflate (strm, flush)
 }
 
 if (flush != Z_FINISH) return Z_OK;
-if (s->wrap <= 0) return Z_STREAM_END;
 
 /* Write the trailer */
 #ifdef GZIP
@@ -1126,7 +1125,7 @@ int ZEXPORT deflate (strm, flush)
 }
 else
 #endif
-{
+if (s->wrap == 1) {
 putShortMSB(s, (uInt)(strm->adler >> 16));
 putShortMSB(s, (uInt)(strm->adler & 0x));
 }
@@ -1135,7 +1134,11 @@ int ZEXPORT deflate (strm, flush)
  * to flush the rest.
  */
 if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
-return s->pending != 0 ? Z_OK : Z_STREAM_END;
+if (s->pending == 0) {
+Assert(s->bi_valid == 0, "bi_buf not flushed");
+return Z_STREAM_END;
+}
+return Z_OK;
 }
 
 /* = */
++ bsc1174736-DFLTCC_LEVEL_MASK-set-to-0x1ff.patch ++
Index: zlib-1.2.11/deflate.c
===
--- zlib-1.2.11.orig/deflate.c
+++ zlib-1.2.11/deflate.c
@@ -504,7 +504,7 @@ int ZEXPORT deflateResetKeep (strm)
 s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
 #endif
 adler32(0L, Z_NULL, 0);
-s->last_flush = Z_NO_FLUSH;
+s->last_flush = -2;
 
 _tr_init(s);
 
@@ -601,13 +601,13 @@ int ZEXPORT deflateParams(strm, level, s
 func = configuration_table[s->level].func;
 
 if ((strategy != s->strategy || func != configuration_table[level].func ||
- hook_flush != Z_NO_FLUSH) && s->high_water) {
+ hook_flush != Z_NO_FLUSH) && s->last_flush != -2) {
 /* Flush the last buffer: */
 int err = deflate(strm, RANK(hook_flush) > RANK(Z_BLOCK) ?
   hook_flush : Z_BLOCK);
 if (err == Z_STREAM_ERROR)
 return err;
-if (strm->avail_out == 0)
+if (strm->avail_in || (s->strstart - s->block_start) + s->lookahead)
 return Z_BUF_ERROR;
 }
 if (s->level != level) {
Index: zlib-1.2.11/zlib.h
===
--- zlib-1.2.11.orig/zlib.h
+++ zlib-1.2.11/zlib.h
@@ -712,11 +712,12 @@ ZEXTERN int ZEXPORT deflateParams OF((z_
used to switch between compression and straight copy of the input data, or
to switch to a different kind of input data requiring a different strategy.
If the compression approach (which is a function of the level) or the
-   strategy is changed, and if any input has been consumed in a previous
-   deflate() call, then the input available so far is compressed with the old
-   level and strategy using deflate(strm, Z_BLOCK).  There are three approaches
-   for the compression levels 0, 1..3, and 4..9 respectively.  The new level
-   and strategy will take effect at the next call of deflate().
+   strategy is changed,

commit zlib for openSUSE:Factory

2020-04-27 Thread root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2020-04-27 23:27:55

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new.2738 (New)


Package is "zlib"

Mon Apr 27 23:27:55 2020 rev:76 rq:796443 version:1.2.11

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2019-11-03 
10:47:32.574217888 +0100
+++ /work/SRC/openSUSE:Factory/.zlib.new.2738/zlib.changes  2020-04-27 
23:28:01.594310891 +0200
@@ -1,0 +2,6 @@
+Thu Apr 23 08:17:19 UTC 2020 - Tomáš Chvátal 
+
+- Update 410.patch to contain latest fixes from IBM bsc#1166260
+  * The build behaviour changed
+
+---



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.EweMME/_old  2020-04-27 23:28:02.394312453 +0200
+++ /var/tmp/diff_new_pack.EweMME/_new  2020-04-27 23:28:02.398312461 +0200
@@ -21,7 +21,6 @@
 Release:0
 Summary:Library implementing the DEFLATE compression algorithm
 License:Zlib
-Group:  Development/Libraries/C and C++
 URL:http://www.zlib.net/
 Source0:http://zlib.net/zlib-%{version}.tar.gz
 Source1:http://zlib.net/zlib-%{version}.tar.gz.asc
@@ -55,7 +54,6 @@
 
 %package -n libz1
 Summary:Library implementing the DEFLATE compression algorithm
-Group:  System/Libraries
 Provides:   %{name} = %{version}-%{release}
 Obsoletes:  %{name} < %{version}-%{release}
 
@@ -67,7 +65,6 @@
 
 %package devel
 Summary:Development files for zlib, a data compression library
-Group:  Development/Languages/C and C++
 Requires:   glibc-devel
 Requires:   libz1 = %{version}
 
@@ -89,7 +86,6 @@
 
 %package devel-static
 Summary:Static library for zlib
-Group:  Development/Languages/C and C++
 Requires:   %{name}-devel = %{version}
 Provides:   %{name}-devel:%{_libdir}/libz.a
 
@@ -104,14 +100,12 @@
 
 %package -n libminizip1
 Summary:Library for manipulation with .zip archives
-Group:  System/Libraries
 
 %description -n libminizip1
 Minizip is a library for manipulation with files from .zip archives.
 
 %package -n minizip-devel
 Summary:Development files for the minizip library
-Group:  Development/Languages/C and C++
 Requires:   %{name}-devel = %{version}
 Requires:   libminizip1 = %{version}
 Requires:   pkgconfig
@@ -133,26 +127,24 @@
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
 export LDFLAGS="-Wl,-z,relro,-z,now"
-%ifarch s390x s390
-export CFLAGS="%{optflags} -DDFLTCC"
-%define addopts OBJA=dfltcc.o PIC_OBJA=dfltcc.lo
-%else
 export CFLAGS="%{optflags}"
-%define addopts %{nil}
-%endif
 # For sure not autotools build
 CC="cc" ./configure \
 --shared \
 --prefix=%{_prefix} \
---libdir=/%{_lib}
+--libdir=/%{_lib} \
+%ifarch s390x s390
+--dfltcc \
+%endif
+%{nil}
 
 %if %{do_profiling}
-  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}" 
%{addopts}
+  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}"
   make check %{?_smp_mflags}
   make %{?_smp_mflags} clean
-  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}" 
%{addopts}
+  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}"
 %else
-  make %{?_smp_mflags} %{addopts}
+  make %{?_smp_mflags}
 %endif
 
 # And build minizip
@@ -161,7 +153,7 @@
 %configure \
 --disable-static \
 --disable-silent-rules
-make %{?_smp_mflags} %{addopts}
+make %{?_smp_mflags}
 
 %check
 make check %{?_smp_mflags}

++ 410.patch ++
--- /var/tmp/diff_new_pack.EweMME/_old  2020-04-27 23:28:02.422312508 +0200
+++ /var/tmp/diff_new_pack.EweMME/_new  2020-04-27 23:28:02.422312508 +0200
@@ -1,9 +1,9 @@
-From 230b5152e9660eb5e5821c2dbc84ae300dfe1fb1 Mon Sep 17 00:00:00 2001
+From 79ccd96ec69d2367291568c586aeaae941d2635c Mon Sep 17 00:00:00 2001
 From: Ilya Leoshkevich 
 Date: Wed, 18 Jul 2018 13:14:07 +0200
 Subject: [PATCH] Add support for IBM Z hardware-accelerated deflate
 
-Future versions of IBM Z mainframes will provide DFLTCC instruction,
+IBM Z mainframes starting from version z15 provide DFLTCC instruction,
 which implements deflate algorithm in hardware with estimated
 compression and decompression performance orders of magnitude faster
 than the current zlib and ratio comparable with that of level 1.
@@ -11,15 +11,15 @@
 This patch adds DFLTCC support to zlib. In order to enable it, the
 following build commands should be used:
 
-$ CFLAGS=-DDFLTCC ./configure
-$ make OBJA=dfltcc.o PIC_OBJA=dfltcc.lo
+$ ./configure --dfltcc
+$ make
 
 When built like this, zlib would compress in

commit zlib for openSUSE:Factory

2019-11-03 Thread root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2019-11-03 10:47:30

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new.2990 (New)


Package is "zlib"

Sun Nov  3 10:47:30 2019 rev:75 rq:743812 version:1.2.11

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2019-10-25 
18:37:55.223658737 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new.2990/zlib.changes  2019-11-03 
10:47:32.574217888 +0100
@@ -1,0 +2,6 @@
+Tue Oct 29 10:47:18 UTC 2019 - Tomáš Chvátal 
+
+- Update the zlib-no-version-check.patch to be even more forgiving
+  with the versions on the zlib to allow updates without rebuilds
+
+---



Other differences:
--

++ zlib-no-version-check.patch ++
--- /var/tmp/diff_new_pack.jlz33E/_old  2019-11-03 10:47:33.226218673 +0100
+++ /var/tmp/diff_new_pack.jlz33E/_new  2019-11-03 10:47:33.226218673 +0100
@@ -2,35 +2,35 @@
 ===
 --- zlib-1.2.11.orig/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;
  
 -if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
 -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 ||
  windowBits < 8 || windowBits > 15)
+ return Z_STREAM_ERROR;
 Index: zlib-1.2.11/inflate.c
 ===
 --- zlib-1.2.11.orig/inflate.c
 +++ zlib-1.2.11/inflate.c
-@@ -219,8 +219,7 @@ int stream_size;
+@@ -219,9 +219,6 @@ int stream_size;
  int ret;
  struct inflate_state FAR *state;
  
 -if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
 -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;
  strm->msg = Z_NULL; /* in case we return an error */
+ if (strm->zalloc == (alloc_func)0) {
 Index: zlib-1.2.11/deflate.c
 ===
 --- zlib-1.2.11.orig/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;
  int wrap = 1;
@@ -43,7 +43,8 @@
  
 -if (version == Z_NULL || version[0] != my_version[0] ||
 -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;
+ 
+ strm->msg = Z_NULL;

commit zlib for openSUSE:Factory

2019-10-25 Thread root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2019-10-25 18:37:54

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new.2990 (New)


Package is "zlib"

Fri Oct 25 18:37:54 2019 rev:74 rq:741412 version:1.2.11

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2019-08-05 
11:17:43.486527172 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new.2990/zlib.changes  2019-10-25 
18:37:55.223658737 +0200
@@ -1,0 +2,8 @@
+Mon Oct 21 07:11:58 UTC 2019 - Tomáš Chvátal 
+
+- Add SUSE specific patch to fix bsc#1138793, we simply don't want
+  to test if the app was linked with exactly same version of zlib
+  like the one that is present on the runtime:
+  * zlib-no-version-check.patch
+
+---

New:

  zlib-no-version-check.patch



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.sElWB6/_old  2019-10-25 18:37:55.787659268 +0200
+++ /var/tmp/diff_new_pack.sElWB6/_new  2019-10-25 18:37:55.799659280 +0200
@@ -39,6 +39,9 @@
 Patch3: zlib-power8-fate325307.patch
 #PATCH-FIX-UPSTREAM https://github.com/madler/zlib/pull/410
 Patch4: 410.patch
+#PATCH-FIX-SUSE do not check exact version match as the lib can be updated
+#   we should simply rely on soname versioning to protect us
+Patch5: zlib-no-version-check.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -124,6 +127,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 cp %{SOURCE4} .
 
 %build


++ zlib-no-version-check.patch ++
Index: zlib-1.2.11/infback.c
===
--- zlib-1.2.11.orig/infback.c
+++ zlib-1.2.11/infback.c
@@ -34,8 +34,7 @@ int stream_size;
 {
 struct inflate_state FAR *state;
 
-if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-stream_size != (int)(sizeof(z_stream)))
+if (stream_size != (int)(sizeof(z_stream)))
 return Z_VERSION_ERROR;
 if (strm == Z_NULL || window == Z_NULL ||
 windowBits < 8 || windowBits > 15)
Index: zlib-1.2.11/inflate.c
===
--- zlib-1.2.11.orig/inflate.c
+++ zlib-1.2.11/inflate.c
@@ -219,8 +219,7 @@ int stream_size;
 int ret;
 struct inflate_state FAR *state;
 
-if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-stream_size != (int)(sizeof(z_stream)))
+if (stream_size != (int)(sizeof(z_stream)))
 return Z_VERSION_ERROR;
 if (strm == Z_NULL) return Z_STREAM_ERROR;
 strm->msg = Z_NULL; /* in case we return an error */
Index: zlib-1.2.11/deflate.c
===
--- zlib-1.2.11.orig/deflate.c
+++ zlib-1.2.11/deflate.c
@@ -263,15 +263,13 @@ int ZEXPORT deflateInit2_(strm, level, m
 {
 deflate_state *s;
 int wrap = 1;
-static const char my_version[] = ZLIB_VERSION;
 
 ushf *overlay;
 /* We overlay pending_buf and d_buf+l_buf. This works since the average
  * output size for (length,distance) codes is <= 24 bits.
  */
 
-if (version == Z_NULL || version[0] != my_version[0] ||
-stream_size != sizeof(z_stream)) {
+if (stream_size != sizeof(z_stream)) {
 return Z_VERSION_ERROR;
 }
 if (strm == Z_NULL) return Z_STREAM_ERROR;

commit zlib for openSUSE:Factory

2019-08-05 Thread root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2019-08-05 11:17:41

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new.4126 (New)


Package is "zlib"

Mon Aug  5 11:17:41 2019 rev:73 rq:715995 version:1.2.11

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2019-07-16 
08:28:33.463386570 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new.4126/zlib.changes  2019-08-05 
11:17:43.486527172 +0200
@@ -1,0 +2,6 @@
+Wed Jul 17 07:26:35 UTC 2019 - Tomáš Chvátal 
+
+- Update the s390 patchset bsc#1137624:
+  * 410.patch
+
+---



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.viPx5J/_old  2019-08-05 11:17:44.046526943 +0200
+++ /var/tmp/diff_new_pack.viPx5J/_new  2019-08-05 11:17:44.046526943 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package zlib
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -22,7 +22,7 @@
 Summary:Library implementing the DEFLATE compression algorithm
 License:Zlib
 Group:  Development/Libraries/C and C++
-Url:http://www.zlib.net/
+URL:http://www.zlib.net/
 Source0:http://zlib.net/zlib-%{version}.tar.gz
 Source1:http://zlib.net/zlib-%{version}.tar.gz.asc
 Source2:%{name}.keyring
@@ -124,11 +124,12 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+cp %{SOURCE4} .
 
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
 export LDFLAGS="-Wl,-z,relro,-z,now"
-%ifarch s390x
+%ifarch s390x s390
 export CFLAGS="%{optflags} -DDFLTCC"
 %define addopts OBJA=dfltcc.o PIC_OBJA=dfltcc.lo
 %else
@@ -144,7 +145,7 @@
 %if %{do_profiling}
   make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}" 
%{addopts}
   make check %{?_smp_mflags}
-  make clean
+  make %{?_smp_mflags} clean
   make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}" 
%{addopts}
 %else
   make %{?_smp_mflags} %{addopts}
@@ -189,17 +190,16 @@
 %postun -n libminizip1 -p /sbin/ldconfig
 
 %files -n libz1
-%defattr(-,root,root)
+%license LICENSE
 /%{_lib}/libz.so.1.2.*
 /%{_lib}/libz.so.1
 
 %files devel
-%defattr(-,root,root)
 %doc README ChangeLog
 %dir %{_docdir}/%{name}/
 %dir %{_docdir}/%{name}/examples
 %{_docdir}/%{name}/examples/*
-%{_mandir}/man3/zlib.3%{ext_man}
+%{_mandir}/man3/zlib.3%{?ext_man}
 %{_includedir}/zlib.h
 %{_includedir}/zconf.h
 %{_includedir}/zutil.h
@@ -207,19 +207,16 @@
 %{_libdir}/pkgconfig/zlib.pc
 
 %files -n libminizip1
-%defattr(-,root,root)
 %doc contrib/minizip/MiniZip64_info.txt contrib/minizip/MiniZip64_Changes.txt
 %{_libdir}/libminizip.so.*
 
 %files -n minizip-devel
-%defattr(-,root,root)
 %dir %{_includedir}/minizip
 %{_includedir}/minizip/*.h
 %{_libdir}/libminizip.so
 %{_libdir}/pkgconfig/minizip.pc
 
 %files devel-static
-%defattr(-,root,root)
 %{_libdir}/libz.a
 
 %changelog

++ 410.patch ++
--- /var/tmp/diff_new_pack.viPx5J/_old  2019-08-05 11:17:44.066526935 +0200
+++ /var/tmp/diff_new_pack.viPx5J/_new  2019-08-05 11:17:44.066526935 +0200
@@ -1,4 +1,4 @@
-From 305e427da7b675b9b9330f2f581c275aa44e7269 Mon Sep 17 00:00:00 2001
+From 230b5152e9660eb5e5821c2dbc84ae300dfe1fb1 Mon Sep 17 00:00:00 2001
 From: Ilya Leoshkevich 
 Date: Wed, 18 Jul 2018 13:14:07 +0200
 Subject: [PATCH] Add support for IBM Z hardware-accelerated deflate
@@ -94,7 +94,8 @@
 ---
  Makefile.in   |   8 +
  configure |  13 +
- contrib/s390/dfltcc.c | 898 ++
+ contrib/README.contrib|   4 +
+ contrib/s390/dfltcc.c | 904 ++
  contrib/s390/dfltcc.h |  55 +++
  contrib/s390/dfltcc_deflate.h |  50 ++
  deflate.c |  60 ++-
@@ -105,7 +106,7 @@
  test/infcover.c   |   2 +-
  test/minigzip.c   |   4 +
  trees.c   |  13 +-
- 13 files changed, 1155 insertions(+), 51 deletions(-)
+ 14 files changed, 1165 insertions(+), 51 deletions(-)
  create mode 100644 contrib/s390/dfltcc.c
  create mode 100644 contrib/s390/dfltcc.h
  create mode 100644 contrib/s390/dfltcc_deflate.h
@@ -153,11 +154,26 @@
  # show the results

commit zlib for openSUSE:Factory

2019-07-16 Thread root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2019-07-16 08:28:32

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new.1887 (New)


Package is "zlib"

Tue Jul 16 08:28:32 2019 rev:72 rq:714702 version:1.2.11

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2019-07-08 
15:09:30.227257510 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new.1887/zlib.changes  2019-07-16 
08:28:33.463386570 +0200
@@ -1,0 +2,7 @@
+Thu Jul 11 16:09:34 UTC 2019 - Bruce Rogers 
+
+- Tweak zlib-power8-fate325307.patch to have type of crc32_vpmsum
+  conform to usage
+  bsc#1141059
+
+---



Other differences:
--

++ zlib-power8-fate325307.patch ++
--- /var/tmp/diff_new_pack.E9nC3b/_old  2019-07-16 08:28:34.087386661 +0200
+++ /var/tmp/diff_new_pack.E9nC3b/_new  2019-07-16 08:28:34.087386661 +0200
@@ -5,6 +5,8 @@
  https://github.com/antonblanchard/crc32-vpmsum/
 
 This is the C implementation created by Rogerio Alves 
+Bruce R. - Tweaked patch to have type of crc32_vpmsum conform to usage
+(see bsc#1141059)
 ---
  power8-crc/clang_workaround.h |   69 +++
  power8-crc/crc32_constants.h  | 1206 +
@@ -1389,10 +1391,10 @@
 +#define CRC32_FUNCTION  crc32_vpmsum
 +#endif
 +
-+unsigned int CRC32_FUNCTION(unsigned int crc, const unsigned char *p,
++unsigned long CRC32_FUNCTION(unsigned long crc_l, const unsigned char *p,
 +  unsigned long len)
 +{
-+  unsigned int prealign;
++  unsigned int prealign, crc = (unsigned int)crc_l;
 +  unsigned int tail;
 +
 +  /* For zlib API */
@@ -1427,7 +1429,7 @@
 +  crc ^= 0x;
 +#endif
 +
-+  return crc;
++  return (unsigned long)crc;
 +}
 +
 +#if defined (__clang__)

commit zlib for openSUSE:Factory

2019-07-08 Thread root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2019-07-08 15:09:28

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new.4615 (New)


Package is "zlib"

Mon Jul  8 15:09:28 2019 rev:71 rq:712987 version:1.2.11

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2019-06-26 
15:59:02.479227668 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new.4615/zlib.changes  2019-07-08 
15:09:30.227257510 +0200
@@ -1,0 +2,5 @@
+Tue Jul  2 07:22:36 UTC 2019 - Martin Liška 
+
+- Use FAT LTO objects in order to provide proper static library.
+
+---



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.RjY7VK/_old  2019-07-08 15:09:31.347258584 +0200
+++ /var/tmp/diff_new_pack.RjY7VK/_new  2019-07-08 15:09:31.351258588 +0200
@@ -126,6 +126,7 @@
 %patch4 -p1
 
 %build
+%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
 export LDFLAGS="-Wl,-z,relro,-z,now"
 %ifarch s390x
 export CFLAGS="%{optflags} -DDFLTCC"

commit zlib for openSUSE:Factory

2019-06-26 Thread root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2019-06-26 15:59:01

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new.4615 (New)


Package is "zlib"

Wed Jun 26 15:59:01 2019 rev:70 rq:708284 version:1.2.11

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2019-03-25 
09:47:12.876014379 +0100
+++ /work/SRC/openSUSE:Factory/.zlib.new.4615/zlib.changes  2019-06-26 
15:59:02.479227668 +0200
@@ -1,0 +2,12 @@
+Fri Jun  7 11:24:35 UTC 2019 - Tomáš Chvátal 
+
+- Do not enable the previous patchset on s390 but just s390x
+  bsc#1137624
+
+---
+Thu Jun  6 09:43:12 UTC 2019 - Tomáš Chvátal 
+
+- Add patchset for s390 improvements jsc#SLE-5807 bsc#1136717:
+  * 410.patch
+
+---

New:

  410.patch



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.sODz7c/_old  2019-06-26 15:59:03.215228539 +0200
+++ /var/tmp/diff_new_pack.sODz7c/_new  2019-06-26 15:59:03.215228539 +0200
@@ -37,6 +37,8 @@
 Patch2: 0001-Do-not-try-to-store-negative-values-in-unsigned-int.patch
 #PATCH-FIX-UPSTREAM https://github.com/madler/zlib/pull/335
 Patch3: zlib-power8-fate325307.patch
+#PATCH-FIX-UPSTREAM https://github.com/madler/zlib/pull/410
+Patch4: 410.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -121,10 +123,17 @@
 %patch1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 export LDFLAGS="-Wl,-z,relro,-z,now"
+%ifarch s390x
+export CFLAGS="%{optflags} -DDFLTCC"
+%define addopts OBJA=dfltcc.o PIC_OBJA=dfltcc.lo
+%else
 export CFLAGS="%{optflags}"
+%define addopts %{nil}
+%endif
 # For sure not autotools build
 CC="cc" ./configure \
 --shared \
@@ -132,12 +141,12 @@
 --libdir=/%{_lib}
 
 %if %{do_profiling}
-  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}"
+  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}" 
%{addopts}
   make check %{?_smp_mflags}
   make clean
-  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}"
+  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}" 
%{addopts}
 %else
-  make %{?_smp_mflags}
+  make %{?_smp_mflags} %{addopts}
 %endif
 
 # And build minizip
@@ -146,7 +155,7 @@
 %configure \
 --disable-static \
 --disable-silent-rules
-make %{?_smp_mflags}
+make %{?_smp_mflags} %{addopts}
 
 %check
 make check %{?_smp_mflags}

++ 410.patch ++
 1682 lines (skipped)

commit zlib for openSUSE:Factory

2019-03-25 Thread root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2019-03-25 09:47:11

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new.25356 (New)


Package is "zlib"

Mon Mar 25 09:47:11 2019 rev:69 rq:686469 version:1.2.11

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2018-06-26 
10:29:49.651539627 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new.25356/zlib.changes 2019-03-25 
09:47:12.876014379 +0100
@@ -1,0 +2,6 @@
+Tue Mar 19 14:11:48 UTC 2019 - Tomáš Chvátal 
+
+- Try to safely abort if we get NULL ptr bsc#1110304 bsc#1129576:
+  * zlib-power8-fate325307.patch
+
+---



Other differences:
--

++ zlib-power8-fate325307.patch ++
 941 lines (skipped)
 between /work/SRC/openSUSE:Factory/zlib/zlib-power8-fate325307.patch
 and /work/SRC/openSUSE:Factory/.zlib.new.25356/zlib-power8-fate325307.patch

commit zlib for openSUSE:Factory

2018-06-26 Thread root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2018-06-26 10:29:44

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is "zlib"

Tue Jun 26 10:29:44 2018 rev:68 rq:618098 version:1.2.11

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2018-05-22 
16:57:40.069600809 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2018-06-26 
10:29:49.651539627 +0200
@@ -1,0 +2,6 @@
+Wed Jun 20 14:51:07 UTC 2018 - tchva...@suse.com
+
+- Add patch for fate#325307 zlib speedup on power8:
+  * zlib-power8-fate325307.patch
+
+---

New:

  zlib-power8-fate325307.patch



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.NQ7Mbv/_old  2018-06-26 10:29:50.643503194 +0200
+++ /var/tmp/diff_new_pack.NQ7Mbv/_new  2018-06-26 10:29:50.651502899 +0200
@@ -35,6 +35,8 @@
 Patch1: zlib-format.patch
 #PATCH-FIX-UPSTREAM do not store negative values in uInt
 Patch2: 0001-Do-not-try-to-store-negative-values-in-unsigned-int.patch
+#PATCH-FIX-UPSTREAM https://github.com/madler/zlib/pull/335
+Patch3: zlib-power8-fate325307.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -118,6 +120,7 @@
 %patch0
 %patch1
 %patch2 -p1
+%patch3 -p1
 
 %build
 export LDFLAGS="-Wl,-z,relro,-z,now"


++ zlib-power8-fate325307.patch ++
 2720 lines (skipped)

commit zlib for openSUSE:Factory

2018-05-22 Thread root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2018-05-22 16:57:37

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is "zlib"

Tue May 22 16:57:37 2018 rev:67 rq:607454 version:1.2.11

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2017-06-18 
13:48:01.310816314 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2018-05-22 
16:57:40.069600809 +0200
@@ -1,0 +2,6 @@
+Tue May 15 10:56:20 UTC 2018 - tchva...@suse.com
+
+- Add patch to safeguard against negative values in uInt bsc#1071321:
+  * 0001-Do-not-try-to-store-negative-values-in-unsigned-int.patch
+
+---

New:

  0001-Do-not-try-to-store-negative-values-in-unsigned-int.patch



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.uCDdRH/_old  2018-05-22 16:57:40.713577379 +0200
+++ /var/tmp/diff_new_pack.uCDdRH/_new  2018-05-22 16:57:40.717577233 +0200
@@ -33,6 +33,8 @@
 Patch0: zlib-1.2.11-optimized-s390.patch
 #PATCH-FIX-SUSE: compiler check of varguments passed to gzprintf
 Patch1: zlib-format.patch
+#PATCH-FIX-UPSTREAM do not store negative values in uInt
+Patch2: 0001-Do-not-try-to-store-negative-values-in-unsigned-int.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -115,6 +117,7 @@
 %setup -q
 %patch0
 %patch1
+%patch2 -p1
 
 %build
 export LDFLAGS="-Wl,-z,relro,-z,now"

++ 0001-Do-not-try-to-store-negative-values-in-unsigned-int.patch ++
>From bb5eec59e3ec66f6dccb79b1900aa806a1cca12e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= 
Date: Fri, 8 Dec 2017 14:59:08 +0100
Subject: [PATCH] Do not try to store negative values in unsigned int

---
 deflate.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/deflate.c b/deflate.c
index 1ec7614..1bad1eb 100644
--- a/deflate.c
+++ b/deflate.c
@@ -1536,7 +1536,10 @@ local void fill_window(s)
 
 /* Initialize the hash value now that we have some input: */
 if (s->lookahead + s->insert >= MIN_MATCH) {
-uInt str = s->strstart - s->insert;
+uInt str = 0;
+/* storing negative values to uInt is not good idea */
+if (s->strstart - s->insert > 0)
+str = s->strstart - s->insert;
 s->ins_h = s->window[str];
 UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
 #if MIN_MATCH != 3
-- 
2.15.1

commit zlib for openSUSE:Factory

2017-06-18 Thread root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2017-06-18 13:47:59

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is "zlib"

Sun Jun 18 13:47:59 2017 rev:66 rq:503255 version:1.2.11

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2017-06-05 
18:48:34.128215127 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2017-06-18 
13:48:01.310816314 +0200
@@ -1,0 +2,5 @@
+Mon Jun 12 17:35:18 UTC 2017 - kah0...@gmail.com
+
+- Added 32bit minizip support
+
+---



Other differences:
--
++ baselibs.conf ++
--- /var/tmp/diff_new_pack.dFw2MG/_old  2017-06-18 13:48:02.086707141 +0200
+++ /var/tmp/diff_new_pack.dFw2MG/_new  2017-06-18 13:48:02.090706578 +0200
@@ -7,3 +7,5 @@
   requires "libz1- = "
 zlib-devel-static
   requires "zlib-devel- = "
+libminizip1
+  targettype x86 provides "baselibs-x86:/lib/libminizip.so.1"
\ No newline at end of file

commit zlib for openSUSE:Factory

2017-06-05 Thread root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2017-06-05 18:48:32

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is "zlib"

Mon Jun  5 18:48:32 2017 rev:65 rq:500414 version:1.2.11

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2017-05-24 
16:45:29.699719361 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2017-06-05 
18:48:34.128215127 +0200
@@ -1,0 +2,6 @@
+Thu Jun  1 13:34:38 UTC 2017 - mplus...@suse.com
+
+- Add gpg signature
+- Re-enable profiling
+
+---

New:

  zlib-1.2.11.tar.gz.asc
  zlib.keyring



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.KWIRZl/_old  2017-06-05 18:48:34.904105766 +0200
+++ /var/tmp/diff_new_pack.KWIRZl/_new  2017-06-05 18:48:34.908105202 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package zlib
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
 #
 
 
-%bcond_with profiling
 Name:   zlib
 Version:1.2.11
 Release:0
@@ -25,9 +24,11 @@
 Group:  Development/Libraries/C and C++
 Url:http://www.zlib.net/
 Source0:http://zlib.net/zlib-%{version}.tar.gz
-Source1:LICENSE
-Source2:baselibs.conf
-Source3:zlib-rpmlintrc
+Source1:http://zlib.net/zlib-%{version}.tar.gz.asc
+Source2:%{name}.keyring
+Source4:LICENSE
+Source5:baselibs.conf
+Source6:zlib-rpmlintrc
 #PATCH-FIX-SUSE: fate#314093, sent upstream by IBM
 Patch0: zlib-1.2.11-optimized-s390.patch
 #PATCH-FIX-SUSE: compiler check of varguments passed to gzprintf
@@ -36,7 +37,6 @@
 BuildRequires:  automake
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
 zlib is a general-purpose lossless data-compression library,
@@ -118,7 +118,6 @@
 
 %build
 export LDFLAGS="-Wl,-z,relro,-z,now"
-
 export CFLAGS="%{optflags}"
 # For sure not autotools build
 CC="cc" ./configure \
@@ -126,16 +125,13 @@
 --prefix=%{_prefix} \
 --libdir=/%{_lib}
 
-# Marcus: breaks example64 in 32bit builds, so it's disabled by default
-%if %{with profiling}
-profiledir=$(mktemp -d)
-trap "rm -rf $profiledir" EXIT
-make CFLAGS="%{optflags} %{cflags_profile_generate}=$profiledir" 
%{?_smp_mflags}
-time make check %{?_smp_mflags}
-make %{?_smp_mflags} clean
-make CFLAGS="%{optflags} %{cflags_profile_feedback}=$profiledir" 
%{?_smp_mflags}
+%if %{do_profiling}
+  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}"
+  make check %{?_smp_mflags}
+  make clean
+  make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}"
 %else
-make %{?_smp_mflags}
+  make %{?_smp_mflags}
 %endif
 
 # And build minizip
@@ -147,11 +143,11 @@
 make %{?_smp_mflags}
 
 %check
-time make check %{?_smp_mflags}
+make check %{?_smp_mflags}
 
 %install
 mkdir -p %{buildroot}%{_libdir}
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 # Fix shared library placement/symlinks
 ln -s -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/libz.so) 
%{buildroot}%{_libdir}/libz.so
 rm -v %{buildroot}/%{_lib}/libz.so
@@ -168,15 +164,12 @@
 
 # Install minizip
 cd contrib/minizip
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %post -n libz1 -p /sbin/ldconfig
-
 %postun -n libz1 -p /sbin/ldconfig
-
 %post -n libminizip1 -p /sbin/ldconfig
-
 %postun -n libminizip1 -p /sbin/ldconfig
 
 %files -n libz1
@@ -190,7 +183,7 @@
 %dir %{_docdir}/%{name}/
 %dir %{_docdir}/%{name}/examples
 %{_docdir}/%{name}/examples/*
-%{_mandir}/man3/zlib.3.gz
+%{_mandir}/man3/zlib.3%{ext_man}
 %{_includedir}/zlib.h
 %{_includedir}/zconf.h
 %{_includedir}/zutil.h

commit zlib for openSUSE:Factory

2017-05-24 Thread root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2017-05-24 16:45:25

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is "zlib"

Wed May 24 16:45:25 2017 rev:64 rq:494524 version:1.2.11

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2016-12-17 
09:45:27.218112019 +0100
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2017-05-24 
16:45:29.699719361 +0200
@@ -1,0 +2,51 @@
+Wed May 10 13:43:08 UTC 2017 - mplus...@suse.com
+
+- Add s390 performance patch (fate#314093):
+  * zlib-1.2.11-optimized-s390.patch
+
+---
+Tue Apr  4 08:31:28 UTC 2017 - sch...@suse.de
+
+- baselibs.conf: add missing dependencies
+
+---
+Mon Jan 16 09:57:59 UTC 2017 - mplus...@suse.com
+
+- Update to version 1.2.11:
+  * Fix deflate stored bug when pulling last block from window
+  * Permit immediate deflateParams changes before any deflate input
+
+---
+Tue Jan  3 07:41:49 UTC 2017 - mplus...@suse.com
+
+- Update to version 1.2.10:
+  * Avoid warnings on snprintf() return value
+  * Fix bug in deflate_stored() for zero-length input
+  * Fix bug in gzwrite.c that produced corrupt gzip files
+  * Remove files to be installed before copying them in Makefile.in
+  * Add warnings when compiling with assembler code
+
+---
+Mon Jan  2 09:08:50 UTC 2017 - mplus...@suse.com
+
+- Update to version 1.2.9:
+  * Improve compress() and uncompress() to support large lengths
+  * Allow building zlib outside of the source directory
+  * Fix bug when level 0 used with Z_HUFFMAN or Z_RLE
+  * Fix bugs in creating a very large gzip header
+  * Add uncompress2() function, which returns the input size used
+  * Dramatically speed up deflation for level 0 (storing)
+  * Add gzfread() and gzfwrite(), duplicating the interfaces of fread() and 
fwrite()
+  * Add crc32_z() and adler32_z() functions with size_t lengths
+  * Many portability improvements
+- Drop patches included in upstream:
+  * zlib-bnc1003577.patch
+  * zlib-bnc1003579-part2.patch
+  * zlib-bnc1003579.patch
+  * zlib-bnc1003580.patch
+  * zlib-bnc1013882.patch
+- Drop zlib-1.2.7-improve-longest_match-performance.patch
+  * not accepted by upstream for two releases
+  * rebasing no longer possible
+
+---

Old:

  zlib-1.2.7-improve-longest_match-performance.patch
  zlib-1.2.8.tar.gz
  zlib-bnc1003577.patch
  zlib-bnc1003579-part2.patch
  zlib-bnc1003579.patch
  zlib-bnc1003580.patch
  zlib-bnc1013882.patch

New:

  zlib-1.2.11-optimized-s390.patch
  zlib-1.2.11.tar.gz



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.PonTFY/_old  2017-05-24 16:45:32.651303840 +0200
+++ /var/tmp/diff_new_pack.PonTFY/_new  2017-05-24 16:45:32.655303277 +0200
@@ -18,7 +18,7 @@
 
 %bcond_with profiling
 Name:   zlib
-Version:1.2.8
+Version:1.2.11
 Release:0
 Summary:Library implementing the DEFLATE compression algorithm
 License:Zlib
@@ -29,15 +29,9 @@
 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
+Patch0: zlib-1.2.11-optimized-s390.patch
 #PATCH-FIX-SUSE: compiler check of varguments passed to gzprintf
 Patch1: zlib-format.patch
-# PATCH-FIX-UPSTREAM: security fixes from upstream git
-Patch2: zlib-bnc1003577.patch
-Patch3: zlib-bnc1003579-part2.patch
-Patch4: zlib-bnc1003579.patch
-Patch5: zlib-bnc1003580.patch
-Patch6: zlib-bnc1013882.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -119,13 +113,8 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch0
+%patch1
 
 %build
 export LDFLAGS="-Wl,-z,relro,-z,now"

++ baselibs.conf ++
--- /var/tmp/diff_new_pack.PonTFY/_old  2017-05-24 16:45:32.703296520 +0200
+++ /var/tmp/diff_new_pack.PonTFY/_new  2017-05-24 16:45:32.707295958 +0200
@@ -3,4 +3,7 @@
   provides "zlib- = "
   obsoletes "zlib- <= 1.2.8"
 zlib-devel
+  requires "glibc-devel-"
+  requires "libz1- = "
 zlib-devel-static
+  requires "zlib-devel- = "

++ zlib-1.2.11-optimized-s390.patch ++
Index: deflate.c
===
--- deflate.c.orig
+++ deflate.c
@@ -1233,15 +1233,16 @@

commit zlib for openSUSE:Factory

2016-12-07 Thread h_root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2016-12-08 00:27:25

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is "zlib"

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2015-10-06 
13:22:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2016-12-08 
00:27:27.0 +0100
@@ -1,0 +2,9 @@
+Sun Dec  4 12:47:51 UTC 2016 - tchva...@suse.com
+
+- Include fixes for bnc#1003580 bnc#1003579 bnc#1003577:
+  * zlib-bnc1003577.patch
+  * zlib-bnc1003579-part2.patch
+  * zlib-bnc1003579.patch
+  * zlib-bnc1003580.patch
+
+---

New:

  zlib-bnc1003577.patch
  zlib-bnc1003579-part2.patch
  zlib-bnc1003579.patch
  zlib-bnc1003580.patch



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.tMEYRH/_old  2016-12-08 00:27:28.0 +0100
+++ /var/tmp/diff_new_pack.tMEYRH/_new  2016-12-08 00:27:28.0 +0100
@@ -32,6 +32,11 @@
 Patch0: zlib-1.2.7-improve-longest_match-performance.patch
 #PATCH-FIX-SUSE: compiler check of varguments passed to gzprintf
 Patch1: zlib-format.patch
+# PATCH-FIX-UPSTREAM: security fixes from upstream git
+Patch2: zlib-bnc1003577.patch
+Patch3: zlib-bnc1003579-part2.patch
+Patch4: zlib-bnc1003579.patch
+Patch5: zlib-bnc1003580.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -115,6 +120,10 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 export LDFLAGS="-Wl,-z,relro,-z,now"

++ zlib-bnc1003577.patch ++
>From 3fb251b363866417122fe54a158a1ac5a7837101 Mon Sep 17 00:00:00 2001
From: Mark Adler 
Date: Wed, 21 Sep 2016 20:07:37 -0700
Subject: [PATCH] Remove dummy structure declarations for old buggy compilers.

While woolly mammoths still roamed the Earth and before Atlantis
sunk into the ocean, there were C compilers that could not handle
forward structure references, e.g. "struct name;". zlib dutifully
provided a work-around for such compilers. That work-around is no
longer needed, and, per the recommendation of a security audit of
the zlib code by Trail of Bits and TrustInSoft, in support of the
Mozilla Foundation, should be removed since what a compiler will
do with this is technically undefined. From the report: "there is
no telling what interactions the bug could have in the future with
link-time optimizations and type-based alias analyses, both
features that are present (but not default) in clang."
---
 deflate.c   | 4 
 zconf.h | 5 -
 zconf.h.cmakein | 5 -
 zconf.h.in  | 5 -
 zlib.h  | 5 -
 zutil.c | 4 
 6 files changed, 28 deletions(-)

Index: zlib-1.2.8/deflate.c
===
--- zlib-1.2.8.orig/deflate.c
+++ zlib-1.2.8/deflate.c
@@ -151,10 +151,6 @@ local const config configuration_table[1
 #define EQUAL 0
 /* result of memcmp for equal strings */
 
-#ifndef NO_DUMMY_DECL
-struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
-#endif
-
 /* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
 #define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0))
 
Index: zlib-1.2.8/zconf.h
===
--- zlib-1.2.8.orig/zconf.h
+++ zlib-1.2.8/zconf.h
@@ -224,11 +224,6 @@
 #  define z_const
 #endif
 
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
 /* Maximum value for memLevel in deflateInit2 */
 #ifndef MAX_MEM_LEVEL
 #  ifdef MAXSEG_64K
Index: zlib-1.2.8/zconf.h.cmakein
===
--- zlib-1.2.8.orig/zconf.h.cmakein
+++ zlib-1.2.8/zconf.h.cmakein
@@ -226,11 +226,6 @@
 #  define z_const
 #endif
 
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
 /* Maximum value for memLevel in deflateInit2 */
 #ifndef MAX_MEM_LEVEL
 #  ifdef MAXSEG_64K
Index: zlib-1.2.8/zconf.h.in
===
--- zlib-1.2.8.orig/zconf.h.in
+++ zlib-1.2.8/zconf.h.in
@@ -224,11 +224,6 @@
 #  define z_const
 #endif
 
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
 /* Maximum value for memLevel in deflateInit2 */
 #ifndef MAX_MEM_LEVEL

commit zlib for openSUSE:Factory

2015-10-06 Thread h_root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2015-10-06 13:22:58

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is "zlib"

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2015-07-21 
13:25:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2015-10-06 
13:22:59.0 +0200
@@ -1,0 +2,6 @@
+Thu Sep 24 20:21:46 UTC 2015 - jeng...@inai.de
+
+- Trim descriptions to fit target audience. Update RPM group
+  classification.
+
+---



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.fIFzqD/_old  2015-10-06 13:23:00.0 +0200
+++ /var/tmp/diff_new_pack.fIFzqD/_new  2015-10-06 13:23:00.0 +0200
@@ -20,9 +20,9 @@
 Name:   zlib
 Version:1.2.8
 Release:0
-Summary:Data Compression Library
+Summary:Library implementing the DEFLATE compression algorithm
 License:Zlib
-Group:  System/Libraries
+Group:  Development/Libraries/C and C++
 Url:http://www.zlib.net/
 Source0:http://zlib.net/zlib-%{version}.tar.gz
 Source1:LICENSE
@@ -39,50 +39,59 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
-zlib is designed to be a free, general-purpose, legally unencumbered -- that
-is, not covered by any patents -- lossless data-compression library for use on
-virtually any computer hardware and operating system. the zlib data format is
-itself portable across platforms. unlike the lzw compression method used in
-unix compress(1) and in the gif image format, the compression method currently
-used in zlib essentially never expands the data. (lzw can double or triple the
-file size in extreme cases.) zlib's memory footprint is also independent of the
-input data and can be reduced, if necessary, at some cost in compression.
+zlib is a general-purpose lossless data-compression library,
+implementing an API for the DEFLATE algorithm, the latter of
+which is being used by, for example, gzip and the ZIP archive
+format.
 
 %package -n libz1
-Summary:Include Files and Libraries mandatory for Development
+Summary:Library implementing the DEFLATE compression algorithm
 Group:  System/Libraries
 Provides:   %{name} = %{version}-%{release}
 Obsoletes:  %{name} < %{version}-%{release}
 
 %description -n libz1
-zlib is designed to be a free, general-purpose, legally unencumbered -- that
-is, not covered by any patents -- lossless data-compression library for use on
-virtually any computer hardware and operating system. the zlib data format is
-itself portable across platforms. unlike the lzw compression method used in
-unix compress(1) and in the gif image format, the compression method currently
-used in zlib essentially never expands the data. (lzw can double or triple the
-file size in extreme cases.) zlib's memory footprint is also independent of the
-input data and can be reduced, if necessary, at some cost in compression.
+zlib is a general-purpose lossless data-compression library,
+implementing an API for the DEFLATE algorithm, the latter of
+which is being used by, for example, gzip and the ZIP archive
+format.
 
 %package devel
-Summary:Include Files and Libraries mandatory for Development
+Summary:Development files for zlib, a data compression library
 Group:  Development/Languages/C and C++
 Requires:   glibc-devel
 Requires:   libz1 = %{version}
 
 %description devel
-This package contains all necessary include files and libraries needed
-to develop applications that require the provided includes and
-libraries.
+zlib is a general-purpose lossless data-compression library,
+implementing an API for the DEFLATE algorithm, the latter of
+which is being used by, for example, gzip and the ZIP archive
+format.
+
+This subpackage holds the development headers for the library.
+
+The zlib data format is itself portable across platforms. Unlike the
+LZW compression method used in unix compress(1) and in the GIF image
+format, the compression method currently used in zlib essentially
+never expands the data. (LZW can double or triple the file size in
+extreme cases.) zlib's memory footprint is also independent of the
+input data and can be reduced, if necessary, at some cost in
+compression.
 
 %package devel-static
-Summary:Static lib for libz1 library
+Summary:Static library for zlib
 Group:  Development/Languages/C and C++
 Requires:   %{name}-devel = %{version}
 Provides:   %{name}-devel:%{_libdir}/libz.a
 
 %description devel-static

commit zlib for openSUSE:Factory

2015-07-21 Thread h_root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2015-07-21 13:25:00

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is zlib

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2015-06-30 
12:07:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2015-07-21 
13:25:01.0 +0200
@@ -1,0 +2,17 @@
+Mon Jul 13 11:58:44 UTC 2015 - tchva...@suse.com
+
+- Require zlib-devel in zlib-devel-static to fix previous change
+
+---
+Tue Jun 30 11:30:37 UTC 2015 - tchva...@suse.com
+
+- Bring back zlib-devel-static. Needed by binutils
+
+---
+Wed Jun 24 09:01:59 UTC 2015 - tchva...@suse.com
+
+- Remove zlib-devel-static, nothing should use libz.a anyway.
+- Package minizip library, everything using it should now pull
+  minizip-devel and unbundle it bnc#935864
+
+---



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.TbMJOJ/_old  2015-07-21 13:25:02.0 +0200
+++ /var/tmp/diff_new_pack.TbMJOJ/_new  2015-07-21 13:25:02.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package zlib
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -32,12 +32,11 @@
 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:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-# bug437293
-%ifarch ppc64
-Obsoletes:  zlib-64bit
-%endif
 
 %description
 zlib is designed to be a free, general-purpose, legally unencumbered -- that
@@ -51,7 +50,7 @@
 
 %package -n libz1
 Summary:Include Files and Libraries mandatory for Development
-Group:  Development/Languages/C and C++
+Group:  System/Libraries
 Provides:   %{name} = %{version}-%{release}
 Obsoletes:  %{name}  %{version}-%{release}
 
@@ -70,12 +69,6 @@
 Group:  Development/Languages/C and C++
 Requires:   glibc-devel
 Requires:   libz1 = %{version}
-Provides:   libz:%{_includedir}/zlib.h
-# bug437293
-%ifarch ppc64
-Obsoletes:  zlib-devel-64bit
-%endif
-#
 
 %description devel
 This package contains all necessary include files and libraries needed
@@ -83,15 +76,31 @@
 libraries.
 
 %package devel-static
-Summary:Include Files and Libraries mandatory for Development
+Summary:Static lib for libz1 library
 Group:  Development/Languages/C and C++
 Requires:   %{name}-devel = %{version}
 Provides:   %{name}-devel:%{_libdir}/libz.a
 
 %description devel-static
-This package contains all necessary include files and libraries needed
-to develop applications that require the provided includes and
-libraries.
+Static library for libz1 package, that is complementing the devel package
+
+%package -n libminizip1
+Summary:Library for manipulation with .zip archives
+Group:  System/Libraries
+
+%description -n libminizip1
+Minizip is a library for manipulation with files from .zip archives.
+
+%package -n minizip-devel
+Summary:Development files for the minizip library
+Group:  Development/Languages/C and C++
+Requires:   %{name}-devel = %{version}
+Requires:   libminizip1 = %{version}
+Requires:   pkgconfig
+
+%description -n minizip-devel
+This package contains the libraries and header files needed for
+developing applications which use minizip.
 
 %prep
 %setup -q
@@ -101,30 +110,43 @@
 %build
 export LDFLAGS=-Wl,-z,relro,-z,now
 
+export CFLAGS=%{optflags}
+# For sure not autotools build
+CC=cc ./configure \
+--shared \
+--prefix=%{_prefix} \
+--libdir=/%{_lib}
+
 # Marcus: breaks example64 in 32bit builds, so it's disabled by default
 %if %{with profiling}
 profiledir=$(mktemp -d)
 trap rm -rf $profiledir EXIT
-CC=gcc ./configure --shared --prefix=%{_prefix} --libdir=/%{_lib}
 make CFLAGS=%{optflags} %{cflags_profile_generate}=$profiledir 
%{?_smp_mflags}
 time make check %{?_smp_mflags} 
-make clean
+make %{?_smp_mflags} clean
 make CFLAGS=%{optflags} %{cflags_profile_feedback}=$profiledir 
%{?_smp_mflags}
 %else
-export CFLAGS=%{optflags}
-CC=gcc ./configure --shared --prefix=%{_prefix}

commit zlib for openSUSE:Factory

2015-06-30 Thread h_root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2015-06-30 10:14:15

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is zlib

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2014-10-15 
16:19:19.0 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2015-06-30 
10:14:16.0 +0200
@@ -1,0 +2,7 @@
+Wed Jun 24 09:01:59 UTC 2015 - tchva...@suse.com
+
+- Remove zlib-devel-static, nothing should use libz.a anyway.
+- Package minizip library, everything using it should now pull
+  minizip-devel and unbundle it bnc#935864
+
+---



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.uVVO6t/_old  2015-06-30 10:14:16.0 +0200
+++ /var/tmp/diff_new_pack.uVVO6t/_new  2015-06-30 10:14:16.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package zlib
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -32,12 +32,11 @@
 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:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-# bug437293
-%ifarch ppc64
-Obsoletes:  zlib-64bit
-%endif
 
 %description
 zlib is designed to be a free, general-purpose, legally unencumbered -- that
@@ -51,7 +50,7 @@
 
 %package -n libz1
 Summary:Include Files and Libraries mandatory for Development
-Group:  Development/Languages/C and C++
+Group:  System/Libraries
 Provides:   %{name} = %{version}-%{release}
 Obsoletes:  %{name}  %{version}-%{release}
 
@@ -70,28 +69,29 @@
 Group:  Development/Languages/C and C++
 Requires:   glibc-devel
 Requires:   libz1 = %{version}
-Provides:   libz:%{_includedir}/zlib.h
-# bug437293
-%ifarch ppc64
-Obsoletes:  zlib-devel-64bit
-%endif
-#
 
 %description devel
 This package contains all necessary include files and libraries needed
 to develop applications that require the provided includes and
 libraries.
 
-%package devel-static
-Summary:Include Files and Libraries mandatory for Development
+%package -n libminizip1
+Summary:Library for manipulation with .zip archives
+Group:  System/Libraries
+
+%description -n libminizip1
+Minizip is a library for manipulation with files from .zip archives.
+
+%package -n minizip-devel
+Summary:Development files for the minizip library
 Group:  Development/Languages/C and C++
 Requires:   %{name}-devel = %{version}
-Provides:   %{name}-devel:%{_libdir}/libz.a
+Requires:   libminizip1 = %{version}
+Requires:   pkgconfig
 
-%description devel-static
-This package contains all necessary include files and libraries needed
-to develop applications that require the provided includes and
-libraries.
+%description -n minizip-devel
+This package contains the libraries and header files needed for
+developing applications which use minizip.
 
 %prep
 %setup -q
@@ -101,31 +101,44 @@
 %build
 export LDFLAGS=-Wl,-z,relro,-z,now
 
+export CFLAGS=%{optflags}
+# For sure not autotools build
+CC=cc ./configure \
+--shared \
+--prefix=%{_prefix} \
+--libdir=/%{_lib}
+
 # Marcus: breaks example64 in 32bit builds, so it's disabled by default
 %if %{with profiling}
 profiledir=$(mktemp -d)
 trap rm -rf $profiledir EXIT
-CC=gcc ./configure --shared --prefix=%{_prefix} --libdir=/%{_lib}
 make CFLAGS=%{optflags} %{cflags_profile_generate}=$profiledir 
%{?_smp_mflags}
 time make check %{?_smp_mflags} 
-make clean
+make %{?_smp_mflags} clean
 make CFLAGS=%{optflags} %{cflags_profile_feedback}=$profiledir 
%{?_smp_mflags}
 %else
-export CFLAGS=%{optflags}
-CC=gcc ./configure --shared --prefix=%{_prefix} --libdir=/%{_lib}
 make %{?_smp_mflags}
 %endif
 
+# And build minizip
+cd contrib/minizip
+autoreconf -fvi
+%configure \
+--disable-static \
+--disable-silent-rules
+make %{?_smp_mflags}
+
 %check
 time make check %{?_smp_mflags}
 
 %install
 mkdir -p %{buildroot}%{_libdir}
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
+# Fix shared library placement/symlinks
 ln -s -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/libz.so) 
%{buildroot}%{_libdir}/libz.so
 rm -v %{buildroot}/%{_lib}/libz.so
-# static lib
-mv %{buildroot}/%{_lib}/libz.a

commit zlib for openSUSE:Factory

2015-06-30 Thread h_root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2015-06-30 12:07:46

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is zlib

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2015-06-30 
10:14:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2015-06-30 
12:07:47.0 +0200
@@ -2,7 +1,0 @@
-Wed Jun 24 09:01:59 UTC 2015 - tchva...@suse.com
-
-- Remove zlib-devel-static, nothing should use libz.a anyway.
-- Package minizip library, everything using it should now pull
-  minizip-devel and unbundle it bnc#935864
-




Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.26U1RJ/_old  2015-06-30 12:07:47.0 +0200
+++ /var/tmp/diff_new_pack.26U1RJ/_new  2015-06-30 12:07:47.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package zlib
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -32,11 +32,12 @@
 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:  autoconf
-BuildRequires:  automake
-BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+# bug437293
+%ifarch ppc64
+Obsoletes:  zlib-64bit
+%endif
 
 %description
 zlib is designed to be a free, general-purpose, legally unencumbered -- that
@@ -50,7 +51,7 @@
 
 %package -n libz1
 Summary:Include Files and Libraries mandatory for Development
-Group:  System/Libraries
+Group:  Development/Languages/C and C++
 Provides:   %{name} = %{version}-%{release}
 Obsoletes:  %{name}  %{version}-%{release}
 
@@ -69,29 +70,28 @@
 Group:  Development/Languages/C and C++
 Requires:   glibc-devel
 Requires:   libz1 = %{version}
+Provides:   libz:%{_includedir}/zlib.h
+# bug437293
+%ifarch ppc64
+Obsoletes:  zlib-devel-64bit
+%endif
+#
 
 %description devel
 This package contains all necessary include files and libraries needed
 to develop applications that require the provided includes and
 libraries.
 
-%package -n libminizip1
-Summary:Library for manipulation with .zip archives
-Group:  System/Libraries
-
-%description -n libminizip1
-Minizip is a library for manipulation with files from .zip archives.
-
-%package -n minizip-devel
-Summary:Development files for the minizip library
+%package devel-static
+Summary:Include Files and Libraries mandatory for Development
 Group:  Development/Languages/C and C++
 Requires:   %{name}-devel = %{version}
-Requires:   libminizip1 = %{version}
-Requires:   pkgconfig
+Provides:   %{name}-devel:%{_libdir}/libz.a
 
-%description -n minizip-devel
-This package contains the libraries and header files needed for
-developing applications which use minizip.
+%description devel-static
+This package contains all necessary include files and libraries needed
+to develop applications that require the provided includes and
+libraries.
 
 %prep
 %setup -q
@@ -101,44 +101,31 @@
 %build
 export LDFLAGS=-Wl,-z,relro,-z,now
 
-export CFLAGS=%{optflags}
-# For sure not autotools build
-CC=cc ./configure \
---shared \
---prefix=%{_prefix} \
---libdir=/%{_lib}
-
 # Marcus: breaks example64 in 32bit builds, so it's disabled by default
 %if %{with profiling}
 profiledir=$(mktemp -d)
 trap rm -rf $profiledir EXIT
+CC=gcc ./configure --shared --prefix=%{_prefix} --libdir=/%{_lib}
 make CFLAGS=%{optflags} %{cflags_profile_generate}=$profiledir 
%{?_smp_mflags}
 time make check %{?_smp_mflags}
-make %{?_smp_mflags} clean
+make clean
 make CFLAGS=%{optflags} %{cflags_profile_feedback}=$profiledir 
%{?_smp_mflags}
 %else
+export CFLAGS=%{optflags}
+CC=gcc ./configure --shared --prefix=%{_prefix} --libdir=/%{_lib}
 make %{?_smp_mflags}
 %endif
 
-# And build minizip
-cd contrib/minizip
-autoreconf -fvi
-%configure \
---disable-static \
---disable-silent-rules
-make %{?_smp_mflags}
-
 %check
 time make check %{?_smp_mflags}
 
 %install
 mkdir -p %{buildroot}%{_libdir}
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
-# Fix shared library placement/symlinks
 ln -s -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/libz.so) 
%{buildroot}%{_libdir}/libz.so
 rm -v %{buildroot}/%{_lib}/libz.so
-# Kill static library
-rm -f

commit zlib for openSUSE:Factory

2014-10-15 Thread h_root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2014-10-15 16:19:13

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is zlib

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2013-07-29 
21:14:00.0 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2014-10-15 
16:19:19.0 +0200
@@ -1,0 +2,6 @@
+Thu Sep 25 08:04:55 UTC 2014 - tchva...@suse.com
+
+- Install examples to cover another angle from bnc#890228
+- Cleanup with spec-cleaner
+
+---



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.UtSCp8/_old  2014-10-15 16:19:20.0 +0200
+++ /var/tmp/diff_new_pack.UtSCp8/_new  2014-10-15 16:19:20.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package zlib
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,6 @@
 
 
 %bcond_with profiling
-
 Name:   zlib
 Version:1.2.8
 Release:0
@@ -71,7 +70,7 @@
 Group:  Development/Languages/C and C++
 Requires:   glibc-devel
 Requires:   libz1 = %{version}
-Provides:   libz:/usr/include/zlib.h
+Provides:   libz:%{_includedir}/zlib.h
 # bug437293
 %ifarch ppc64
 Obsoletes:  zlib-devel-64bit
@@ -108,7 +107,7 @@
 trap rm -rf $profiledir EXIT
 CC=gcc ./configure --shared --prefix=%{_prefix} --libdir=/%{_lib}
 make CFLAGS=%{optflags} %{cflags_profile_generate}=$profiledir 
%{?_smp_mflags}
-time make check
+time make check %{?_smp_mflags} 
 make clean
 make CFLAGS=%{optflags} %{cflags_profile_feedback}=$profiledir 
%{?_smp_mflags}
 %else
@@ -118,11 +117,11 @@
 %endif
 
 %check
-time make check
+time make check %{?_smp_mflags}
 
 %install
 mkdir -p %{buildroot}%{_libdir}
-make install DESTDIR=%buildroot
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 ln -s -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/libz.so) 
%{buildroot}%{_libdir}/libz.so
 rm -v %{buildroot}/%{_lib}/libz.so
 # static lib
@@ -132,6 +131,9 @@
 # manpage
 install -m 644 zlib.3 %{buildroot}%{_mandir}/man3
 install -m 644 zutil.h %{buildroot}%{_includedir}
+# examples
+mkdir -p %{buildroot}%{_docdir}/%{name}
+cp -r examples/ %{buildroot}%{_docdir}/%{name}/
 
 %post -n libz1 -p /sbin/ldconfig
 
@@ -145,6 +147,9 @@
 %files devel
 %defattr(-,root,root)
 %doc README ChangeLog
+%dir %{_docdir}/%{name}/
+%dir %{_docdir}/%{name}/examples
+%{_docdir}/%{name}/examples/*
 %{_mandir}/man3/zlib.3.gz
 %{_includedir}/zlib.h
 %{_includedir}/zconf.h

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit zlib for openSUSE:Factory

2013-07-29 Thread h_root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2013-07-29 21:13:59

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is zlib

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2013-05-16 
11:45:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2013-07-29 
21:14:00.0 +0200
@@ -1,0 +2,6 @@
+Mon Jul 29 12:37:19 UTC 2013 - mvysko...@suse.com
+
+- zlib-format.patch, backport missing sle11 feature back to openSUSE
+  bnc#831880
+
+---

New:

  zlib-format.patch



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.isJjhb/_old  2013-07-29 21:14:01.0 +0200
+++ /var/tmp/diff_new_pack.isJjhb/_new  2013-07-29 21:14:01.0 +0200
@@ -31,6 +31,8 @@
 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 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 export LDFLAGS=-Wl,-z,relro,-z,now

++ zlib-format.patch ++
From: meiss...@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.0 +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
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit zlib for openSUSE:Factory

2013-05-16 Thread h_root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2013-05-16 11:45:06

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is zlib

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2013-03-05 
16:39:28.0 +0100
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2013-05-16 
11:45:07.0 +0200
@@ -1,0 +2,9 @@
+Sat May 11 11:51:40 UTC 2013 - idon...@suse.com
+
+- Update to version 1.2.8
+  * Add new inflateGetDictionary() function
+  * Fix bug where gzopen() immediately followed by gzclose()
+would write an empty file instead of an empty gzip stream.
+  * Fix bug in gzclose() when gzwrite() runs out of memory
+
+---

Old:

  zlib-1.2.7.tar.bz2

New:

  zlib-1.2.8.tar.gz



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.OogNYQ/_old  2013-05-16 11:45:08.0 +0200
+++ /var/tmp/diff_new_pack.OogNYQ/_new  2013-05-16 11:45:08.0 +0200
@@ -19,21 +19,19 @@
 %bcond_with profiling
 
 Name:   zlib
-Version:1.2.7
+Version:1.2.8
 Release:0
 Summary:Data Compression Library
 License:Zlib
 Group:  System/Libraries
 Url:http://www.zlib.net/
-Source0:http://zlib.net/zlib-%{version}.tar.bz2
+Source0:http://zlib.net/zlib-%{version}.tar.gz
 Source1:LICENSE
 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
 BuildRequires:  pkgconfig
-#!BuildIgnore:  rpmlint-Factory
-#!BuildIgnore:  post-build-checks
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # bug437293
 %ifarch ppc64
@@ -100,6 +98,7 @@
 
 %build
 export LDFLAGS=-Wl,-z,relro,-z,now
+
 # Marcus: breaks example64 in 32bit builds, so it's disabled by default
 %if %{with profiling}
 profiledir=$(mktemp -d)

++ baselibs.conf ++
--- /var/tmp/diff_new_pack.OogNYQ/_old  2013-05-16 11:45:08.0 +0200
+++ /var/tmp/diff_new_pack.OogNYQ/_new  2013-05-16 11:45:08.0 +0200
@@ -1,6 +1,6 @@
 libz1
   targettype x86 provides baselibs-x86:prefix/lib/libz.so.1
   provides zlib-targettype = version
-  obsoletes zlib-targettype = 1.2.7
+  obsoletes zlib-targettype = 1.2.8
 zlib-devel
 zlib-devel-static

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit zlib for openSUSE:Factory

2013-03-05 Thread h_root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2013-03-05 16:39:26

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is zlib, Maintainer is mvysko...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2012-12-28 
22:52:29.0 +0100
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2013-03-05 
16:39:28.0 +0100
@@ -1,0 +2,5 @@
+Tue Mar  5 10:00:58 UTC 2013 - mvysko...@suse.com
+
+- libz1-32bit obsoletes zlib-32bit = 1.2.7 (fixes bnc#806310)
+
+---



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.pyttHW/_old  2013-03-05 16:39:29.0 +0100
+++ /var/tmp/diff_new_pack.pyttHW/_new  2013-03-05 16:39:29.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package zlib
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

++ baselibs.conf ++
--- /var/tmp/diff_new_pack.pyttHW/_old  2013-03-05 16:39:29.0 +0100
+++ /var/tmp/diff_new_pack.pyttHW/_new  2013-03-05 16:39:29.0 +0100
@@ -1,6 +1,6 @@
 libz1
   targettype x86 provides baselibs-x86:prefix/lib/libz.so.1
   provides zlib-targettype = version
-  obsoletes zlib-targettype  version
+  obsoletes zlib-targettype = 1.2.7
 zlib-devel
 zlib-devel-static

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit zlib for openSUSE:Factory

2012-12-28 Thread h_root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2012-12-28 22:52:27

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is zlib, Maintainer is mvysko...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2012-11-29 
09:34:03.0 +0100
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2012-12-28 
22:52:29.0 +0100
@@ -1,0 +2,6 @@
+Sat Dec 15 18:56:05 UTC 2012 - sch...@linux-m68k.org
+
+- Add zlib-devel-static to baselibs.conf, needed for binutils testsuite
+- Migrate zlib-targettype to libz1-targettype
+
+---



Other differences:
--
++ baselibs.conf ++
--- /var/tmp/diff_new_pack.q1gXZ9/_old  2012-12-28 22:52:30.0 +0100
+++ /var/tmp/diff_new_pack.q1gXZ9/_new  2012-12-28 22:52:30.0 +0100
@@ -1,3 +1,6 @@
 libz1
   targettype x86 provides baselibs-x86:prefix/lib/libz.so.1
+  provides zlib-targettype = version
+  obsoletes zlib-targettype  version
 zlib-devel
+zlib-devel-static

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit zlib for openSUSE:Factory

2012-11-29 Thread h_root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2012-11-29 09:34:02

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is zlib, Maintainer is mvysko...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2012-10-23 
07:16:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2012-11-29 
09:34:03.0 +0100
@@ -1,0 +2,6 @@
+Thu Nov 22 01:17:59 UTC 2012 - jeng...@inai.de
+
+- Replace %make_install by normal make install;
+  the former is a constant source of agony in older or non-SUSE.
+
+---



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.IDd5UK/_old  2012-11-29 09:34:04.0 +0100
+++ /var/tmp/diff_new_pack.IDd5UK/_new  2012-11-29 09:34:04.0 +0100
@@ -120,7 +120,7 @@
 
 %install
 mkdir -p %{buildroot}%{_libdir}
-%make_install
+make install DESTDIR=%buildroot
 ln -s -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/libz.so) 
%{buildroot}%{_libdir}/libz.so
 rm -v %{buildroot}/%{_lib}/libz.so
 # static lib

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit zlib for openSUSE:Factory

2012-10-22 Thread h_root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2012-10-23 07:16:07

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is zlib, Maintainer is mvysko...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2012-05-08 
06:54:02.0 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2012-10-23 
07:16:09.0 +0200
@@ -1,0 +2,16 @@
+Mon Oct 22 05:10:48 UTC 2012 - co...@suse.com
+
+- buildignore checks for now to get bootstrapping working
+
+---
+Mon Oct 15 07:39:29 UTC 2012 - mvysko...@suse.com
+
+- add longest_match performance patch (fate#314093)
+  * suggested by IBM, sent upstream
+- rename the main library package to libz1 according Shared
+  Library Policy
+- profiling build can be enabled via build --with profiling
+- use the human-readable package description from zlib.net
+- add rpmlintrc
+
+---

New:

  zlib-1.2.7-improve-longest_match-performance.patch
  zlib-rpmlintrc



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.n8aC3h/_old  2012-10-23 07:16:11.0 +0200
+++ /var/tmp/diff_new_pack.n8aC3h/_new  2012-10-23 07:16:11.0 +0200
@@ -16,38 +16,61 @@
 #
 
 
+%bcond_with profiling
+
 Name:   zlib
-Provides:   libz
-Obsoletes:  libz
-# bug437293
-%ifarch ppc64
-Obsoletes:  zlib-64bit
-%endif
-#
 Version:1.2.7
 Release:0
 Summary:Data Compression Library
 License:Zlib
 Group:  System/Libraries
 Url:http://www.zlib.net/
-# git://github.com/kaffeemonster/zlib.git (branch adler32_vec)
-Source: http://zlib.net/zlib-%{version}.tar.bz2
+Source0:http://zlib.net/zlib-%{version}.tar.bz2
 Source1:LICENSE
 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
 BuildRequires:  pkgconfig
+#!BuildIgnore:  rpmlint-Factory
+#!BuildIgnore:  post-build-checks
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+# bug437293
+%ifarch ppc64
+Obsoletes:  zlib-64bit
+%endif
 
 %description
-ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt
-(deflate format) and rfc1952.txt (gzip format). These documents are
-also available in other formats from
-ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html.
+zlib is designed to be a free, general-purpose, legally unencumbered -- that
+is, not covered by any patents -- lossless data-compression library for use on
+virtually any computer hardware and operating system. the zlib data format is
+itself portable across platforms. unlike the lzw compression method used in
+unix compress(1) and in the gif image format, the compression method currently
+used in zlib essentially never expands the data. (lzw can double or triple the
+file size in extreme cases.) zlib's memory footprint is also independent of the
+input data and can be reduced, if necessary, at some cost in compression.
+
+%package -n libz1
+Summary:Include Files and Libraries mandatory for Development
+Group:  Development/Languages/C and C++
+Provides:   %{name} = %{version}-%{release}
+Obsoletes:  %{name}  %{version}-%{release}
+
+%description -n libz1
+zlib is designed to be a free, general-purpose, legally unencumbered -- that
+is, not covered by any patents -- lossless data-compression library for use on
+virtually any computer hardware and operating system. the zlib data format is
+itself portable across platforms. unlike the lzw compression method used in
+unix compress(1) and in the gif image format, the compression method currently
+used in zlib essentially never expands the data. (lzw can double or triple the
+file size in extreme cases.) zlib's memory footprint is also independent of the
+input data and can be reduced, if necessary, at some cost in compression.
 
 %package devel
 Summary:Include Files and Libraries mandatory for Development
 Group:  Development/Languages/C and C++
 Requires:   glibc-devel
-Requires:   zlib = %{version}
+Requires:   libz1 = %{version}
 Provides:   libz:/usr/include/zlib.h
 # bug437293
 %ifarch ppc64
@@ -73,12 +96,12 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 export LDFLAGS=-Wl,-z,relro,-z,now
-# Marcus: breaks example64 in 32bit builds.
-%define do_profiling 0
-%if %{do_profiling}
+# Marcus: breaks example64 in 32bit builds, so it's disabled by default
+%if %{with profiling}
 profiledir=$(mktemp -d)
 trap rm -rf

commit zlib for openSUSE:Factory

2012-05-07 Thread h_root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2012-05-08 06:52:43

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is zlib, Maintainer is mvysko...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2012-02-16 
16:25:19.0 +0100
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2012-05-08 
06:54:02.0 +0200
@@ -1,0 +2,10 @@
+Mon May  7 12:34:45 UTC 2012 - joop.boo...@opensuse.org
+
+- Update to 1.2.7
+  * Fix bug in gzclose_w() when gzwrite() fails to allocate memory
+  * Add x (O_EXCL) and e (O_CLOEXEC) modes support to gzopen()
+  * Add gzopen_w() in Windows for wide character path names
+  * Fix type mismatch between get_crc_table() and crc_table
+- Passed the spec file through spec cleaner
+
+---

Old:

  zlib-1.2.2-format.patch
  zlib-1.2.5.2_git201109121534.tar.bz2
  zlib-adler-target-attr.patch
  zlib-no-sslibsuffix.patch
  zlib-ocloexec.patch

New:

  zlib-1.2.7.tar.bz2



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.NLFicr/_old  2012-05-08 06:54:04.0 +0200
+++ /var/tmp/diff_new_pack.NLFicr/_new  2012-05-08 06:54:04.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package zlib
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,23 +24,18 @@
 Obsoletes:  zlib-64bit
 %endif
 #
-Version:1.2.5.2_git201109121534
+Version:1.2.7
 Release:0
 Summary:Data Compression Library
 License:Zlib
 Group:  System/Libraries
 Url:http://www.zlib.net/
 # git://github.com/kaffeemonster/zlib.git (branch adler32_vec)
-Source: zlib-%{version}.tar.bz2
+Source: http://zlib.net/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
-Patch4: zlib-adler-target-attr.patch 
-Patch5: zlib-ocloexec.patch
-Patch6: zlib-no-sslibsuffix.patch
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  pkgconfig
+BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
 ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt
@@ -78,10 +73,6 @@
 
 %prep
 %setup -q
-%patch0
-%patch4 -p1
-%patch5
-%patch6
 
 %build
 export LDFLAGS=-Wl,-z,relro,-z,now
@@ -90,15 +81,15 @@
 %if %{do_profiling}
 profiledir=$(mktemp -d)
 trap rm -rf $profiledir EXIT
-CC=%__cc ./configure --shared --prefix=%_prefix --libdir=/%_lib
-%{__make} CFLAGS=$RPM_OPT_FLAGS %{cflags_profile_generate}=$profiledir 
%{?_smp_mflags}
+CC=gcc ./configure --shared --prefix=%{_prefix} --libdir=/%{_lib}
+make CFLAGS=%{optflags} %{cflags_profile_generate}=$profiledir 
%{?_smp_mflags}
 time make check
 make clean
-%{__make} CFLAGS=$RPM_OPT_FLAGS %{cflags_profile_feedback}=$profiledir 
%{?_smp_mflags}
+make CFLAGS=%{optflags} %{cflags_profile_feedback}=$profiledir 
%{?_smp_mflags}
 %else
-export CFLAGS=%optflags
-CC=%__cc ./configure --shared --prefix=%_prefix --libdir=/%_lib
-%{__make} %{?_smp_mflags}
+export CFLAGS=%{optflags}
+CC=gcc ./configure --shared --prefix=%{_prefix} --libdir=/%{_lib}
+make %{?_smp_mflags}
 %endif
 
 %check
@@ -107,9 +98,9 @@
 %install
 #mkdir -p %{buildroot}%{_mandir}/man3
 mkdir -p %{buildroot}%{_libdir}
-make install DESTDIR=%{buildroot}
-%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/libz.so) 
%{buildroot}%{_libdir}/libz.so
-%{__rm} -v %{buildroot}/%{_lib}/libz.so
+%make_install
+ln -s -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/libz.so) 
%{buildroot}%{_libdir}/libz.so
+rm -v %{buildroot}/%{_lib}/libz.so
 # static lib
 mv %{buildroot}/%{_lib}/libz.a %{buildroot}%{_libdir}
 # Move .pc file to %{_libdir}

++ zlib-1.2.5.2_git201109121534.tar.bz2 - zlib-1.2.7.tar.bz2 ++
 16475 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit zlib for openSUSE:Factory

2012-02-16 Thread h_root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2012-02-16 16:25:18

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is zlib, Maintainer is mvysko...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2011-12-27 
18:39:56.0 +0100
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2012-02-16 
16:25:19.0 +0100
@@ -1,0 +2,5 @@
+Thu Feb  9 16:17:55 UTC 2012 - jeng...@medozas.de
+
+- Remove redundant tags/sections
+
+---



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.XcwBOi/_old  2012-02-16 16:25:20.0 +0100
+++ /var/tmp/diff_new_pack.XcwBOi/_new  2012-02-16 16:25:20.0 +0100
@@ -118,9 +118,6 @@
 install -m 644 zlib.3 %{buildroot}%{_mandir}/man3
 install -m 644 zutil.h %{buildroot}%{_includedir}
 
-%clean
-rm -rf %{buildroot}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit zlib for openSUSE:Factory

2011-12-27 Thread h_root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2011-12-27 18:39:53

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is zlib, Maintainer is mvysko...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2011-12-12 
17:06:01.0 +0100
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2011-12-27 
18:39:56.0 +0100
@@ -1,0 +2,6 @@
+Thu Dec 22 14:31:42 CET 2011 - meiss...@suse.de
+
+- use configure options for library paths. Also fixes
+  the pkg-config file to not have /usr/local bnc#738169
+
+---



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.h4Jfld/_old  2011-12-27 18:39:59.0 +0100
+++ /var/tmp/diff_new_pack.h4Jfld/_new  2011-12-27 18:39:59.0 +0100
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:   zlib
 Provides:   libz
 Obsoletes:  libz
@@ -89,14 +90,14 @@
 %if %{do_profiling}
 profiledir=$(mktemp -d)
 trap rm -rf $profiledir EXIT
-CC=%__cc ./configure --shared
+CC=%__cc ./configure --shared --prefix=%_prefix --libdir=/%_lib
 %{__make} CFLAGS=$RPM_OPT_FLAGS %{cflags_profile_generate}=$profiledir 
%{?_smp_mflags}
 time make check
 make clean
 %{__make} CFLAGS=$RPM_OPT_FLAGS %{cflags_profile_feedback}=$profiledir 
%{?_smp_mflags}
 %else
 export CFLAGS=%optflags
-CC=%__cc ./configure --shared
+CC=%__cc ./configure --shared --prefix=%_prefix --libdir=/%_lib
 %{__make} %{?_smp_mflags}
 %endif
 
@@ -104,12 +105,9 @@
 time make check
 
 %install
-mkdir -p %{buildroot}{/%{_lib},%{_libdir}}
-mkdir -p %{buildroot}%{_mandir}/man3
-mkdir -p %{buildroot}%{_includedir}
-make install \
-   prefix=%{buildroot}%{_prefix} \
-   libdir=%{buildroot}/%{_lib}
+#mkdir -p %{buildroot}%{_mandir}/man3
+mkdir -p %{buildroot}%{_libdir}
+make install DESTDIR=%{buildroot}
 %{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/libz.so) 
%{buildroot}%{_libdir}/libz.so
 %{__rm} -v %{buildroot}/%{_lib}/libz.so
 # static lib

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit zlib for openSUSE:Factory

2011-12-12 Thread h_root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2011-12-12 17:00:09

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is zlib, Maintainer is mvysko...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2011-11-21 
12:52:07.0 +0100
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2011-12-12 
17:06:01.0 +0100
@@ -1,0 +2,5 @@
+Wed Dec  7 15:29:27 UTC 2011 - co...@suse.com
+
+- zlib has it's own spdx license, so use it :)
+
+---



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.9Y84gM/_old  2011-12-12 17:06:12.0 +0100
+++ /var/tmp/diff_new_pack.9Y84gM/_new  2011-12-12 17:06:12.0 +0100
@@ -15,11 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:   zlib
-License:Other uncritical OpenSource License
-Group:  System/Libraries
 Provides:   libz
 Obsoletes:  libz
 # bug437293
@@ -28,8 +24,10 @@
 %endif
 #
 Version:1.2.5.2_git201109121534
-Release:17
+Release:0
 Summary:Data Compression Library
+License:Zlib
+Group:  System/Libraries
 Url:http://www.zlib.net/
 # git://github.com/kaffeemonster/zlib.git (branch adler32_vec)
 Source: zlib-%{version}.tar.bz2
@@ -50,7 +48,6 @@
 ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html.
 
 %package devel
-License:Other uncritical OpenSource License
 Summary:Include Files and Libraries mandatory for Development
 Group:  Development/Languages/C and C++
 Requires:   glibc-devel
@@ -68,7 +65,6 @@
 libraries.
 
 %package devel-static
-License:Other uncritical OpenSource License
 Summary:Include Files and Libraries mandatory for Development
 Group:  Development/Languages/C and C++
 Requires:   %{name}-devel = %{version}

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit zlib for openSUSE:Factory

2011-11-21 Thread h_root

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 mvysko...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2011-11-14 
13:51:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2011-11-21 
12:52:07.0 +0100
@@ -1,0 +2,28 @@
+Sat Nov 19 20:00:11 UTC 2011 - crrodrig...@opensuse.org
+
+- Do not include the codename in soversion.
+
+---
+Sat Nov 19 18:42:12 UTC 2011 - crrodrig...@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.0 +0100
+++ /var/tmp/diff_new_pack.Ypd2uw/_new  2011-11-21 12:52:12.0 +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 dims...@opensuse.org -- Properly define 
large file support. Patch taken from gentoo
-Patch1: zlib-lfs.patch
-# PATCH-FIX-JENGELH-PARALLEL-MAKE zlib-parallel.patch meiss...@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.0 +0100
+++ /var/tmp/diff_new_pack.Ypd2uw/_new  2011-11-21 12:52:12.0 +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

commit zlib for openSUSE:Factory

2011-11-14 Thread h_root

Hello community,

here is the log from the commit of package zlib for openSUSE:Factory checked in 
at 2011-11-14 13:51:42

Comparing /work/SRC/openSUSE:Factory/zlib (Old)
 and  /work/SRC/openSUSE:Factory/.zlib.new (New)


Package is zlib, Maintainer is mvysko...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/zlib/zlib.changes2011-10-04 
18:16:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes   2011-11-14 
13:51:49.0 +0100
@@ -1,0 +2,9 @@
+Sun Nov 13 05:52:57 UTC 2011 - crrodrig...@opensuse.org
+
+-open file descriptors with O_CLOEXEC but only in the·
+  gzopen() case, not in gzdopen() as that would change
+  the calling application' semantics.
+  It is responsability of the caller to ensure O_CLOEXEC is used
+  in such scenario.
+
+---

New:

  zlib-ocloexec.patch



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.4Q7SrP/_old  2011-11-14 13:51:50.0 +0100
+++ /var/tmp/diff_new_pack.4Q7SrP/_new  2011-11-14 13:51:50.0 +0100
@@ -44,6 +44,7 @@
 # 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
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  pkgconfig
 
@@ -90,6 +91,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5
 
 %build
 export LDFLAGS=-Wl,-z,relro,-z,now

++ zlib-ocloexec.patch ++
--- gzlib.c.orig
+++ gzlib.c
@@ -167,6 +167,7 @@ local gzFile gz_open(path, fd, mode)
 #ifdef O_BINARY
 O_BINARY |
 #endif
+O_CLOEXEC |
 (state-mode == GZ_READ ?
 O_RDONLY :
 (O_WRONLY | O_CREAT | (
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit zlib for openSUSE:Factory

2011-10-04 Thread h_root


Hello community,

here is the log from the commit of package zlib for openSUSE:Factory
checked in at Tue Oct 4 18:16:15 CEST 2011.




--- openSUSE:Factory/zlib/zlib.changes  2011-09-23 12:53:43.0 +0200
+++ /mounts/work_src_done/STABLE/zlib/zlib.changes  2011-10-04 
11:11:06.0 +0200
@@ -1,0 +2,6 @@
+Tue Oct  4 09:10:46 UTC 2011 - u...@suse.com
+
+- cross-build fix: use %__cc macro (not %configure, this is not
+  autoconf)
+
+---

calling whatdependson for head-i586




Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.R9qD9j/_old  2011-10-04 18:16:11.0 +0200
+++ /var/tmp/diff_new_pack.R9qD9j/_new  2011-10-04 18:16:11.0 +0200
@@ -98,14 +98,14 @@
 %if %{do_profiling}
 profiledir=$(mktemp -d)
 trap rm -rf $profiledir EXIT
-./configure --shared
+CC=%__cc ./configure --shared
 %{__make} CFLAGS=$RPM_OPT_FLAGS %{cflags_profile_generate}=$profiledir 
%{?_smp_mflags}
 time make check
 make clean
 %{__make} CFLAGS=$RPM_OPT_FLAGS %{cflags_profile_feedback}=$profiledir 
%{?_smp_mflags}
 %else
 export CFLAGS=%optflags
-./configure --shared
+CC=%__cc ./configure --shared
 %{__make} %{?_smp_mflags}
 %endif
 

continue with q...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit zlib for openSUSE:Factory

2011-06-30 Thread h_root


Hello community,

here is the log from the commit of package zlib for openSUSE:Factory
checked in at Thu Jun 30 14:14:41 CEST 2011.




--- zlib/zlib.changes   2011-05-30 21:39:57.0 +0200
+++ /mounts/work_src_done/STABLE/zlib/zlib.changes  2011-06-27 
13:07:04.0 +0200
@@ -1,0 +2,6 @@
+Mon Jun 27 11:05:47 UTC 2011 - dims...@opensuse.org
+
+- bnc#652333: Change LICENSE text to not have version, which
+  changes too often and invalidates the text everytime.
+
+---

calling whatdependson for head-i586




Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.myFoUA/_old  2011-06-30 14:14:24.0 +0200
+++ /var/tmp/diff_new_pack.myFoUA/_new  2011-06-30 14:14:24.0 +0200
@@ -28,7 +28,7 @@
 %endif
 #
 Version:1.2.5_git201105272030
-Release:1
+Release:15
 Summary:Data Compression Library
 Url:http://www.zlib.net/
 # git://github.com/kaffeemonster/zlib_adler32_vec.git

++ LICENSE ++
--- /var/tmp/diff_new_pack.myFoUA/_old  2011-06-30 14:14:24.0 +0200
+++ /var/tmp/diff_new_pack.myFoUA/_new  2011-06-30 14:14:24.0 +0200
@@ -1,11 +1,11 @@
 The zlib library itself is released under specific zlib license see
 zlib.h in tarball
 
-However files 
-zlib-1.2.3/contrib/asm586/match.S
-zlib-1.2.3/contrib/masm686/match.asm
-zlib-1.2.3/contrib/masmx86/gvmat32.asm
-zlib-1.2.3/contrib/ada/zlib.ads
+However files (relative to extracted source tarballs root)
+ contrib/asm586/match.S
+ contrib/masm686/match.asm
+ contrib/masmx86/gvmat32.asm
+ contrib/ada/zlib.ads
 
 which are not used to build zlib library, but are shipped in source 
 of zlib are release under the GNU General Public License, see the 






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit zlib for openSUSE:Factory

2011-06-06 Thread h_root


Hello community,

here is the log from the commit of package zlib for openSUSE:Factory
checked in at Mon Jun 6 09:39:02 CEST 2011.




--- zlib/zlib.changes   2011-05-27 11:15:50.0 +0200
+++ /mounts/work_src_done/STABLE/zlib/zlib.changes  2011-05-30 
21:39:57.0 +0200
@@ -1,0 +2,5 @@
+Mon May 30 19:38:43 UTC 2011 - crrodrig...@opensuse.org
+
+- Fix two bugs that will break ia64 systems only. 
+
+---

calling whatdependson for head-i586


Old:

  zlib-1.2.5_git201105121450.tar.bz2

New:

  zlib-1.2.5_git201105272030.tar.bz2



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.FKwqLe/_old  2011-06-06 09:31:55.0 +0200
+++ /var/tmp/diff_new_pack.FKwqLe/_new  2011-06-06 09:31:55.0 +0200
@@ -27,8 +27,8 @@
 Obsoletes:  zlib-64bit
 %endif
 #
-Version:1.2.5_git201105121450
-Release:13
+Version:1.2.5_git201105272030
+Release:1
 Summary:Data Compression Library
 Url:http://www.zlib.net/
 # git://github.com/kaffeemonster/zlib_adler32_vec.git

++ zlib-1.2.5_git201105121450.tar.bz2 - zlib-1.2.5_git201105272030.tar.bz2 
++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/zlib-1.2.5_git201105121450/ia64/adler32.c 
new/zlib-1.2.5_git201105272030/ia64/adler32.c
--- old/zlib-1.2.5_git201105121450/ia64/adler32.c   2011-05-12 
16:50:18.0 +0200
+++ new/zlib-1.2.5_git201105272030/ia64/adler32.c   2011-05-27 
22:30:10.0 +0200
@@ -12,7 +12,7 @@
 #include limits.h
 #ifdef __GNUC__
 #  define HAVE_ADLER32_VEC
-#  define MIN_WORK 32
+#  define MIN_WORK 64
 
 #  define VNMAX (7*NMAX)
 #  define SOULL (sizeof(unsigned long long))
@@ -222,16 +222,25 @@
 (p6) mov  unpck_15 = inner_loop_count\n\t
 (p7) mov  unpck_15 = k;;\n\t
 
+mov   unpck_16 = buf_ptr_1\n\t
 and   unpck_14 = -16, unpck_15\n\t
-and   loop_rem = 63, unpck_15\n\t
-shr.u unpck_13 = unpck_15, 6;;\n\t
+and   loop_rem = 63, unpck_15;;\n\t
 
-cmp4.eq   p7,p6 = 0, unpck_13;;\n\t
-sub   k = k, unpck_14\n\t
 mov   vs2_wsum_hh = r0\n\t
+shr.u unpck_13 = unpck_15, 6\n\t
+add   unpck_16 = unpck_15, unpck_16;;\n\t
 
-nop.m 0\n\t
-nop.i 0\n\t
+cmp4.eq   p7,p6 = 0, unpck_13\n\t
+sub   k = k, unpck_14\n\t
+add   unpck_16 = -33, unpck_16;;\n\t
+
+/* prefetch end of buffer for this iterration,
+ * to make sure OS sees possible page faults so
+ * OS can swap page in, because speculative
+ * loads will not.
+ */
+lfetch.fault  [unpck_16]\n\t
+nop.i 1\n\t
 (p7) br.cond.dpnt.few 5f\n\t
 
 ld8   input8_3 = [buf_ptr_3], 32\n\t
@@ -403,20 +412,20 @@
 
 2:\n\t
 add   buf_ptr_1 = -16, buf_ptr_1\n\t
-pmpy2.r   unpck_01 = vs2_wsum_ll, order_hihi\n\t
-pmpy2.l   unpck_02 = vs2_wsum_ll, order_hihi;;\n\t
+pmpy2.r   unpck_01 = vs2_wsum_ll, order_lolo\n\t
+pmpy2.l   unpck_02 = vs2_wsum_ll, order_lolo;;\n\t
 
 add   buf_ptr_2 = -16, buf_ptr_2\n\t
-pmpy2.r   unpck_03 = vs2_wsum_lh, order_hilo\n\t
-pmpy2.l   unpck_04 = vs2_wsum_lh, order_hilo\n\t
+pmpy2.r   unpck_03 = vs2_wsum_lh, order_lohi\n\t
+pmpy2.l   unpck_04 = vs2_wsum_lh, order_lohi\n\t
 
 padd4 unpck_01 = unpck_01, unpck_02\n\t
-pmpy2.r   unpck_05 = vs2_wsum_hl, order_lohi\n\t
-pmpy2.l   unpck_06 = vs2_wsum_hl, order_lohi;;\n\t
+pmpy2.r   unpck_05 = vs2_wsum_hl, order_hilo\n\t
+pmpy2.l   unpck_06 = vs2_wsum_hl, order_hilo;;\n\t
 
 padd4 unpck_03 = unpck_03, unpck_04\n\t
-pmpy2.r   unpck_07 = vs2_wsum_hh, order_lolo\n\t
-pmpy2.l   unpck_08 = vs2_wsum_hh, order_lolo\n\t
+pmpy2.r   unpck_07 = vs2_wsum_hh, order_hihi\n\t
+pmpy2.l   unpck_08 = vs2_wsum_hh, order_hihi\n\t
 
 padd4 unpck_05 = unpck_05, unpck_06;;\n\t
 padd4 unpck_07 = unpck_07, unpck_08\n\t






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit zlib for openSUSE:Factory

2011-05-30 Thread h_root


Hello community,

here is the log from the commit of package zlib for openSUSE:Factory
checked in at Mon May 30 09:05:00 CEST 2011.




--- zlib/zlib.changes   2011-05-12 22:03:36.0 +0200
+++ /mounts/work_src_done/STABLE/zlib/zlib.changes  2011-05-27 
11:15:50.0 +0200
@@ -1,0 +2,6 @@
+Fri May 27 09:13:31 UTC 2011 - mvysko...@suse.cz
+
+- fix bnc#679345: zlib segfaults when passing NULL to gzopen
+  * return NULL checks back to gz_open
+
+---

calling whatdependson for head-i586


New:

  zlib-1.2.5-gzopen-null-check.patch



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.DvkyZ3/_old  2011-05-30 08:47:50.0 +0200
+++ /var/tmp/diff_new_pack.DvkyZ3/_new  2011-05-30 08:47:50.0 +0200
@@ -28,7 +28,7 @@
 %endif
 #
 Version:1.2.5_git201105121450
-Release:1
+Release:13
 Summary:Data Compression Library
 Url:http://www.zlib.net/
 # git://github.com/kaffeemonster/zlib_adler32_vec.git
@@ -41,6 +41,8 @@
 Patch1: zlib-lfs.patch
 # PATCH-FIX-JENGELH-PARALLEL-MAKE zlib-parallel.patch meiss...@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
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  pkgconfig
 
@@ -85,6 +87,7 @@
 %patch0
 %patch1
 %patch2 -p1
+%patch3 -p1
 
 %build
 # Marcus: breaks example64 in 32bit builds.

++ zlib-1.2.5-gzopen-null-check.patch ++
Index: zlib-1.2.5_git201105121450/gzlib.c
===
--- zlib-1.2.5_git201105121450.orig/gzlib.c 2011-05-12 16:50:18.0 
+0200
+++ zlib-1.2.5_git201105121450/gzlib.c  2011-05-27 10:45:36.467678080 +0200
@@ -91,6 +91,9 @@
 {
 gz_statep state;
 
+if (!path || !mode)
+return NULL;
+
 /* allocate gzFile structure to return */
 state = malloc(sizeof(gz_state));
 if (state == NULL)





Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit zlib for openSUSE:Factory

2011-04-03 Thread h_root


Hello community,

here is the log from the commit of package zlib for openSUSE:Factory
checked in at Sun Apr 3 12:14:01 CEST 2011.




--- zlib/zlib.changes   2011-01-09 14:33:39.0 +0100
+++ /mounts/work_src_done/STABLE/zlib/zlib.changes  2011-03-30 
21:48:31.0 +0200
@@ -1,0 +2,11 @@
+Wed Mar 30 19:47:30 UTC 2011 - crrodrig...@opensuse.org
+
+- Update SSE2/MMX patches to version 2. 
+
+---
+Tue Mar 15 22:38:32 UTC 2011 - crrodrig...@opensuse.org
+
+- Add highly experimental patches to use SSE2/SSSE3/MMX in zlib
+  this makes the library up to 6 times faster. 
+
+---

calling whatdependson for head-i586


New:

  01-prepare.patch
  02-ppc_altivec.patch
  03-arm.patch
  04-x86.patch



Other differences:
--
++ zlib.spec ++
--- /var/tmp/diff_new_pack.Tg1qVv/_old  2011-04-03 12:13:22.0 +0200
+++ /var/tmp/diff_new_pack.Tg1qVv/_new  2011-04-03 12:13:22.0 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package zlib (Version 1.2.5)
+# spec file for package zlib
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -28,7 +28,7 @@
 %endif
 #
 Version:1.2.5
-Release:5
+Release:11
 Summary:Data Compression Library
 Url:http://www.zlib.net/
 Source: zlib-%{version}.tar.bz2
@@ -40,6 +40,10 @@
 Patch1: zlib-lfs.patch
 # PATCH-FIX-JENGELH-PARALLEL-MAKE zlib-parallel.patch meiss...@novell.com -- 
shared library links with libz.a
 Patch2: zlib-parallel.patch
+Patch3: 01-prepare.patch  
+Patch4: 02-ppc_altivec.patch  
+Patch5: 03-arm.patch  
+Patch6: 04-x86.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  pkgconfig
 
@@ -84,6 +88,10 @@
 %patch0
 %patch1
 %patch2 -p1
+%patch3
+%patch4
+%patch5
+%patch6
 
 %build
 # Marcus: breaks example64 in 32bit builds.

++ 01-prepare.patch ++
=== modified file 'Makefile.in'
--- Makefile.in 2011-03-14 01:01:37 +
+++ Makefile.in 2011-03-14 02:19:21 +
@@ -236,7 +236,8 @@
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-adler32.o zutil.o: zutil.h zlib.h zconf.h
+adler32.o: adler32.c zutil.h zlib.h zconf.h
+zutil.o: zutil.h zlib.h zconf.h
 gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h gzguts.h
 compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h
 crc32.o: zutil.h zlib.h zconf.h crc32.h
@@ -246,7 +247,8 @@
 inftrees.o: zutil.h zlib.h zconf.h inftrees.h
 trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
 
-adler32.lo zutil.lo: zutil.h zlib.h zconf.h
+adler32.lo: adler32.c zutil.h zlib.h zconf.h
+zutil.lo: zutil.h zlib.h zconf.h
 gzclose.lo gzlib.lo gzread.lo gzwrite.lo: zlib.h zconf.h gzguts.h
 compress.lo example.lo minigzip.lo uncompr.lo: zlib.h zconf.h
 crc32.lo: zutil.h zlib.h zconf.h crc32.h

=== modified file 'adler32.c'
--- adler32.c   2011-03-14 01:01:37 +
+++ adler32.c   2011-03-30 13:38:42 +
@@ -9,6 +9,35 @@
 
 #define local static
 
+#define GCC_VERSION_GE(x) ((__GNUC__-0) * 100 + __GNUC_MINOR__-0 = x)
+
+#if GCC_VERSION_GE(301)
+/* sometimes leakes out of old kernel header */
+#  undef noinline
+#  define noinline __attribute__((__noinline__))
+#else
+#  ifndef noinline
+#define noinline
+#  endif
+#endif
+
+#if GCC_VERSION_GE(301)
+# define GCC_ATTR_UNUSED_PARAM __attribute__((__unused__))
+#else
+# define GCC_ATTR_UNUSED_PARAM
+#endif
+
+#if GCC_VERSION_GE(296)
+#  define likely(x)   __builtin_expect(!!(x), 1)
+#  define unlikely(x) __builtin_expect(!!(x), 0)
+#else
+#  define likely(x)   (x)
+#  define unlikely(x) (x)
+#endif
+
+#define ROUND_TO(x , n) ((x)  ~((n) - 1L))
+#define ALIGN_DIFF(x, n) (((intptr_t)((x)+(n) - 1L)  ~((intptr_t)(n) - 1L)) - 
(intptr_t)(x))
+
 local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2);
 
 #define BASE 65521UL/* largest prime smaller than 65536 */
@@ -21,9 +50,20 @@
 #define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
 #define DO16(buf)   DO8(buf,0); DO8(buf,8);
 
+#if defined(__alpha__)
+/* even if gcc can generate a mul by inverse, the code is really
+ * ugly (find global const pool pointer, load constant, a mul, lots
+ * of shifts/add/sub), up to 14 instructions. The replacement code
+ * only needs = 5 instructions
+ */
+#  define NO_DIVIDE
+#endif
+
 /* use NO_DIVIDE if your processor does not do division in hardware */
 #ifdef NO_DIVIDE
-#  define MOD(a) \
+/* use NO_SHIFT if your processor does shift  1 by loop */
+#  ifdef NO_SHIFT
+#define reduce_full(a) \
 do { \
 if (a = (BASE  16)) a -= (BASE  16); \
 if (a = (BASE  15)) a -= (BASE  15); \
@@ -43,21 +83,237 @@
 if (a = (BASE  1)) a -= (BASE  1); \
 if (a = BASE) a -= BASE; \
 } while (0)
-#  define MOD4(a) \
+#define reduce_x(a) \
 do { \
+if

39 matches

Mail list logo