From d13d40f385bdbe7961cec7bc023b8c2ca22052f3 Mon Sep 17 00:00:00 2001 From: Vladis Dronov Date: Fri, 8 Nov 2024 00:28:41 +0100 Subject: [PATCH] Update to qatengine v1.7.0 Update to the upstream commit ceb9d4ac Remove qat_contig_mem from upstream package Resolves: RHEL-47394 Signed-off-by: Vladis Dronov --- qatengine.spec | 37 +++++++++++++++++++++++++------------ sources | 2 +- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/qatengine.spec b/qatengine.spec index 04c216f..4ad0822 100644 --- a/qatengine.spec +++ b/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 +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,17 @@ 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 - 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 - 1.6.0-1 - Update to qatengine v1.6.0 (RHEL-20176) diff --git a/sources b/sources index a13c288..b0a6d4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qatengine-1.6.0.tar.gz) = 62282f003f30ec7fdcd71988b62addd0f055429917c5838f8b6d4194fa0f7aa0b575df070e76189a299dc7c05f5dc77bb6d70abf5fdd869ce32450dc0b7182b5 +SHA512 (qatengine-1.7.0.tar.gz) = 99798a2e8649c5277ca70c34df21d1444d3ce99c74c12f0c007f11df44aa0450d72510d25cd441b5068d1a9eb65779e81d3591755981e5ebd89324f79b66aa34