import CS zstd-1.5.5-1.el9

.gitignore

@@ -1 +1 @@
-SOURCES/zstd-1.5.1.tar.gz
+SOURCES/zstd-1.5.5.tar.gz

.zstd.metadata

@@ -1 +1 @@
-e6a51ef3f7d5be5b74ac74d88bf3850057e00adb SOURCES/zstd-1.5.1.tar.gz
+4479ecc74300d23391d99fbebf2fddd47aed9b28 SOURCES/zstd-1.5.5.tar.gz

SOURCES/enable-CET.patch

@@ -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 */

SOURCES/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:

SPECS/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