latest upstream (1.5.4)

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -14,3 +14,9 @@
 /zstd-1.4.2.tar.gz
 /zstd-1.4.4.tar.gz
 /zstd-1.4.5.tar.gz
+/zstd-1.4.7.tar.gz
+/zstd-1.4.9.tar.gz
+/zstd-1.5.0.tar.gz
+/zstd-1.5.1.tar.gz
+/zstd-1.5.2.tar.gz
+/zstd-1.5.4.tar.gz

lib-make.patch

@@ -1,20 +0,0 @@
-diff -Naur zstd-1.4.5.orig/lib/Makefile zstd-1.4.5/lib/Makefile
---- zstd-1.4.5.orig/lib/Makefile	2020-05-22 05:04:00.000000000 +0000
-+++ zstd-1.4.5/lib/Makefile	2020-05-25 14:11:28.947300726 +0000
-@@ -220,13 +220,14 @@
- .PHONY: lib
- lib : libzstd.a libzstd
- 
--.PHONY: lib-mt
-+# note : do not define lib-mt or lib-release as .PHONY
-+# make does not consider implicit pattern rule for .PHONY target
-+
- %-mt : CPPFLAGS += -DZSTD_MULTITHREAD
- %-mt : LDFLAGS  += -pthread
- %-mt : %
- 	@echo multi-threading build completed
- 
--.PHONY: lib-release
- %-release : DEBUGFLAGS :=
- %-release : %
- 	@echo release build completed

pzstd.1.patch

@@ -1,9 +1,9 @@
-diff -Naur zstd-1.4.5.orig/programs/zstd.1 zstd-1.4.5/programs/zstd.1
---- zstd-1.4.5.orig/programs/zstd.1	2020-05-22 05:04:00.000000000 +0000
-+++ zstd-1.4.5/programs/zstd.1	2020-05-22 13:01:37.443798417 +0000
-@@ -202,6 +202,14 @@
- .
- .IP "\(bu" 4
+diff -Naur zstd-1.5.4/programs/zstd.1 zstd-1.5.4.new/programs/zstd.1
+--- zstd-1.5.4/programs/zstd.1	2023-02-10 00:41:50.000000000 +0000
++++ zstd-1.5.4.new/programs/zstd.1	2023-02-13 12:44:01.575160149 +0000
+@@ -162,6 +162,13 @@
+ \fB\-\-show\-default\-cparams\fR: shows the default compression parameters that will be used for a particular input file, based on the provided compression level and the input size\. If the provided file is not a regular file (e\.g\. a pipe), this flag will output the parameters used for inputs of unknown size\.
+ .IP "\[ci]" 4
  \fB\-\-\fR: All arguments after \fB\-\-\fR are treated as files
 +
 +.SH Parallel Zstd OPTIONS
@@ -12,7 +12,6 @@ diff -Naur zstd-1.4.5.orig/programs/zstd.1 zstd-1.4.5/programs/zstd.1
 +.BR \-p ", " --processes
 + number of threads to use for (de)compression (default:4)
 +
-+
- .
  .IP "" 0
- .
+ .SS "gzip Operation Modifiers"
+ When invoked via a \fBgzip\fR symlink, \fBzstd\fR will support further options that intend to mimic the \fBgzip\fR behavior:

sources

@@ -1 +1 @@
-SHA512 (zstd-1.4.5.tar.gz) = 417b813ade6c8436690bd9d6da34a9f87f50e7378752b72e63066befbee496392a4b72896fa56688d814f461871ab31d3c6637497ff2ed7a282d58513631a38b
+SHA512 (zstd-1.5.4.tar.gz) = 2896a6dd6b60cc251720356babcbab6018c874eb2149121b26e28041496fc355a9cb5fd1b39c91558fcfbafb789b3d721264a0f9b5734f893d5f3cdf97016394

zstd.spec

@@ -1,19 +1,21 @@
-%if 0%{?rhel} && 0%{?rhel} <= 6
-# gcc-4.4 is currently too old to compile pzstd
-%bcond_with pzstd
-%else
-%ifarch %{ix86} x86_64
+# enable asm implementations by default
+%bcond_without asm
+
+# enable .lz4 support by default
+%bcond_without lz4
+
+# enable .xz/.lzma support by default
+%bcond_without lzma
+
+# enable .gz support by default
+%bcond_without zlib
+
+# enable pzstd support by default
 %bcond_without pzstd
-%else
-# aarch64 and armv7hl at least currently segfault
-# in ThreadPool test for the pzstd util
-%bcond_with pzstd
-%endif
-%endif
 
 Name:           zstd
