7 changed files with 84 additions and 29 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/qatengine-1.4.0.tar.gz
+/qatengine-*.tar.gz
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/SPECS/qatengine.spec
+++ b/SPECS/qatengine.spec
@ -1,17 +1,25 @@
 # SPDX-License-Identifier: MIT

+# Build as an OpenSSL provider instead of as an engine
+%bcond provider %[0%{?fedora} >= 41 || 0%{?rhel} >= 10]
+# QAT_HW only acceleration for RHEL
+%bcond sw %{undefined rhel}
+
 # Define the directory where the OpenSSL engines are installed
+%if %{with provider}
+%global modulesdir %(pkg-config --variable=modulesdir libcrypto)
+%else
 %global enginesdir %(pkg-config --variable=enginesdir libcrypto)
+%endif

 Name:           qatengine
-Version:        1.4.0
+Version:        1.7.0
 Release:        1%{?dist}
 Summary:        Intel QuickAssist Technology (QAT) OpenSSL Engine

 # Most of the source code is BSD, with the following exceptions:
 #  - e_qat.txt, e_qat_err.c, and e_qat_err.h are OpenSSL
-#  - qat/config/* are (BSD or GPLv2), but are not used during compilation
-#  - qat_contig_mem/* are GPLv2, but are not used during compilation
+#  - qat_hw_config/* are (BSD or GPLv2), but are not used during compilation
 License:        BSD-3-Clause AND OpenSSL
 URL:            https://github.com/intel/QAT_Engine
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
@ -28,8 +36,8 @@ BuildRequires:  qatlib-devel >= 23.02.0
 %if !0%{?rhel}
 BuildRequires:  intel-ipp-crypto-mb-devel >= 1.0.6
 BuildRequires:  intel-ipsec-mb-devel >= 1.3.0
-BuildRequires:  openssl
 %endif
+BuildRequires:  openssl

 %description
 This package provides the Intel QuickAssist Technology OpenSSL Engine
@ -42,13 +50,7 @@ enabled Intel platforms.

 %build
 autoreconf -ivf
-%if !0%{?rhel}
-# Enable QAT_HW & QAT_SW Co-existence acceleration
-%configure --enable-qat_sw
-%else
-# QAT_HW only acceleration for RHEL
-%configure
-%endif
+%configure %{?with_sw:--enable-qat_sw} %{?with_provider:--enable-qat_provider}
 %make_build

 %install
@ -58,8 +60,11 @@ autoreconf -ivf
 find %{buildroot} -name "*.la" -delete
 %endif

-%if !0%{?rhel}
 %check
+%if %{with provider}
+export OPENSSL_MODULES=%{buildroot}%{modulesdir}
+openssl list -providers -provider qatprovider
+%else
 export OPENSSL_ENGINES=%{buildroot}%{enginesdir}
 openssl engine -v %{name}
 %endif
@ -67,45 +72,59 @@ openssl engine -v %{name}
 %files
 %license LICENSE*
 %doc README.md docs*
+%if %{with provider}
+%{modulesdir}/qatprovider.so
+%else
 %{enginesdir}/%{name}.so
+%endif

 %changelog
+* Thu Nov 07 2024 Vladis Dronov <vdronov@redhat.com> - 1.7.0-1
+- Update to qatengine v1.7.0 @ ceb9d4ac (RHEL-47394)
+- Remove qat_contig_mem from upstream package
+
+* Fri Mar 22 2024 Vladis Dronov <vdronov@redhat.com> - 1.6.0-1
+- Update to qatengine v1.6.0 (RHEL-20176)
+
 * Mon Nov 20 2023 Vladis Dronov <vdronov@redhat.com> - 1.4.0-1
- Update to qatengine v1.4.0 (RHEL-15638)
+- Update to qatengine v1.4.0 (RHEL-15636)
 - Enable QAT_HW & QAT SW Co-ex Acceleration for non RHEL distros

 * Fri Mar 31 2023 Vladis Dronov <vdronov@redhat.com> - 1.0.0-1
- Update to qatengine v1.0.0 (bz 2082435)
+- Update to qatengine v1.0.0 (bz 2082432)

 * Tue Mar 07 2023 Vladis Dronov <vdronov@redhat.com> - 0.6.19-1
- Update to qatengine v0.6.19 (bz 2082435)
+- Update to qatengine v0.6.19 (bz 2082432)

 * Tue Sep 06 2022 Vladis Dronov <vdronov@redhat.com> - 0.6.15-2
