From f0d571d4350708caa918703dbdb34b7e4385e6f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Mon, 13 Feb 2023 12:41:06 +0000
Subject: [PATCH] latest upstream (1.5.4)

---
 .gitignore       |  1 +
 enable-CET.patch | 38 --------------------------------------
 pzstd.1.patch    | 16 ++++++++--------
 sources          |  2 +-
 zstd.spec        |  9 +++++----
 5 files changed, 15 insertions(+), 51 deletions(-)
 delete mode 100644 enable-CET.patch

diff --git a/.gitignore b/.gitignore
index f474108..ed3ca1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /zstd-1.5.0.tar.gz
 /zstd-1.5.1.tar.gz
 /zstd-1.5.2.tar.gz
+/zstd-1.5.4.tar.gz
diff --git a/enable-CET.patch b/enable-CET.patch
deleted file mode 100644
index 335e95d..0000000
--- a/enable-CET.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From cd7620a730413a48843e175d34dc408c152f8125 Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hjl.tools@gmail.com>
-Date: Tue, 11 Jan 2022 07:28:25 -0800
-Subject: [PATCH] x86-64: Enable Intel CET
-
-Intel Control-flow Enforcement Technology (CET):
-
-https://en.wikipedia.org/wiki/Control-flow_integrity#Intel_Control-flow_Enforcement_Technology
-
-requires that on Linux, all linker input files are marked as CET enabled
-in .note.gnu.property section.  For high-level language source codes,
-.note.gnu.property section is added by compiler with the -fcf-protection
-option.  For assembly sources, include <cet.h> to add .note.gnu.property
-section.
----
- lib/common/portability_macros.h | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/lib/common/portability_macros.h b/lib/common/portability_macros.h
-index 627ef9eed4..6ac4b05510 100644
---- a/lib/common/portability_macros.h
-+++ b/lib/common/portability_macros.h
-@@ -128,4 +128,15 @@
- # define ZSTD_ENABLE_ASM_X86_64_BMI2 0
- #endif
- 
-+/*
-+ * For x86 ELF targets, add .note.gnu.property section for Intel CET in
-+ * assembly sources when CET is enabled.
-+ */
-+#if defined(__ELF__) && (defined(__x86_64__) || defined(__i386__)) \
-+    && defined(__has_include)
-+# if __has_include(<cet.h>)
-+#  include <cet.h>
-+# endif
-+#endif
-+
- #endif /* ZSTD_PORTABILITY_MACROS_H */
diff --git a/pzstd.1.patch b/pzstd.1.patch
index 30243d4..e6016c7 100644
--- a/pzstd.1.patch
+++ b/pzstd.1.patch
@@ -1,9 +1,9 @@
-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
+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,6 +12,6 @@ diff -Naur zstd-1.5.2.orig/programs/zstd.1 zstd-1.5.2/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:
diff --git a/sources b/sources
index 964fe72..1350cae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zstd-1.5.2.tar.gz) = 96dbd2eb6623e3564a0fd36489b61bc3cb27758a584fdc9f064f3985d2e8b5605d7022890d00a6d15464d3cd0707d7e75d8cf6210323782d0af406b90a6d6784
+SHA512 (zstd-1.5.4.tar.gz) = 2896a6dd6b60cc251720356babcbab6018c874eb2149121b26e28041496fc355a9cb5fd1b39c91558fcfbafb789b3d721264a0f9b5734f893d5f3cdf97016394
diff --git a/zstd.spec b/zstd.spec
index 69bdeb1..51dcbe9 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -14,8 +14,8 @@
 %bcond_without pzstd
 
 Name:           zstd
-Version:        1.5.2
-Release:        4%{?dist}
+Version:        1.5.4
+Release:        1%{?dist}
 Summary:        Zstd compression library
 
 License:        BSD and GPLv2
@@ -23,7 +23,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:         enable-CET.patch
 
 BuildRequires:  make
 BuildRequires:  gcc gtest-devel
@@ -71,7 +70,6 @@ find -name .gitignore -delete
 %if %{with pzstd}
 %patch1 -p1
 %endif
-%patch2 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -139,6 +137,9 @@ 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