From 926ae201d77ffdc3d444f8fdcc070cf368d12cc5 Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Wed, 11 Dec 2024 09:48:45 +0300
Subject: [PATCH] import qatengine-1.7.0-1.el10

---
 .gitignore           |  2 +-
 .qatengine.metadata  |  2 +-
 SPECS/qatengine.spec | 45 ++++++++++++++++++++++++++++++--------------
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index b459994..2de8261 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/qatengine-1.6.0.tar.gz
+SOURCES/qatengine-1.7.0.tar.gz
diff --git a/.qatengine.metadata b/.qatengine.metadata
index a2bbb97..88c6b6e 100644
--- a/.qatengine.metadata
+++ b/.qatengine.metadata
@@ -1 +1 @@
-a92fcfe9ccfbf243fb606ed7699bb5b4c57da327 SOURCES/qatengine-1.6.0.tar.gz
+dca10282249351140955184dacbf9576a2da3076 SOURCES/qatengine-1.7.0.tar.gz
diff --git a/SPECS/qatengine.spec b/SPECS/qatengine.spec
index d05db2f..5aa7b2a 100644
--- 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.6.0
-Release:        2%{?dist}
+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,9 +72,21 @@ 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-54171)
+- Remove qat_contig_mem from upstream package
+- Build as a provider for RHEL-10
+
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.6.0-3
+- Bump release for October 2024 mass rebuild (RHEL-64018)
+
 * Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.6.0-2
 - Rebuilt for MSVSphere 10
 
@@ -80,4 +97,4 @@ openssl engine -v %{name}
 - Update to qatengine v1.6.0 (RHEL-20177)
 
 * Fri Jan 26 2024 Vladis Dronov <vdronov@redhat.com> - 1.5.0-3
-- Initial import
+- Initial import from Fedora 40