diff --git a/.gitignore b/.gitignore index a36ce69..5096dcb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qatlib-23.11.0.tar.gz +qatlib-24.02.0.tar.gz diff --git a/qatlib-drop-intel-ifdefs.patch b/qatlib-drop-intel-ifdefs.patch new file mode 100644 index 0000000..659b0fd --- /dev/null +++ b/qatlib-drop-intel-ifdefs.patch @@ -0,0 +1,34 @@ +Drop Intel build system specific ifdefs (INTEL_CET_ENABLED and AS_FEATURE_LEVEL) since +they do not exist in the RHEL build system. + +While we have __CET__ for cf-protection-enabled builds, we cannot pass it to "nasm" as it +is noted by the "--cf-protection" token in CFLAGS. So enable cf-protection for assembly +files unconditionally. + +--- ./quickassist/lookaside/access_layer/src/common/compression/reg_sizes.asm.orig 2024-06-29 16:01:35.806838838 +0200 ++++ ./quickassist/lookaside/access_layer/src/common/compression/reg_sizes.asm 2024-06-29 16:03:38.883926951 +0200 +@@ -195,20 +195,16 @@ + + %define XWORD(reg) reg %+ x + +-%ifdef INTEL_CET_ENABLED +- %ifdef __NASM_VER__ +- %if AS_FEATURE_LEVEL >= 10 +- %ifidn __OUTPUT_FORMAT__,elf32 ++%ifdef __NASM_VER__ ++ %ifidn __OUTPUT_FORMAT__,elf32 + section .note.gnu.property note alloc noexec align=4 + DD 0x00000004,0x0000000c,0x00000005,0x00554e47 + DD 0xc0000002,0x00000004,0x00000003 +- %endif +- %ifidn __OUTPUT_FORMAT__,elf64 ++ %endif ++ %ifidn __OUTPUT_FORMAT__,elf64 + section .note.gnu.property note alloc noexec align=8 + DD 0x00000004,0x00000010,0x00000005,0x00554e47 + DD 0xc0000002,0x00000004,0x00000003,0x00000000 +- %endif +- %endif + %endif + %endif + diff --git a/SPECS/qatlib.spec b/qatlib.spec similarity index 76% rename from SPECS/qatlib.spec rename to qatlib.spec index f19743f..2236a82 100644 --- a/SPECS/qatlib.spec +++ b/qatlib.spec @@ -3,12 +3,12 @@ %global libqat_soversion 4 %global libusdm_soversion 0 Name: qatlib -Version: 23.11.0 -Release: 1%{?dist} +Version: 24.02.0 +Release: 3%{?dist} Summary: Intel QuickAssist user space library # The entire source code is released under BSD. # For a breakdown of inbound licenses see the INSTALL file. -License: BSD and (BSD or GPLv2) +License: BSD-3-Clause AND ( BSD-3-Clause OR GPL-2.0-only ) URL: https://github.com/intel/%{name} Source0: https://github.com/intel/%{name}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: systemd gcc make autoconf automake libtool systemd-devel openssl-devel zlib-devel nasm @@ -17,6 +17,8 @@ Recommends: qatlib-service # https://bugzilla.redhat.com/show_bug.cgi?id=1897661 ExcludeArch: %{arm} aarch64 %{power64} s390x i686 +Patch1: qatlib-drop-intel-ifdefs.patch + %description Intel QuickAssist Technology (Intel QAT) provides hardware acceleration for offloading security, authentication and compression services from the @@ -119,6 +121,7 @@ exit 0 %attr(0754,-,qat) %{_bindir}/prime_sample %attr(0754,-,qat) %{_bindir}/hkdf_sample %attr(0754,-,qat) %{_bindir}/ec_montedwds_sample +%attr(0754,-,qat) %{_bindir}/zuc_sample %{_datadir}/qat/calgary %{_datadir}/qat/calgary32 %{_datadir}/qat/canterbury @@ -131,37 +134,17 @@ exit 0 %{_mandir}/man8/qat_init.sh.8* %changelog -* Mon Nov 20 2023 Vladis Dronov - 23.11.0-1 -- Update to qatlib 23.11.0 (RHEL-15641) -- Add chaining_sample to qatlib-tests package +* Wed Jun 26 2024 Vladis Dronov - 24.02.0-3 +- Fix Intel CET IBT instrumentation in assembly code (RHEL-20173) +- Update a changelog entry -* Fri Mar 03 2023 Vladis Dronov - 23.02.0-1 -- Update to qatlib 23.02.0 (bz 2084283) +* Mon Jun 24 2024 Troy Dawson - 24.02.0-2 +- Bump release for June 2024 mass rebuild -* Fri Jul 22 2022 Vladis Dronov - 22.07.0-1 -- Update to qatlib 22.07 (bz 2040743) -- Moved qat.service to separate rpm +* Fri Mar 22 2024 Vladis Dronov - 24.02.0-1 +- Update to qatlib 24.02.0 (RHEL-20173) +- Add zuc_sample to qatlib-tests package +- Use proper SPDX license identifiers -* Thu Nov 11 2021 Vladis Dronov - 21.11.0-1 -- Update to qatlib 21.11 (bz 1960303) -- Add qatlib-tests package -- Add OSCI testing harness - -* Fri Aug 27 2021 Vladis Dronov - 21.05.0-2 -- Add documentation files to the main package - -* Tue Jun 8 2021 Vladis Dronov - 21.05.0-1 -- Update to qatlib 21.05 (bz 1920237) - -* Tue Feb 9 2021 Vladis Dronov - 20.10.0-3 -- Add OSCI testing harness (bz 1907482) - -* Mon Dec 14 2020 Giovanni Cabiddu - 20.10.0-2 -- Add ExcludeArch i686 - -* Mon Nov 16 2020 Giovanni Cabiddu - 20.10.0-1 -- Update to qatlib 20.10 -- Fixes to spec to address comments from Fedora review - -* Mon Aug 10 2020 Mateusz Polrola - 20.08.0-1 -- Initial version of the package +* Fri Jan 26 2024 Vladis Dronov - 23.11.0-3 +- Initial import from Fedora 40 diff --git a/sources b/sources new file mode 100644 index 0000000..0effe4b --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (qatlib-24.02.0.tar.gz) = 34008396f1f8631d31e0f62b7192cff216dfe9a5ed9a02db9dc09d876b34b5daa7712c3f9679d949b25db35334a592770468dd808a0f5bd871274b84fa7ef3c2