diff --git a/pigz-2.7-NOTHREAD-tests.patch b/pigz-2.7-NOTHREAD-tests.patch deleted file mode 100644 index 70eca59..0000000 --- a/pigz-2.7-NOTHREAD-tests.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 67fd6e436f4f479aead529a719e24d6864cf1dfa Mon Sep 17 00:00:00 2001 -From: Mark Adler -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 - diff --git a/pigz-2.7.tar.gz b/pigz-2.7.tar.gz deleted file mode 100644 index 2401a19..0000000 --- a/pigz-2.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4c9e60344a08d5db37ca7ad00a5b2c76ccb9556354b722d56d55ca7e8b1c707 -size 108102 diff --git a/pigz-2.7.tar.gz.asc b/pigz-2.7.tar.gz.asc deleted file mode 100644 index 650fbbb..0000000 --- a/pigz-2.7.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Comment: GPGTools - http://gpgtools.org - -iF0EABECAB0WIQRe1GpnIdNlWHeR4qp4P82OWLyvugUCYeMhWAAKCRB4P82OWLyv -ulfFAJ9CMAkhdUo/d1+jS2QkHkIP+LzGdACgkkRqs9Zhe+YQhkIKyHqTHGNUkjg= -=IkZR ------END PGP SIGNATURE----- diff --git a/pigz-2.8.tar.gz b/pigz-2.8.tar.gz new file mode 100644 index 0000000..697c2dd --- /dev/null +++ b/pigz-2.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb872b4f0e1f0ebe59c9f7bd8c506c4204893ba6a8492de31df416f0d5170fd0 +size 121304 diff --git a/pigz-2.8.tar.gz.asc b/pigz-2.8.tar.gz.asc new file mode 100644 index 0000000..56b1899 --- /dev/null +++ b/pigz-2.8.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Comment: GPGTools - http://gpgtools.org + +iF0EABECAB0WIQRe1GpnIdNlWHeR4qp4P82OWLyvugUCZOGo1AAKCRB4P82OWLyv +ukN8AKCF9Uj4DZqOItknvfbRu8jYEt1BJgCg/4lvP2oOhtC649OC7l9B7MRrs/8= +=en+Y +-----END PGP SIGNATURE----- diff --git a/pigz.changes b/pigz.changes index c2dce0c..b644d51 100644 --- a/pigz.changes +++ b/pigz.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Sep 4 12:55:45 UTC 2023 - pgajdos@suse.com + +- version update to 2.8 + - Fixed a version bug when compiling with the just-released zlib 1.3 + - Will save a modification time only for regular files (just like gzip since 1.10) + - Will write all available uncompressed data on an error, for partial data recovery +- deleted patches + - pigz-2.7-NOTHREAD-tests.patch (upstreamed) + ------------------------------------------------------------------- Sat May 7 19:02:01 UTC 2022 - Andreas Stieger diff --git a/pigz.spec b/pigz.spec index acd38ee..971ecbc 100644 --- a/pigz.spec +++ b/pigz.spec @@ -17,7 +17,7 @@ Name: pigz -Version: 2.7 +Version: 2.8 Release: 0 Summary: Multi-core gzip version License: Zlib @@ -26,7 +26,6 @@ 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