diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b6b4b7e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/zstd-1.5.1.tar.gz diff --git a/.zstd.metadata b/.zstd.metadata new file mode 100644 index 0000000..5cbafc0 --- /dev/null +++ b/.zstd.metadata @@ -0,0 +1 @@ +e6a51ef3f7d5be5b74ac74d88bf3850057e00adb SOURCES/zstd-1.5.1.tar.gz diff --git a/SOURCES/enable-CET.patch b/SOURCES/enable-CET.patch new file mode 100644 index 0000000..335e95d --- /dev/null +++ b/SOURCES/enable-CET.patch @@ -0,0 +1,38 @@ +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/SOURCES/pzstd.1.patch b/SOURCES/pzstd.1.patch new file mode 100644 index 0000000..d4e3a1f --- /dev/null +++ b/SOURCES/pzstd.1.patch @@ -0,0 +1,18 @@ +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 + \fB\-\-\fR: All arguments after \fB\-\-\fR are treated as files ++ ++.SH Parallel Zstd OPTIONS ++Additional options for the pzstd utility ++.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\. diff --git a/SPECS/zstd.spec b/SPECS/zstd.spec new file mode 100644 index 0000000..23ec4fc --- /dev/null +++ b/SPECS/zstd.spec @@ -0,0 +1,301 @@ +# enable .lz4 support by default +%bcond_without lz4 + +# enable .xz/.lzma support by default +%bcond_without lzma + +# enable .gz support by default +%bcond_without zlib + +%if 0%{?rhel} && 0%{?rhel} <= 6 +# gcc-4.4 is currently too old to compile pzstd +%bcond_with pzstd +%else +%ifarch %{ix86} x86_64 +%bcond_without pzstd +%else +# aarch64 and armv7hl at least currently segfault +# in ThreadPool test for the pzstd util +%bcond_with pzstd +%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 + +# Disable gtest +%bcond_with gtest + +Name: zstd +Version: 1.5.1 +Release: 2%{?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 + +Patch1: pzstd.1.patch +Patch2: enable-CET.patch + +BuildRequires: make +BuildRequires: gcc +%if %{with gtest} +BuildRequires: gtest-devel +%endif +%if %{with lz4} +BuildRequires: lz4-devel +%endif +%if %{with lzma} +BuildRequires: xz-devel +%endif +%if %{with pzstd} +BuildRequires: gcc-c++ +%endif +%if %{with zlib} +BuildRequires: zlib-devel +%endif +BuildRequires: execstack + +%description +Zstd, short for Zstandard, is a fast lossless compression algorithm, +targeting real-time compression scenarios at zlib-level compression ratio. + +%package -n lib%{name} +Summary: Zstd shared library + +%description -n lib%{name} +Zstandard compression shared library. + +%package -n lib%{name}-devel +Summary: Header files for Zstd library +Requires: lib%{name}%{?_isa} = %{version}-%{release} + +%package -n lib%{name}-static +Summary: Static variant of the Zstd library +Requires: lib%{name}-devel = %{version}-%{release} + +%description -n lib%{name}-devel +Header files for Zstd library. + +%description -n lib%{name}-static +Static variant of the Zstd library. + +%prep +%setup -q +find -name .gitignore -delete +%if %{with pzstd} +%patch1 -p1 +%endif +%patch2 -p1 + +%build +export CFLAGS="$RPM_OPT_FLAGS" +export LDFLAGS="$RPM_LD_FLAGS" +export PREFIX="%{_prefix}" +export LIBDIR="%{_libdir}" +%make_build -C lib lib-mt %{!?with_asm:ZSTD_NO_ASM=1} +%make_build -C programs %{!?with_asm:ZSTD_NO_ASM=1} +%if %{with pzstd} +export CXXFLAGS="$RPM_OPT_FLAGS" +%make_build -C contrib/pzstd %{!?with_asm:ZSTD_NO_ASM=1} +%endif + +%check +execstack lib/libzstd.so.1 + +export CFLAGS="$RPM_OPT_FLAGS" +export LDFLAGS="$RPM_LD_FLAGS" +make -C tests test-zstd +%if %{with pzstd} +%if %{with gtest} +export CXXFLAGS="$RPM_OPT_FLAGS" +make -C contrib/pzstd test +%endif +%endif + +%install +%make_install PREFIX=%{_prefix} LIBDIR=%{_libdir} +%if %{with pzstd} +install -D -m755 contrib/pzstd/pzstd %{buildroot}%{_bindir}/pzstd +install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1 +%endif + +%files +%doc CHANGELOG README.md +%{_bindir}/%{name} +%if %{with pzstd} +%{_bindir}/p%{name} +%{_mandir}/man1/p%{name}.1* +%endif +%{_bindir}/%{name}mt +%{_bindir}/un%{name} +%{_bindir}/%{name}cat +%{_bindir}/%{name}grep +%{_bindir}/%{name}less +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/un%{name}.1* +%{_mandir}/man1/%{name}cat.1* +%{_mandir}/man1/%{name}grep.1* +%{_mandir}/man1/%{name}less.1* +%license COPYING LICENSE + +%files -n lib%{name} +%{_libdir}/libzstd.so.* +%license COPYING LICENSE + +%files -n lib%{name}-devel +%{_includedir}/zdict.h +%{_includedir}/zstd.h +%{_includedir}/zstd_errors.h +%{_libdir}/pkgconfig/libzstd.pc +%{_libdir}/libzstd.so + +%files -n lib%{name}-static +%{_libdir}/libzstd.a + +%ldconfig_scriptlets -n lib%{name} + +%changelog +* Mon Feb 07 2022 Jakub Martisko - 1.5.1-2 +- Add some basic gating tests + Resolves: rhbz#2050272 + +* Wed Jan 12 2022 Michel Alexandre Salim - 1.5.1-1 +- Rebase to the latest upstream version +- Enable optional gz, xz/lzma, and lz4 support in the zstd tool +- Disable amd64 assembly on non-x86_64 architectures (rhbz#2035802) + this should avoid the issue where an executable stack is created +- Re-enable CET protections (rhbz#2039353) + Resolves: rhbz#2039488 + +* Tue Aug 10 2021 Mohan Boddu - 1.5.0-2 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Mon Jul 12 2021 Jakub Martisko - 1.5.0-1 +* Rebase to the latest upstream version +Resolves: rhbz#1928094 + +* Thu Jul 01 2021 Jakub Martisko - 1.4.9-3 +- Drop gtest-devel dependency +Resolves: rhbz#1977606 + +* Fri Apr 16 2021 Mohan Boddu - 1.4.9-2 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Fri Mar 05 2021 Pádraig Brady - 1.4.9-1 +- Latest upstream + +* Thu Jan 28 2021 Fedora Release Engineering - 1.4.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Dec 17 2020 Pádraig Brady - 1.4.7-1 +- Latest upstream + +* Wed Aug 26 2020 Jeff Law - 1.4.5-6 +- Do not force C++11 mode + +* Wed Jul 29 2020 Fedora Release Engineering - 1.4.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Igor Raits - 1.4.5-4 +- Build libzstd with multi-threading support + +* Mon May 25 2020 Pádraig Brady - 1.4.5-3 +- Build shared library with correct compiler flags + +* Fri May 22 2020 Pádraig Brady - 1.4.5-1 +- Latest upstream + +* Fri May 22 2020 Avi Kivity - 1.4.4-3 +- Added static library subpackage + +* Fri Jan 31 2020 Fedora Release Engineering - 1.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jan 15 2020 Pádraig Brady - 1.4.4-1 +- Latest upstream + +* Wed Jul 31 2019 Pádraig Brady - 1.4.2-1 +- Latest upstream + +* Sat Jul 27 2019 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Apr 29 2019 Pádraig Brady - 1.4.0-1 +- Latest upstream + +* Sun Feb 03 2019 Fedora Release Engineering - 1.3.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Dec 31 2018 Pádraig Brady - 1.3.8-1 +- Latest upstream + +* Mon Oct 08 2018 Pádraig Brady - 1.3.6-1 +- Latest upstream + +* Sat Jul 14 2018 Fedora Release Engineering - 1.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 02 2018 Pádraig Brady - 1.3.5.1 +- Latest upstream + +* Wed Mar 28 2018 Pádraig Brady - 1.3.4-1 +- Latest upstream + +* Fri Feb 09 2018 Fedora Release Engineering - 1.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Feb 02 2018 Igor Gnatenko - 1.3.3-2 +- Switch to %%ldconfig_scriptlets + +* Thu Dec 21 2017 Pádraig Brady - 1.3.3-1 +- Latest upstream + +* Fri Nov 10 2017 Pádraig Brady - 1.3.2-1 +- Latest upstream + +* Mon Aug 21 2017 Pádraig Brady - 1.3.1-1 +- Latest upstream + +* Thu Aug 03 2017 Fedora Release Engineering - 1.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sun Jul 16 2017 Pádraig Brady - 1.3.0-1 +- Latest upstream + +* Mon May 08 2017 Pádraig Brady - 1.2.0-1 +- Latest upstream + +* Mon Mar 06 2017 Pádraig Brady - 1.1.3-1 +- Latest upstream + +* Sat Feb 11 2017 Fedora Release Engineering - 1.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Nov 02 2016 Pádraig Brady - 1.1.1-1 +- Latest upstream + +* Thu Oct 6 2016 Pádraig Brady 1.1.0-2 +- Add pzstd(1) + +* Thu Sep 29 2016 Pádraig Brady 1.1.0-1 +- New upstream release +- Remove examples and static lib + +* Mon Sep 12 2016 Pádraig Brady 1.0.0-2 +- Adjust various upstream links +- Parameterize various items in spec file + +* Mon Sep 5 2016 Pádraig Brady 1.0.0-1 +- Initial release