diff --git a/dist b/dist new file mode 100644 index 0000000000000000000000000000000000000000..89c1faffc18349bb12eee2371e9dc43bf419b95c --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an9 diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..ee814dd1f0dc9afc32a9903d9a4384f36aaf1b44 --- /dev/null +++ b/download @@ -0,0 +1 @@ +4ff0ee1965ab161bc55be7c9dcd1f7f9 v1.5.5.tar.gz diff --git a/enable-CET.patch b/enable-CET.patch deleted file mode 100644 index 335e95d33cdaf55e2f2669c35f4e205b1e20eb05..0000000000000000000000000000000000000000 --- a/enable-CET.patch +++ /dev/null @@ -1,38 +0,0 @@ -From cd7620a730413a48843e175d34dc408c152f8125 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -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 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() -+# include -+# endif -+#endif -+ - #endif /* ZSTD_PORTABILITY_MACROS_H */ diff --git a/pzstd.1.patch b/pzstd.1.patch index d4e3a1f3589388c9c7988b5c5cf3bf67c8636d82..e6016c7de63327b410451828200ab0a0802ee053 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/zstd-1.5.1.tar.gz b/zstd-1.5.1.tar.gz deleted file mode 100644 index 27b00c83afe2c685929f34efcc55cdd7f71cf4bb..0000000000000000000000000000000000000000 Binary files a/zstd-1.5.1.tar.gz and /dev/null differ diff --git a/zstd.spec b/zstd.spec index 7722ae77b5ca7c7886ac350d467056ff9b435248..aae1cad28e42bfac8848998de128b977f4b64c46 100644 --- a/zstd.spec +++ b/zstd.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.2 +%define anolis_release .0.1 # enable .lz4 support by default %bcond_without lz4 @@ -35,16 +35,15 @@ %bcond_with gtest Name: zstd -Version: 1.5.1 -Release: 2%{anolis_release}%{?dist} +Version: 1.5.5 +Release: 1%{anolis_release}%{?dist} Summary: Zstd compression library License: BSD and GPLv2 URL: https://github.com/facebook/zstd -Source0: https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/v%{version}.tar.gz Patch1: pzstd.1.patch -Patch2: enable-CET.patch BuildRequires: make BuildRequires: gcc @@ -108,7 +107,6 @@ find -name .gitignore -delete %if %{with pzstd} %patch1 -p1 %endif -%patch2 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -182,11 +180,13 @@ install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1 %ldconfig_scriptlets -n lib%{name} %changelog -* Tue Nov 29 2022 Chang Gao - 1.5.1-2.0.2 +* Wed Oct 29 2025 Liwei Ge - 1.5.5-1.0.1 +- Add doc sub package - Disable execstack on loongarch64 architecture -* Tue Nov 29 2022 Liwei Ge - 1.5.1-2.0.1 -- Add doc sub package +* Fri Nov 01 2024 Jakub Martisko - 1.5.5-1 +- Rebase to 1.5.5 + Resolves: RHEL-62221 * Mon Feb 07 2022 Jakub Martisko - 1.5.1-2 - Add some basic gating tests