From 6895090f7c5dbca1787ef772813c38cac2676b09a0fd3148419938f570f5592e Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 28 Dec 2021 08:54:26 +0000 Subject: [PATCH 1/4] Accepting request 942801 from home:dirkmueller:Factory - update to 1.5.1: * perf: rebalanced compression levels, to better match the intended speed/level curve * perf: faster huffman decoder, using x64 assembly * perf: slightly faster high speed modes (strategies fast & dfast) * perf: improved binary size and faster compilation times * perf: new row64 mode, used notably in level 12 * perf: faster mid-level compression speed in presence of highly repetitive patterns * perf: minor compression ratio improvements for small data at high levels * perf: reduced stack usage (mostly useful for Linux Kernel) * perf: faster compression speed on incompressible data * perf: on-demand reduced ZSTD_DCtx state size, using build macro ZSTD_DECODER_INTERNAL_BUFFER, at a small cost of performance * build: allows hiding static symbols in the dynamic library, using build macro * build: support for m68k (Motorola 68000's) * build: improved AIX support * build: improved meson unofficial build * cli : custom memory limit when training dictionary (#2925) * cli : report advanced parameters information when compressing in very verbose mode (``-vv`) - force use of packed statements for arm platforms OBS-URL: https://build.opensuse.org/request/show/942801 OBS-URL: https://build.opensuse.org/package/show/Archiving/zstd?expand=0&rev=69 --- pzstd.1.patch | 24 ++++++++++++------------ zstd-1.5.0.tar.gz | 3 --- zstd-1.5.0.tar.gz.sig | 17 ----------------- zstd-1.5.1.tar.gz | 3 +++ zstd-1.5.1.tar.gz.sig | 17 +++++++++++++++++ zstd.changes | 26 ++++++++++++++++++++++++++ zstd.spec | 10 ++++++++-- 7 files changed, 66 insertions(+), 34 deletions(-) delete mode 100644 zstd-1.5.0.tar.gz delete mode 100644 zstd-1.5.0.tar.gz.sig create mode 100644 zstd-1.5.1.tar.gz create mode 100644 zstd-1.5.1.tar.gz.sig diff --git a/pzstd.1.patch b/pzstd.1.patch index dd97c28..5db1734 100644 --- a/pzstd.1.patch +++ b/pzstd.1.patch @@ -1,17 +1,17 @@ -Index: zstd-1.4.7/programs/zstd.1 +Index: zstd-1.5.1/programs/zstd.1 =================================================================== ---- zstd-1.4.7.orig/programs/zstd.1 -+++ zstd-1.4.7/programs/zstd.1 -@@ -223,6 +223,12 @@ Using environment variables to set param - .P - They can both be overridden by corresponding command line arguments: \fB\-#\fR for compression level and \fB\-T#\fR for number of compression threads\. - . -+.SH Parallel Zstd OPTIONS +--- zstd-1.5.1.orig/programs/zstd.1 ++++ zstd-1.5.1/programs/zstd.1 +@@ -147,6 +147,12 @@ If input directory contains "\.\.", the + .IP "\[ci]" 4 + \fB\-\-\fR: All arguments after \fB\-\-\fR are treated as files + .IP "" 0 ++.SS Parallel Zstd OPTIONS +Additional options for the pzstd utility +.TP -+.BR \-p ", " --processes ++\fB\-p\fR, \fB\-\-processes\fR + number of threads to use for (de)compression (default:4) +. - .SH "DICTIONARY BUILDER" - \fBzstd\fR offers \fIdictionary\fR compression, which greatly improves efficiency on small files and messages\. It\'s possible to train \fBzstd\fR with a set of samples, the result of which is saved into a file called a \fBdictionary\fR\. Then during compression and decompression, reference the same dictionary, using command \fB\-D dictionaryFileName\fR\. Compression of small files similar to the sample set will be greatly improved\. - . + .SS "Restricted usage of Environment Variables" + Using environment variables to set parameters has security implications\. Therefore, this avenue is intentionally restricted\. Only \fBZSTD_CLEVEL\fR and \fBZSTD_NBTHREADS\fR are currently supported\. They set the compression level and number of threads to use during compression, respectively\. + .P diff --git a/zstd-1.5.0.tar.gz b/zstd-1.5.0.tar.gz deleted file mode 100644 index 09aa2cb..0000000 --- a/zstd-1.5.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94 -size 1851389 diff --git a/zstd-1.5.0.tar.gz.sig b/zstd-1.5.0.tar.gz.sig deleted file mode 100644 index 10ed5d3..0000000 --- a/zstd-1.5.0.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJFBAADCAAvFiEETvSsY0VfyfRUXZt974/plSi1L/0FAmCetpsRHHNpZ25pbmdA -enN0ZC5uZXQACgkQ74/plSi1L/35IA/+K6cAjoErVr92dvObAAtXpel+5VBixWjE -fxC7c5PDc4iU/KX4I3Jy9UqaM89roYil0C80K69/5NUIYksr6KZ+Ky+8nNrfmJtn -bbXDF5xEpHuYZl3+0YQaRx85R+bVfe7Zg5BK9JiqRBAQ5ViQBtIeV8Qm52e9Y2qM -zqEqzOWQKnDQITry0vOntl2YDrNOt/LkL0g8jqJpgjpOaCeITbHelg4iH+GZswTo -Nzm4CKqtW6pmdiIfw8s4+/2jzjeGx4WqfoXgn/NHu00pbGjL7o5A0Aa97PX1qIrN -kj9edtt5yOcq68FqZvDnJLS72z1E/RbHabmqUH/gXhK80t/FA0OeB/Cqk8HheN8F -V5nXsJCjbLuu0uCRmdwWAqFK4yCBcEfC6zDs/K2kXdJsZ7sU9sACwRhOGp3JkUyB -9u17n3qLBlNcK13/1t7EJZ3F5hv+uXwfbttSSkKZ81b10S6+KgD7L0sVZT8HpUEO -B+uf3mxII/HU08AV1oAq9B12tJvcP9i/hNHCEmb11PMMVbXuIrBlE1Tcb8nB+Jlr -t9NL+lYdkZ36zxqZO7FVPoUSloPDWVRfaATY0Bde6DI27yCQzMV8XJ8a8+4yrrSN -Yybb2AJMvumP6vf1NZ1rwR84/ZjntCOM5B9KCKJE1IY5usRWAXP0Y447xPPKo/eZ -W/aDitqa1N8= -=BVY7 ------END PGP SIGNATURE----- diff --git a/zstd-1.5.1.tar.gz b/zstd-1.5.1.tar.gz new file mode 100644 index 0000000..222049d --- /dev/null +++ b/zstd-1.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e28b2f2ed5710ea0d3a1ecac3f6a947a016b972b9dd30242369010e5f53d7002 +size 1934669 diff --git a/zstd-1.5.1.tar.gz.sig b/zstd-1.5.1.tar.gz.sig new file mode 100644 index 0000000..50c5cba --- /dev/null +++ b/zstd-1.5.1.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJFBAADCgAvFiEETvSsY0VfyfRUXZt974/plSi1L/0FAmHBIyoRHHNpZ25pbmdA +enN0ZC5uZXQACgkQ74/plSi1L/0eYA/6AxWBhURFeDFWg+iS83skZEdTWe7xlp8a +8JXuGTxgfts9ZP/IVxi3q4hPCVdsS54Wo0OzMkfWsNxCl84nI3LHH1rP2TdCjHh/ +EEwYA4fuKCdV7JO9fTVhg1INTSaKAghh/0ZYcJYw+PQ0TTTBVPHx4cAMustGzI8F +nxQkjJltQAI14nkCsELXMZhYlFY7ytF4j9+kGM1ZzuJPmMi6AlmMYRUmHjCNKqgj +bWC4SSOayfB2CAgrDVC4Vs/gCkVEA/YNeIv0I9QfOlU1C9ogagFiRGpB0jwdUgbz +14nucSicYaCAkQLBxDxSe9iFWpIyaFE3BisrhxWIDJlsp7tHA2VtlqFdWye7MuIF +HYi/UfjutivGxvD9hJNIrrHv7KnzTNLCJ5/sJGT55DTV5BngUtMrBLoCEezkn/Qj +uLe2bsvVZpAO1eY22lE3Alg9NgzIy1JkdZ3zJSyG0HNGXs4ds3qOsKAIihFvl2tY +H+BAFEpN1sUbBsgKq/fEv+I9Jfjxp9vmbS41M72cKb2VelZbCKy4AispOlzTmoqU +VK7nZR8ur9dXIzijz1Yf51cAzF1SFFiqg+ffTjXQ3JC8bmGHzJoxR42vONdbwD3B +3jUX25Cifu08IRlgPlDd3dWmNu8jmeLE6XVIf1r5iKcQWL87hkQ0XtLy9AZG8KfT +ud6ml4p7RIQ= +=C+Ki +-----END PGP SIGNATURE----- diff --git a/zstd.changes b/zstd.changes index d3cd080..df1b954 100644 --- a/zstd.changes +++ b/zstd.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Mon Dec 27 14:59:02 UTC 2021 - Dirk Müller + +- update to 1.5.1: + * perf: rebalanced compression levels, to better match the intended speed/level curve + * perf: faster huffman decoder, using x64 assembly + * perf: slightly faster high speed modes (strategies fast & dfast) + * perf: improved binary size and faster compilation times + * perf: new row64 mode, used notably in level 12 + * perf: faster mid-level compression speed in presence of highly repetitive patterns + * perf: minor compression ratio improvements for small data at high levels + * perf: reduced stack usage (mostly useful for Linux Kernel) + * perf: faster compression speed on incompressible data + * perf: on-demand reduced ZSTD_DCtx state size, using build macro ZSTD_DECODER_INTERNAL_BUFFER, at a small cost of performance + * build: allows hiding static symbols in the dynamic library, using build macro + * build: support for m68k (Motorola 68000's) + * build: improved AIX support + * build: improved meson unofficial build + * cli : custom memory limit when training dictionary (#2925) + * cli : report advanced parameters information when compressing in very verbose mode (``-vv`) + ------------------------------------------------------------------- Fri May 14 20:34:25 UTC 2021 - Ismail Dönmez @@ -15,6 +36,11 @@ Tue May 11 18:28:45 UTC 2021 - Bernhard Wiedemann - Add zstd-1.4.9-Avoid-SIGBUS-on-armv6.patch to fix crashes when running armv6 userspace on armv8 64-bit kernels +------------------------------------------------------------------- +Mon May 10 16:09:04 UTC 2021 - Dirk Müller + +- force use of packed statements for arm platforms + ------------------------------------------------------------------- Thu Mar 4 01:36:14 UTC 2021 - Bernhard Wiedemann diff --git a/zstd.spec b/zstd.spec index da15b3a..b02f0d2 100644 --- a/zstd.spec +++ b/zstd.spec @@ -19,7 +19,7 @@ %define major 1 %define libname lib%{name}%{major} Name: zstd -Version: %{major}.5.0 +Version: %{major}.5.1 Release: 0 Summary: Zstandard compression tools License: BSD-3-Clause AND GPL-2.0-only @@ -47,6 +47,9 @@ compression than gzip. For roughly the same time, zstd achives a ~12%% better ratio than gzip. LZMA outperforms zstd by ~10%% faster compression for same ratio, or ~1–4%% size reduction for same time. + + + # This compression summary is based on https://lists.opensuse.org/opensuse-factory/2019-05/msg00344.html %package -n %{libname} @@ -89,7 +92,10 @@ Needed for compiling programs that link with the library. %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects export CFLAGS="%{optflags}" -export CXXFLAGS="%{optflags} -std=c++11" +%ifarch armv6l armv6hl +export CFLAGS+="-DMEM_FORCE_MEMORY_ACCESS=1" +%endif +export CXXFLAGS="$CFLAGS -std=c++11" # lib-mt is alias for multi-threaded library support %make_build -C lib lib-mt for dir in programs contrib/pzstd; do From 1fa54f8b2ff904fea848cff73c184ea284bdb6b8c9cb2b779f0d1b014085a95e Mon Sep 17 00:00:00 2001 From: Bernhard Wiedemann Date: Wed, 29 Dec 2021 04:41:25 +0000 Subject: [PATCH 2/4] revert likely leftover from https://github.com/facebook/zstd/issues/2632 OBS-URL: https://build.opensuse.org/package/show/Archiving/zstd?expand=0&rev=70 --- zstd.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/zstd.spec b/zstd.spec index b02f0d2..6b5f3c1 100644 --- a/zstd.spec +++ b/zstd.spec @@ -92,9 +92,6 @@ Needed for compiling programs that link with the library. %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects export CFLAGS="%{optflags}" -%ifarch armv6l armv6hl -export CFLAGS+="-DMEM_FORCE_MEMORY_ACCESS=1" -%endif export CXXFLAGS="$CFLAGS -std=c++11" # lib-mt is alias for multi-threaded library support %make_build -C lib lib-mt From 4929028b0cce140c9f87c52d447872901fb9a18644a94e2683e141b1039722b4 Mon Sep 17 00:00:00 2001 From: Bernhard Wiedemann Date: Wed, 29 Dec 2021 04:45:29 +0000 Subject: [PATCH 3/4] revert some more OBS-URL: https://build.opensuse.org/package/show/Archiving/zstd?expand=0&rev=71 --- zstd.changes | 5 ----- zstd.spec | 3 --- 2 files changed, 8 deletions(-) diff --git a/zstd.changes b/zstd.changes index df1b954..04d0a7d 100644 --- a/zstd.changes +++ b/zstd.changes @@ -36,11 +36,6 @@ Tue May 11 18:28:45 UTC 2021 - Bernhard Wiedemann - Add zstd-1.4.9-Avoid-SIGBUS-on-armv6.patch to fix crashes when running armv6 userspace on armv8 64-bit kernels -------------------------------------------------------------------- -Mon May 10 16:09:04 UTC 2021 - Dirk Müller - -- force use of packed statements for arm platforms - ------------------------------------------------------------------- Thu Mar 4 01:36:14 UTC 2021 - Bernhard Wiedemann diff --git a/zstd.spec b/zstd.spec index 6b5f3c1..f2dfccf 100644 --- a/zstd.spec +++ b/zstd.spec @@ -47,9 +47,6 @@ compression than gzip. For roughly the same time, zstd achives a ~12%% better ratio than gzip. LZMA outperforms zstd by ~10%% faster compression for same ratio, or ~1–4%% size reduction for same time. - - - # This compression summary is based on https://lists.opensuse.org/opensuse-factory/2019-05/msg00344.html %package -n %{libname} From 716ab318300c8396dcb9433f48891331412955740b0e8529a5cebd854736a8b9 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 3 Jan 2022 10:22:01 +0000 Subject: [PATCH 4/4] Accepting request 943548 from home:dirkmueller:Factory - fix pkgconfig pc file settings by passing in right prefix during build OBS-URL: https://build.opensuse.org/request/show/943548 OBS-URL: https://build.opensuse.org/package/show/Archiving/zstd?expand=0&rev=72 --- zstd.changes | 5 +++++ zstd.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/zstd.changes b/zstd.changes index 04d0a7d..68adb80 100644 --- a/zstd.changes +++ b/zstd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 3 09:18:49 UTC 2022 - Dirk Müller + +- fix pkgconfig pc file settings by passing in right prefix during build + ------------------------------------------------------------------- Mon Dec 27 14:59:02 UTC 2021 - Dirk Müller diff --git a/zstd.spec b/zstd.spec index f2dfccf..45fc6d2 100644 --- a/zstd.spec +++ b/zstd.spec @@ -1,7 +1,7 @@ # # spec file for package zstd # -# 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 @@ -91,7 +91,7 @@ Needed for compiling programs that link with the library. export CFLAGS="%{optflags}" export CXXFLAGS="$CFLAGS -std=c++11" # lib-mt is alias for multi-threaded library support -%make_build -C lib lib-mt +%make_build prefix=%{_prefix} libdir=%{_libdir} -C lib lib-mt for dir in programs contrib/pzstd; do %make_build -C "$dir" done @@ -103,7 +103,7 @@ export CXXFLAGS="%{optflags} -std=c++11" #make %{?_smp_mflags} -C contrib/pzstd test-pzstd %install -%make_install V=1 VERBOSE=1 PREFIX=%{_prefix} LIBDIR=%{_libdir} +%make_install V=1 VERBOSE=1 prefix=%{_prefix} libdir=%{_libdir} install -D -m755 contrib/pzstd/pzstd %{buildroot}%{_bindir}/pzstd install -D -m644 programs/zstd.1 %{buildroot}%{_mandir}/man1/pzstd.1