- Rebuild due to soverion bump (bz 2048036)
+- Rebuild due to soverion bump (bz 2047717)

 * Mon Aug 29 2022 Vladis Dronov <vdronov@redhat.com> - 0.6.15-1
- Update to qatengine v0.6.15 (bz 2048036)
+- Update to qatengine v0.6.15 (bz 2047717)

 * Wed Aug 10 2022 Vladis Dronov <vdronov@redhat.com> - 0.6.14-2
- Rebuild due to soverion bump (bz 2048036)
+- Rebuild due to soverion bump (bz 2047717)

 * Fri Jul 22 2022 Vladis Dronov <vdronov@redhat.com> - 0.6.14-1
- Update to qatengine v0.6.14 (bz 2048036)
+- Update to qatengine v0.6.14 (bz 2047717)

 * Mon Nov 15 2021 Vladis Dronov <vdronov@redhat.com> - 0.6.10-1
- Update to qatengine v0.6.10 (bz 1995565)
+- Update to qatengine v0.6.10 (bz 2012945)
+- Add OSCI testing harness

-* Fri Aug 27 2021 Vladis Dronov <vdronov@redhat.com> - 0.6.7-1
- Update to qatengine v0.6.7 (bz 1920338)
+* Wed Aug 18 2021 Vladis Dronov <vdronov@redhat.com> - 0.6.7-1
+- Update to qatengine v0.6.7 with openssl-3 support (bz 1874206, bz 1953498)
+- Add documentation files to a package

-* Tue Jun  8 2021 Vladis Dronov <vdronov@redhat.com> - 0.6.6-1
- Update to qatengine v0.6.6 (bz 1920338)
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.6.4-4
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Tue Feb  9 2021 Vladis Dronov <vdronov@redhat.com> - 0.6.3-3
- Add OSCI testing harness (bz 1924868)
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.6.4-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+* Fri Dec 11 2020 Yogaraj Alamenda <yogarajx.alamenda@intel.com> 0.6.4-1
+- Update to qatengine v0.6.4

 * Mon Nov 30 2020 Yogaraj Alamenda <yogarajx.alamenda@intel.com> 0.6.3-1
 - Update to qatengine v0.6.3
--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (qatengine-1.7.0.tar.gz) = 99798a2e8649c5277ca70c34df21d1444d3ce99c74c12f0c007f11df44aa0450d72510d25cd441b5068d1a9eb65779e81d3591755981e5ebd89324f79b66aa34
--- a/tests/README
+++ b/tests/README
@ -0,0 +1,13 @@
+these tests should be configured as BaseOS CI tests (not as OSCI tests), as
+they require an x86_64 machine with QAT_4XXX (or later) hardware, so should
+be run in Beaker.
+see: https://docs.engineering.redhat.com/display/RTT/Onboarding+gating+tests
+and: https://docs.engineering.redhat.com/pages/viewpage.action?pageId=53110084
+and: https://docs.engineering.redhat.com/display/RTT/Creating+and+Updating+beaker+test
+
+see https://bugzilla.redhat.com/show_bug.cgi?id=1747499#c35 for the details:
+
+> There is no make test inside qatengine.  And yes the test procedures  you mentioned
+> in README are enough to test it with OpenSSL.
+> https://github.com/intel/QAT_Engine#test-the-intel-quickassist-technology-openssl-engine
+> https://github.com/intel/QAT_Engine#run-speed-with-the-intel-quickassist-technology-openssl-engine
--- a/tests/nulltest.sh
+++ b/tests/nulltest.sh
@ -0,0 +1,6 @@
+#!/bin/bash
+
+# we cannot test this since there is no machine with QAT_4XXX hardware in Beaker as of now
+# Intel promised us to provide OtherQA for qatlib, qatengine and QAT kernel patchsets
+echo QATEngine nulltest is PASS
+exit 0
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -0,0 +1,10 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    tests:
+    - nulltest:
+        dir: .
+        run: nulltest.sh
				`@ -0,0 +1 @@`
				`SHA512 (qatengine-1.7.0.tar.gz) = 99798a2e8649c5277ca70c34df21d1444d3ce99c74c12f0c007f11df44aa0450d72510d25cd441b5068d1a9eb65779e81d3591755981e5ebd89324f79b66aa34`