Accepting request 1296164 from security:tls

OBS-URL: https://build.opensuse.org/request/show/1296164
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl-ibmca?expand=0&rev=59

_multibuild

@@ -1,4 +0,0 @@
-<multibuild>
-  <flavor>engine</flavor>
-  <flavor>provider</flavor>
-</multibuild>

engine_section.txt

@@ -1 +0,0 @@
-ibmca = ibmca_section

openssl-ibmca.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Jul 28 06:30:38 UTC 2025 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
+
+- Amended the .spec file (bsc#1246931)
+  * removed obsolete engine-related content(files), IBMCA engine is deprecated
+  * removed sub-packages
+    - openssl-ibmca-engine
+    - openssl-ibmca-provider
+- Removed multibuild and sources:
+  * Source1:        engine_section.txt
+  * Source2:        _multibuild
+
 -------------------------------------------------------------------
 Wed Apr 23 08:33:06 UTC 2025 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
 

openssl-ibmca.spec

@@ -16,35 +16,16 @@
 #
 
 
-%global enginesdir %(pkg-config --variable=enginesdir libcrypto)
 %global modulesdir %(pkg-config --variable=modulesdir libcrypto)
 
-%global sslengcnf %{_sysconfdir}/ssl/engines3.d
-%global sslengdef %{_sysconfdir}/ssl/engdef3.d
-
-%define         flavor  @BUILD_FLAVOR@%{nil}
-
-%if "%{flavor}" == ""
 Name:           openssl-ibmca
-%endif
-
-%if "%{flavor}" == "engine"
-Name:           openssl-ibmca-engine
-%endif
-
-%if "%{flavor}" == "provider"
-Name:           openssl-ibmca-provider
-%endif
-
 Version:        2.5.0
 Release:        0
-Summary:        The IBMCA OpenSSL dynamic engine
+Summary:        OpenSSL engine and provider for libica
 License:        Apache-2.0
 Group:          Hardware/Other
 URL:            https://github.com/opencryptoki/openssl-ibmca
 Source:         https://github.com/opencryptoki/openssl-ibmca/archive/v%{version}.tar.gz#/openssl-ibmca-%{version}.tar.gz
-Source1:        engine_section.txt
-Source2:        _multibuild
 ###
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -58,13 +39,10 @@ Requires:       libica4 >= 4.0.0
 Requires:       libopenssl3
 ###
 ExclusiveArch:  s390x
-
-###
 ###
 
 %description
-This package contains a shared object OpenSSL dynamic engine which interfaces
-to libica, a library enabling the IBM s390/x CPACF crypto instructions.
+OpenSSL engine and provider that uses the libica library under s390x to accelerate cryptographic operations
 
 %prep
 %autosetup -p1 -n openssl-ibmca-%{version}
@@ -74,107 +52,26 @@ to libica, a library enabling the IBM s390/x CPACF crypto instructions.
 export CFLAGS="%{optflags}"
 export CPPFLAGS="%{optflags}"
 
-%if "%{flavor}" == ""
-%configure \
-  --libdir=%{modulesdir}
-  mkdir -p %{buildroot}/%{enginesdir}
-%endif
-
-%if "%{flavor}" == "engine"
-%configure \
-  --disable-provider \
-  --libdir=%{enginesdir}
-%endif
-
-%if "%{flavor}" == "provider"
 %configure \
   --disable-engine \
   --libdir=%{modulesdir}
-%endif
 
 %make_build
 
 %install
-# Update the sample config file so that the dynamic path points
-# to the correct version of the engines directory.
-%if "%{flavor}" != "provider"
-sed -i -e "/^dynamic_path/s, = .*/, = %{enginesdir}/," src/engine/openssl.cnf.sample
-%endif
 
 %make_install
 
-%if "%{flavor}" == ""
-mkdir -p %{buildroot}/%{enginesdir}
-mv %{buildroot}/%{modulesdir}/ibmca.* %{buildroot}/%{enginesdir}/
-%endif
-
-rm -f %{buildroot}/%{enginesdir}/ibmca*.la
-rm -f %{buildroot}/%{modulesdir}/ibmca*.la
-
-# This file contains the declaration of the ibmca engine section. It
-# needs to be on the "real" file system when the postinstall scriptlet
-# is run. It will be read by the openssl .include directive that points
-# to /etc/ssl/engines.d/
-mkdir -p %{buildroot}%{_datadir}/%{name}
-cp -p %{SOURCE1} %{buildroot}%{_datadir}/%{name}/openssl-ibmca.sectiondef.txt
-
-# This will create the actual engine definition section that will be usable
-# by the .include directive of openSSL. That include will be inserted during
-# the postinstall phase of the package installation.
-grep -v "^#" src/engine/openssl.cnf.sample | \
-    sed -n -e '/^\[ibmca_section\]/,$ p' | \
-    sed -e '/^$/ {N;N;s/\n\n/\n/g;}' | \
-    sed -e 's/^dynamic_path/#dynamic_path/' > %{buildroot}%{_datadir}/%{name}/openssl-ibmca.enginedef.cnf
-
 %post
-#Original fix for bsc#942839 was to update on first install
-#For bsc#966139 update if openssl_def not found
-
-mkdir -p %{sslengcnf}
-mkdir -p %{sslengdef}
-cp -p %{_datadir}/%{name}/openssl-ibmca.sectiondef.txt %{sslengcnf}/openssl-ibmca.cnf
-cp -p %{_datadir}/%{name}/openssl-ibmca.enginedef.cnf %{sslengdef}/openssl-ibmca.cnf
-
-%if "%{flavor}" == ""
-if [ -f "%{_datadir}/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig" ]; then
-   cp -p %{_datadir}/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig %{_datadir}/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig.orig
-   sed -e 's/ossl-modules/engines-3/' %{_datadir}/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig.orig > %{_datadir}/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig
-   rm %{_datadir}/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig.orig
-fi
-%endif
 
 %postun
-if [ $1 -eq 0 ]; then # last uninstall
-  rm -f %{sslengcnf}/openssl-ibmca.cnf
-  rm -f %{sslengdef}/openssl-ibmca.cnf
-fi
 
 %files
 %license LICENSE
 %doc ChangeLog
 %doc README.md
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/openssl-ibmca.sectiondef.txt
-%{_datadir}/%{name}/openssl-ibmca.enginedef.cnf
-%if "%{flavor}" == ""
-    %doc src/engine/ibmca-engine-opensslconfig
-    %doc src/provider/ibmca-provider-opensslconfig
-    %doc src/engine/openssl.cnf.sample
-    %{enginesdir}/ibmca.*
-    %{modulesdir}/ibmca-provider.*
-    %{_mandir}/man5/ibmca.5%{?ext_man}
-    %{_mandir}/man5/ibmca-provider.5%{?ext_man}
-%endif
-%if "%{flavor}" == "provider"
-    %doc src/provider/ibmca-provider-opensslconfig
-    %{modulesdir}/ibmca-provider.*
-    %{_mandir}/man5/ibmca-provider.5%{?ext_man}
-%endif
-%if "%{flavor}" == "engine"
-    %doc src/engine/ibmca-engine-opensslconfig
-    %doc src/engine/openssl.cnf.sample
-    %{enginesdir}/ibmca.*
-    %{_mandir}/man5/ibmca.5%{?ext_man}
-%endif
+%doc src/provider/ibmca-provider-opensslconfig
+%{modulesdir}/ibmca-provider.*
+%{_mandir}/man5/ibmca-provider.5%{?ext_man}
 
 %changelog