From 65ac97bcf256b0440e458769fae5d197fd761c18 Mon Sep 17 00:00:00 2001
From: Jakub Martisko <jamartis@redhat.com>
Date: Fri, 1 Nov 2024 16:18:12 +0100
Subject: [PATCH] Rebase to zstd 1.5.5

Resolves: RHEL-62221
---
 .gitignore    |  1 +
 pzstd.1.patch | 15 +++++++--------
 sources       |  2 +-
 zstd.spec     | 10 ++++++----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9a46aab..0d8f385 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.5.tar.gz
diff --git a/pzstd.1.patch b/pzstd.1.patch
index d4e3a1f..e6016c7 100644
--- a/pzstd.1.patch
+++ b/pzstd.1.patch
@@ -1,8 +1,8 @@
-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\.
+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
 +
@@ -11,8 +11,7 @@ diff -Naur zstd-1.5.1.orig/programs/zstd.1 zstd-1.5.1/programs/zstd.1
 +.TP
 +.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\.
+ .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 8d53d3a..076932c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zstd-1.5.1.tar.gz) = 00c7f5f6f6a2b51557f3ede56026d54d8e023c85f9824496f4522524ce8ced495e88d56452e3510df6ec1bf53e659b2633cdcc84d016bcdbfdcc76e142d3620f
+SHA512 (zstd-1.5.5.tar.gz) = 99109ec0e07fa65c2101c9cb36be56b672bbd0ee69d265f924718e61f9192ae8385c8d9e4d0c318be9edfa6d849fd3d60e5f164fa120961449429ea3c5dab6b6
diff --git a/zstd.spec b/zstd.spec
index 23ec4fc..ed94638 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -33,8 +33,8 @@
 %bcond_with gtest
 
 Name:           zstd
-Version:        1.5.1
-Release:        2%{?dist}
+Version:        1.5.5
+Release:        1%{?dist}
 Summary:        Zstd compression library
 
 License:        BSD and GPLv2
@@ -42,7 +42,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
@@ -93,7 +92,6 @@ find -name .gitignore -delete
 %if %{with pzstd}
 %patch1 -p1
 %endif
-%patch2 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -163,6 +161,10 @@ install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1
 %ldconfig_scriptlets -n lib%{name}
 
 %changelog
+* Fri Nov 01 2024 Jakub Martisko <jamartis@redhat.com> - 1.5.5-1
+- Rebase to 1.5.5
+  Resolves: RHEL-62221
+
 * Mon Feb 07 2022 Jakub Martisko <jamartis@redhat.com> - 1.5.1-2
 - Add some basic gating tests
   Resolves: rhbz#2050272