- Update to 2.7 fixez rhbz#2041075

This commit is contained in:
Filipe Rosset 2022-03-21 17:58:01 -03:00
parent 51748a0424
commit f9c5a0823a
3 changed files with 54 additions and 3 deletions

View File

@ -0,0 +1,47 @@
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

View File

@ -1,10 +1,11 @@
Name: pigz Name: pigz
Version: 2.6 Version: 2.7
Release: 2%{?dist} Release: 1%{?dist}
Summary: Parallel implementation of gzip Summary: Parallel implementation of gzip
License: zlib License: zlib
URL: https://www.zlib.net/pigz/ URL: https://www.zlib.net/pigz/
Source0: https://www.zlib.net/%{name}/%{name}-%{version}.tar.gz Source0: https://www.zlib.net/%{name}/%{name}-%{version}.tar.gz
Patch0: 67fd6e436f4f479aead529a719e24d6864cf1dfa.diff
BuildRequires: gcc BuildRequires: gcc
BuildRequires: make BuildRequires: make
@ -38,6 +39,9 @@ make tests CFLAGS="$RPM_OPT_FLAGS"
%{_datadir}/man/man1/pigz.* %{_datadir}/man/man1/pigz.*
%changelog %changelog
* Fri Feb 04 2022 Filipe Rosset <rosset.filipe@gmail.com> - 2.7-1
- Update to 2.7 fixez rhbz#2041075
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-2 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (pigz-2.6.tar.gz) = 04d2e44bc7a7eb061c3c48100ce5b8fc79931aeac72340abd768fd2a4499ff1004e2bc009772fc2003a4c599f6e90f3abc8bef5c377d6397f1c8e9f7c49f95e2 SHA512 (pigz-2.7.tar.gz) = 9f9f61de4a0307fc057dc4e31a98bd8d706d9e709ecde0be02a871534fddf6a1fe1321158aa72708603aaaece43f83d2423b127f7689b6219b23aea4f989e8f5