From 8643d2a0120cb8a1931d5633634d322dda6569d9 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Fri, 31 May 2024 17:03:42 +0000
Subject: [PATCH] Import from AlmaLinux stable repository

---
 .gitignore           |  2 +-
 .qatengine.metadata  |  1 -
 SPECS/qatengine.spec | 58 ++++++++++++++++++++++++++++++++------------
 3 files changed, 44 insertions(+), 17 deletions(-)
 delete mode 100644 .qatengine.metadata

diff --git a/.gitignore b/.gitignore
index c89c918..2faa045 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/qatengine-1.0.0.tar.gz
+SOURCES/qatengine-1.4.0.tar.gz
diff --git a/.qatengine.metadata b/.qatengine.metadata
deleted file mode 100644
index 1c604bb..0000000
--- a/.qatengine.metadata
+++ /dev/null
@@ -1 +0,0 @@
-df3cdd04623a025f525ce0572894993d14737f23 SOURCES/qatengine-1.0.0.tar.gz
diff --git a/SPECS/qatengine.spec b/SPECS/qatengine.spec
index 7d09555..32484bc 100644
--- a/SPECS/qatengine.spec
+++ b/SPECS/qatengine.spec
@@ -1,26 +1,35 @@
 # SPDX-License-Identifier: MIT
 
-%global githubname QAT_Engine
+# Define the directory where the OpenSSL engines are installed
 %global enginesdir %(pkg-config --variable=enginesdir libcrypto)
 
 Name:           qatengine
-Version:        1.0.0
+Version:        1.4.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 and OpenSSL
-URL:            https://github.com/intel/%{githubname}
-Source0:        https://github.com/intel/%{githubname}/archive/v%{version}/%{name}-%{version}.tar.gz
+License:        BSD-3-Clause AND OpenSSL
+URL:            https://github.com/intel/QAT_Engine
+Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
-BuildRequires:  gcc make pkg-config
-BuildRequires:  autoconf automake libtool
-BuildRequires:  openssl-devel >= 1.1.1
-BuildRequires:  qatlib-devel >= 21.08.0
 # https://bugzilla.redhat.com/show_bug.cgi?id=1909065
-ExcludeArch:    %{arm} aarch64 %{power64} s390x i686
+ExclusiveArch:  x86_64
+
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  gcc
+BuildRequires:  libtool
+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
+%endif
 
 %description
 This package provides the Intel QuickAssist Technology OpenSSL Engine
@@ -29,28 +38,47 @@ for both hardware and optimized software using Intel QuickAssist Technology
 enabled Intel platforms.
 
 %prep
-%autosetup -n %{githubname}-%{version}
+%autosetup -n QAT_Engine-%{version}
 
 %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
 %make_build
 
 %install
 %make_install
 
+%if 0%{?rhel}
+find %{buildroot} -name "*.la" -delete
+%endif
+
+%if !0%{?rhel}
+%check
+export OPENSSL_ENGINES=%{buildroot}%{enginesdir}
+openssl engine -v %{name}
+%endif
+
 %files
 %license LICENSE*
 %doc README.md docs*
-%{enginesdir}/qatengine.so
-%exclude %{enginesdir}/qatengine.la
+%{enginesdir}/%{name}.so
 
 %changelog
+* Mon Nov 20 2023 Vladis Dronov <vdronov@redhat.com> - 1.4.0-1
+- Update to qatengine v1.4.0 (RHEL-15638)
+- 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 2176893)
+- Update to qatengine v1.0.0 (bz 2082435)
 
 * Tue Mar 07 2023 Vladis Dronov <vdronov@redhat.com> - 0.6.19-1
-- Update to qatengine v0.6.19 (bz 2176893)
+- Update to qatengine v0.6.19 (bz 2082435)
 
 * Tue Sep 06 2022 Vladis Dronov <vdronov@redhat.com> - 0.6.15-2
 - Rebuild due to soverion bump (bz 2048036)