Accepting request 975567 from home:AndreasStieger:branches:Archiving

pigz 2.7

OBS-URL: https://build.opensuse.org/request/show/975567
OBS-URL: https://build.opensuse.org/package/show/Archiving/pigz?expand=0&rev=12

pigz-2.6.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2eed7b0d7449d1d70903f2a62cd6005d262eb3a8c9e98687bc8cbb5809db2a7d
-size 106840

pigz-2.6.tar.gz.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Comment: GPGTools - http://gpgtools.org
-
-iF0EABECAB0WIQRe1GpnIdNlWHeR4qp4P82OWLyvugUCYB5c5gAKCRB4P82OWLyv
-ujH0AJ4/UnzyXVkgco981LfhwYT53JqZvACdGxBZnHih65jH22KVy0sng4SjoZk=
-=hTW4
------END PGP SIGNATURE-----

pigz-2.7-NOTHREAD-tests.patch

@@ -0,0 +1,61 @@
+From 67fd6e436f4f479aead529a719e24d6864cf1dfa Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Sun, 16 Jan 2022 09:23:07 -0800
+Subject: [PATCH] Fix NOTHREAD compile error for combination code.
+
+The ability to combine CRCs is needed for the new summary line
+when listing multiple gzip members.
+---
+ pigz.c | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/pigz.c b/pigz.c
+index 01e50e0..f915c4a 100644
+--- a/pigz.c
++++ b/pigz.c
+@@ -558,9 +558,7 @@ local struct {
+     int procs;              // maximum number of compression threads (>= 1)
+     int setdict;            // true to initialize dictionary in each thread
+     size_t block;           // uncompressed input size per thread (>= 32K)
+-#ifndef NOTHREAD
+     crc_t shift;            // pre-calculated CRC-32 shift for length block
+-#endif
+ 
+     // saved gzip/zip header data for decompression, testing, and listing
+     time_t stamp;           // time stamp from gzip header
+@@ -1338,9 +1336,6 @@ local long zlib_vernum(void) {
+     return left < 2 ? num << (left << 2) : -1;
+ }
+ 
+-#ifndef NOTHREAD
+-// -- threaded portions of pigz --
+-
+ // -- check value combination routines for parallel calculation --
+ 
+ #define COMB(a,b,c) (g.form == 1 ? adler32_comb(a,b,c) : crc32_comb(a,b,c))
+@@ -1421,6 +1416,9 @@ local unsigned long adler32_comb(unsigned long adler1, unsigned long adler2,
+     return sum1 | (sum2 << 16);
+ }
+ 
++#ifndef NOTHREAD
++// -- threaded portions of pigz --
++
+ // -- pool of spaces for buffer management --
+ 
+ // These routines manage a pool of spaces. Each pool specifies a fixed size
+@@ -4337,11 +4335,11 @@ local void defaults(void) {
+     ZopfliInitOptions(&g.zopts);
+ #endif
+     g.block = 131072UL;             // 128K
++    g.shift = x2nmodp(g.block, 3);
+ #ifdef NOTHREAD
+     g.procs = 1;
+ #else
+     g.procs = nprocs(8);
+-    g.shift = x2nmodp(g.block, 3);
+ #endif
+     g.rsync = 0;                    // don't do rsync blocking
+     g.setdict = 1;                  // initialize dictionary each thread
+-- 
+2.36.0
+

pigz-2.7.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b4c9e60344a08d5db37ca7ad00a5b2c76ccb9556354b722d56d55ca7e8b1c707
+size 108102

pigz-2.7.tar.gz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - http://gpgtools.org
+
+iF0EABECAB0WIQRe1GpnIdNlWHeR4qp4P82OWLyvugUCYeMhWAAKCRB4P82OWLyv
+ulfFAJ9CMAkhdUo/d1+jS2QkHkIP+LzGdACgkkRqs9Zhe+YQhkIKyHqTHGNUkjg=
+=IkZR
+-----END PGP SIGNATURE-----

pigz.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat May  7 19:02:01 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 2.7:
+  * Improved display of multiple-member gzip files
+  * Better gzip compatibility and bug fixes
+- add pigz-2.7-NOTHREAD-tests.patch to fix tests
+
 -------------------------------------------------------------------
 Sun Feb  7 23:27:13 UTC 2021 - Dirk Müller <dmueller@suse.com>
 

pigz.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package pigz
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           pigz
-Version:        2.6
+Version:        2.7
 Release:        0
 Summary:        Multi-core gzip version
 License:        Zlib
@@ -26,20 +26,20 @@ URL:            https://www.zlib.net/pigz/
 Source0:        https://www.zlib.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        https://www.zlib.net/%{name}/%{name}-%{version}-sig.txt#/%{name}-%{version}.tar.gz.asc
 Source9:        %{name}.keyring
+Patch0:         pigz-2.7-NOTHREAD-tests.patch
 BuildRequires:  zlib-devel
 
 %description
 A parallel implementation of gzip for modern multi-processor, multi-core machines
 
 %prep
-%setup -q
+%autosetup -p1
-%autopatch -p1
 
 %build
-%make_build CFLAGS="%{optflags}"
+%make_build
 
 %check
-%make_build tests CFLAGS="%{optflags}"
+%make_build tests
 
 %install
 install -Dpm 0755 pigz \