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

SPECS/qatlib.spec

@@ -4,7 +4,7 @@
 %global libusdm_soversion 0
 Name:             qatlib
 Version:          24.02.0
-Release:          1%{?dist}
+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.
@@ -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
@@ -132,55 +134,20 @@ exit 0
 %{_mandir}/man8/qat_init.sh.8*
 
 %changelog
-* Fri Jun 14 2024 Vladis Dronov <vdronov@redhat.com> - 24.02.0-1
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 24.02.0-3
-- Update to qatlib 24.02.0 (RHEL-40921)
+- Rebuilt for MSVSphere 10
-- Add zuc_sample to qatlib-tests package
-- Use proper SPDX license identifiers
-
-* Mon Nov 20 2023 Vladis Dronov <vdronov@redhat.com> - 23.11.0-1
-- Update to qatlib 23.11.0 (RHEL-15639)
-- Add chaining_sample to qatlib-tests package
-
-* Fri Mar 03 2023 Vladis Dronov <vdronov@redhat.com> - 23.02.0-1
-- Update to qatlib 23.02.0 (bz 2084227)
-
-* Fri Jul 22 2022 Vladis Dronov <vdronov@redhat.com> - 22.07.0-1
-- Update to qatlib 22.07 (bz 2040744)
-- Moved qat.service to separate rpm
-
-* Thu Nov 11 2021 Vladis Dronov <vdronov@redhat.com> - 21.11.0-1
-- Update to qatlib 21.11 (bz 2012939)
-- Add qatlib-tests package
-- Add OSCI testing harness
 
-* Mon Aug 16 2021 Vladis Dronov <vdronov@redhat.com> - 21.05.0-1
+* Wed Jun 26 2024 Vladis Dronov <vdronov@redhat.com> - 24.02.0-3
-- Update to qatlib 21.05 with openssl-3 support (bz 1920444, bz 1953498)
+- Fix Intel CET IBT instrumentation in assembly code (RHEL-20173)
-- Add documentation files to a package
+- Update a changelog entry
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 20.10.0-7
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 24.02.0-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Bump release for June 2024 mass rebuild
-  Related: rhbz#1991688
 
-* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 20.10.0-6
+* Fri Mar 22 2024 Vladis Dronov <vdronov@redhat.com> - 24.02.0-1
-- Rebuilt for RHEL 9 BETA for openssl 3.0
+- Update to qatlib 24.02.0 (RHEL-20173)
-  Related: rhbz#1971065
+- Add zuc_sample to qatlib-tests package
-
+- Use proper SPDX license identifiers
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 20.10.0-5
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 20.10.0-4
-- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20.10.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Dec  14 2020 Giovanni Cabiddu <giovanni.cabiddu@intel.com> - 20.10.0-2
-- Add ExcludeArch i686
-
-* Mon Nov  16 2020 Giovanni Cabiddu <giovanni.cabiddu@intel.com> - 20.10.0-1
-- Update to qatlib 20.10
-- Fixes to spec to address comments from Fedora review
 
-* Mon Aug  10 2020 Mateusz Polrola <mateuszx.potrola@intel.com> - 20.08.0-1
+* Fri Jan 26 2024 Vladis Dronov <vdronov@redhat.com> - 23.11.0-3
-- Initial version of the package
+- Initial import from Fedora 40