From 6d162ada288b2f8d371f4ef1108df4fa0c90a395 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Thu, 4 Dec 2025 12:46:15 +0000
Subject: [PATCH] Import from AlmaLinux stable repository

---
 .gitignore           |  2 +-
 .qatengine.metadata  |  2 +-
 SPECS/qatengine.spec | 48 ++++++++++++++++++++++++++++++--------------
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index b459994..5f36f3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/qatengine-1.6.0.tar.gz
+SOURCES/qatengine-1.9.0.tar.gz
diff --git a/.qatengine.metadata b/.qatengine.metadata
index a2bbb97..9120f31 100644
--- a/.qatengine.metadata
+++ b/.qatengine.metadata
@@ -1 +1 @@
-a92fcfe9ccfbf243fb606ed7699bb5b4c57da327 SOURCES/qatengine-1.6.0.tar.gz
+596d5024e66e75a553366ab10608670f46bc7449 SOURCES/qatengine-1.9.0.tar.gz
diff --git a/SPECS/qatengine.spec b/SPECS/qatengine.spec
index 04c216f..5597663 100644
--- a/SPECS/qatengine.spec
+++ b/SPECS/qatengine.spec
@@ -1,18 +1,26 @@
 # 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
+Version:        1.9.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
-License:        BSD-3-Clause AND OpenSSL
+# - qat.txt, qat_err.h & qat_err.c files are Apache License 2.0
+# - qat_hw_config/* is (BSD or GPLv2) and not used during compilation
+License:        BSD-3-Clause
 URL:            https://github.com/intel/QAT_Engine
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
@@ -27,9 +35,9 @@ BuildRequires:  openssl-devel >= 1.1.1
 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
+BuildRequires:  intel-ipsec-mb-devel >= 2.0
 %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,22 @@ openssl engine -v %{name}
 %files
 %license LICENSE*
 %doc README.md docs*
+%if %{with provider}
+%{modulesdir}/qatprovider.so
+%else
 %{enginesdir}/%{name}.so
+%endif
 
 %changelog
+* Mon Apr 28 2025 Vladis Dronov <vdronov@redhat.com> - 1.9.0-1
+- Update to qatengine v1.9.0 @ 910240d9 (RHEL-73089)
+- Update e_qat_err files license info
+
+* 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
+- Add a condition to build as an OpenSSL provider
+
 * Fri Mar 22 2024 Vladis Dronov <vdronov@redhat.com> - 1.6.0-1
 - Update to qatengine v1.6.0 (RHEL-20176)