-Version:        1.4.5
-Release:        3%{?dist}
+Version:        1.5.4
+Release:        1%{?dist}
 Summary:        Zstd compression library
 
 License:        BSD and GPLv2
@@ -21,12 +23,22 @@ URL:            https://github.com/facebook/zstd
 Source0:        https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 Patch1:         pzstd.1.patch
-Patch2:         lib-make.patch
 
+BuildRequires:  make
 BuildRequires:  gcc gtest-devel
+%if %{with lz4}
+BuildRequires:  lz4-devel
+%endif
+%if %{with lzma}
+BuildRequires:  xz-devel
+%endif
 %if %{with pzstd}
 BuildRequires:  gcc-c++
 %endif
+%if %{with zlib}
+BuildRequires:  zlib-devel
+%endif
+BuildRequires:  execstack
 
 %description
 Zstd, short for Zstandard, is a fast lossless compression algorithm,
@@ -58,25 +70,27 @@ find -name .gitignore -delete
 %if %{with pzstd}
 %patch1 -p1
 %endif
-%patch2 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export LDFLAGS="$RPM_LD_FLAGS"
-for dir in lib programs; do
-  %make_build -C "$dir"
-done
+export PREFIX="%{_prefix}"
+export LIBDIR="%{_libdir}"
+%make_build -C lib lib-mt %{!?with_asm:ZSTD_NO_ASM=1}
+%make_build -C programs %{!?with_asm:ZSTD_NO_ASM=1}
 %if %{with pzstd}
-export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11"
-%make_build -C contrib/pzstd
+export CXXFLAGS="$RPM_OPT_FLAGS"
+%make_build -C contrib/pzstd %{!?with_asm:ZSTD_NO_ASM=1}
 %endif
 
 %check
+execstack lib/libzstd.so.1
+
 export CFLAGS="$RPM_OPT_FLAGS"
 export LDFLAGS="$RPM_LD_FLAGS"
 make -C tests test-zstd
 %if %{with pzstd}
-export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11"
+export CXXFLAGS="$RPM_OPT_FLAGS"
 make -C contrib/pzstd test
 %endif
 
@@ -111,7 +125,6 @@ install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1
 %license COPYING LICENSE
 
 %files -n lib%{name}-devel
-%{_includedir}/zbuff.h
 %{_includedir}/zdict.h
 %{_includedir}/zstd.h
 %{_includedir}/zstd_errors.h
@@ -124,6 +137,67 @@ install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1
 %ldconfig_scriptlets -n lib%{name}
 
 %changelog
+* Mon Feb 13 2023 Pádraig Brady <P@draigBrady.com> - 1.5.4-1
+- Latest upstream
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu May 19 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 1.5.2-2
+- ThreadPool segfault fixed so build pzst everywhere
+
+* Sat Jan 22 2022 Pádraig Brady <P@draigBrady.com> - 1.5.2-1
+- Latest upstream
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Jan 11 2022 Pádraig Brady <P@draigBrady.com> - 1.5.1-6
+- Re-enable CET protections (#2039353)
+
+* Fri Jan 07 2022 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.5.1-5
+- Enable gz, .xz/.lzma and .lz4 support
+
+* Mon Jan 03 2022 Pádraig Brady <P@draigBrady.com> - 1.5.1-4
+- Use correct prefix for pkgconfig.
+
+* Wed Dec 29 2021 Pádraig Brady <P@draigBrady.com> - 1.5.1-3
+- Avoid executable stack on i686 also.
+
+* Tue Dec 28 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.5.1-2
+- Disable amd64 assembly on non-intel architectures (#2035802):
+  this should avoid the issue where an executable stack is created.
+
+* Wed Dec 22 2021 Pádraig Brady <P@draigBrady.com> - 1.5.1-1
+- Latest upstream
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sun May 16 2021 Pádraig Brady <P@draigBrady.com> - 1.5.0-2
+- Latest upstream
+
+* Fri Mar 05 2021 Pádraig Brady <P@draigBrady.com> - 1.4.9-1
+- Latest upstream
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Dec 17 2020 Pádraig Brady <P@draigBrady.com> - 1.4.7-1
+- Latest upstream
+
+* Wed Aug 26 2020 Jeff Law <law@redhat.com> - 1.4.5-6
+- Do not force C++11 mode
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 11 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.4.5-4
+- Build libzstd with multi-threading support
+
 * Mon May 25 2020 Pádraig Brady <P@draigBrady.com> - 1.4.5-3
 - Build shared library with correct compiler flags