revert update to 1.5.6

rpm (4.11) is complaining about:

  extracting debug info from /builddir/build/BUILDROOT/zstd-1.5.6-1.el7.x86_64/usr/lib64/libzstd.so.1.5.6
  /usr/lib/rpm/debugedit: canonicalization unexpectedly shrank by one character

This was only addressed in rpm >= 4.13,
so lets avoid the double slash hunt as described in:
https://bugzilla.redhat.com/show_bug.cgi?id=304121

We can address if a newer zstd is explicitly requested for centos 7

.gitignore

@@ -14,3 +14,10 @@
 /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
+/zstd-1.5.5.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
+diff -Naur zstd-1.5.4/programs/zstd.1 zstd-1.5.4.new/programs/zstd.1
---- zstd-1.4.5.orig/programs/zstd.1	2020-05-22 05:04:00.000000000 +0000
+--- zstd-1.5.4/programs/zstd.1	2023-02-10 00:41:50.000000000 +0000
-+++ zstd-1.4.5/programs/zstd.1	2020-05-22 13:01:37.443798417 +0000
++++ zstd-1.5.4.new/programs/zstd.1	2023-02-13 12:44:01.575160149 +0000
-@@ -202,6 +202,14 @@
+@@ -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 "\(bu" 4
+ .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.5.tar.gz) = 99109ec0e07fa65c2101c9cb36be56b672bbd0ee69d265f924718e61f9192ae8385c8d9e4d0c318be9edfa6d849fd3d60e5f164fa120961449429ea3c5dab6b6

zstd.spec

@@ -11,9 +11,12 @@
 %endif
 %endif
 
+# Support disabling ASM implementations
+%bcond_without asm
+
 Name:           zstd
-Version:        1.4.5
+Version:        1.5.5
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Zstd compression library
 
 License:        BSD and GPLv2
@@ -21,7 +24,6 @@ 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:  gcc gtest-devel
 %if %{with pzstd}
@@ -58,17 +60,18 @@ find -name .gitignore -delete
 %if %{with pzstd}
 %patch1 -p1
 %endif
-%patch2 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export LDFLAGS="$RPM_LD_FLAGS"
+export PREFIX="%{_prefix}"
+export LIBDIR="%{_libdir}"
 for dir in lib programs; do
-  %make_build -C "$dir"
+  %make_build -C "$dir" %{!?with_asm:ZSTD_NO_ASM=1}
 done
 %if %{with pzstd}
 export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11"
-%make_build -C contrib/pzstd
+%make_build -C contrib/pzstd %{!?with_asm:ZSTD_NO_ASM=1}
 %endif
 
 %check
@@ -111,7 +114,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 +126,37 @@ install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1
 %ldconfig_scriptlets -n lib%{name}
 
 %changelog
+* Wed Apr 05 2023 Pádraig Brady <P@draigBrady.com> - 1.5.5-1
+- Latest upstream
+
+* Mon Feb 13 2023 Pádraig Brady <P@draigBrady.com> - 1.5.4-1
+- Latest upstream
+
+* Sat Jan 22 2022 Pádraig Brady <P@draigBrady.com> - 1.5.2-1
+- Latest upstream
+
+* 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
+
+* Sun May 16 2021 Pádraig Brady <P@draigBrady.com> - 1.5.0-1
+- Latest upstream
+
+* Fri Mar 05 2021 Pádraig Brady <P@draigBrady.com> - 1.4.9-1
+- Latest upstream
+
+* Thu Dec 17 2020 Pádraig Brady <P@draigBrady.com> - 1.4.7-1
+- Latest upstream
+
 * Mon May 25 2020 Pádraig Brady <P@draigBrady.com> - 1.4.5-3
 - Build shared library with correct compiler flags