From 670726ba7614b4af9a1c17b65bfa83c33e2e8310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Sat, 22 Jan 2022 16:22:20 +0000
Subject: [PATCH] latest upstream (1.5.2)

---
 .gitignore    |  1 +
 pzstd.1.patch | 17 ++++++++---------
 sources       |  2 +-
 zstd.spec     | 19 ++++++++-----------
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9a46aab..f474108 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /zstd-1.4.9.tar.gz
 /zstd-1.5.0.tar.gz
 /zstd-1.5.1.tar.gz
+/zstd-1.5.2.tar.gz
diff --git a/pzstd.1.patch b/pzstd.1.patch
index d4e3a1f..30243d4 100644
--- a/pzstd.1.patch
+++ b/pzstd.1.patch
@@ -1,9 +1,9 @@
-diff -Naur zstd-1.5.1.orig/programs/zstd.1 zstd-1.5.1/programs/zstd.1
---- zstd-1.5.1.orig/programs/zstd.1	2021-12-20 22:49:18.000000000 +0000
-+++ zstd-1.5.1/programs/zstd.1	2021-12-22 16:49:17.160850340 +0000
-@@ -146,6 +146,14 @@
- \fB\-\-show\-default\-cparams\fR: Shows the default compression parameters that will be used for a particular src file\. If the provided src file is not a regular file (eg\. named pipe), the cli will just output the default parameters\. That is, the parameters that are used when the src size is unknown\.
- .IP "\[ci]" 4
+diff -Naur zstd-1.5.2.orig/programs/zstd.1 zstd-1.5.2/programs/zstd.1
+--- zstd-1.5.2.orig/programs/zstd.1	2022-01-20 21:17:18.000000000 +0000
++++ zstd-1.5.2/programs/zstd.1	2022-01-22 17:40:54.130314058 +0000
+@@ -214,6 +214,13 @@
+ .
+ .IP "\(bu" 4
  \fB\-\-\fR: All arguments after \fB\-\-\fR are treated as files
 +
 +.SH Parallel Zstd OPTIONS
@@ -12,7 +12,6 @@ diff -Naur zstd-1.5.1.orig/programs/zstd.1 zstd-1.5.1/programs/zstd.1
 +.BR \-p ", " --processes
 + number of threads to use for (de)compression (default:4)
 +
-+
+ .
  .IP "" 0
- .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\.
+ .
diff --git a/sources b/sources
index 8d53d3a..964fe72 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zstd-1.5.1.tar.gz) = 00c7f5f6f6a2b51557f3ede56026d54d8e023c85f9824496f4522524ce8ced495e88d56452e3510df6ec1bf53e659b2633cdcc84d016bcdbfdcc76e142d3620f
+SHA512 (zstd-1.5.2.tar.gz) = 96dbd2eb6623e3564a0fd36489b61bc3cb27758a584fdc9f064f3985d2e8b5605d7022890d00a6d15464d3cd0707d7e75d8cf6210323782d0af406b90a6d6784
diff --git a/zstd.spec b/zstd.spec
index 4b3e84a..330ddf5 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -1,3 +1,6 @@
+# enable asm implementations by default
+%bcond_without asm
+
 # enable .lz4 support by default
 %bcond_without lz4
 
@@ -20,18 +23,9 @@
 %endif
 %endif
 
-%ifarch x86_64
-%bcond_without asm
-%else
-# Disable asm to ensure non excutable stack
-# used on archs where asm not actually used
-# https://github.com/facebook/zstd/issues/2963
-%bcond_with asm
-%endif
-
 Name:           zstd
-Version:        1.5.1
-Release:        7%{?dist}
+Version:        1.5.2
+Release:        1%{?dist}
 Summary:        Zstd compression library
 
 License:        BSD and GPLv2
@@ -155,6 +149,9 @@ install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1
 %ldconfig_scriptlets -n lib%{name}
 
 %changelog
+* 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