pool/openssl-ibmca
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1168543 from home:ngueorguiev:branches:security:tls

Browse Source 
- Amended the .spec file
- Changed the package names
  +------------+---------------------------------+--------------------------+
  |  Flavor    | Package name                    | Note                     |
  +------------+---------------------------------+--------------------------+
  |  ''        | openssl1_1-ibmca                | openssl1 flavor          |
  |  engine    | openssl-ibmca-engine            | Only engine              |
  |  provider  | openssl-ibmca-provider          | Only provider            |
  |  openssl3  | openssl-ibmca                   | Both engine and provider |
  +------------+---------------------------------+--------------------------+
- Applied a patch for openssl1_1 (bsc#1221627)
  * openssl1-rename-libica-files.patch

OBS-URL: https://build.opensuse.org/request/show/1168543
OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-ibmca?expand=0&rev=66
This commit is contained in:
Nikolay Gueorguiev 2024-04-17 12:50:11 +00:00 committed by Git OBS Bridge
parent 1c1bc15f2d
commit a4456cfb82
3 changed files with 110 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
openssl-ibmca.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Wed Apr 17 10:14:00 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
- Amended the .spec file
- Changed the package names
+------------+---------------------------------+--------------------------+
| Flavor | Package name | Note |
+------------+---------------------------------+--------------------------+
| '' | openssl1_1-ibmca | openssl1 flavor |
| engine | openssl-ibmca-engine | Only engine |
| provider | openssl-ibmca-provider | Only provider |
| openssl3 | openssl-ibmca | Both engine and provider |
+------------+---------------------------------+--------------------------+
-------------------------------------------------------------------
Wed Apr 17 08:41:08 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
- Applied a patch for openssl1_1 (bsc#1221627)
* openssl1-rename-libica-files.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 9 14:08:05 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com> Tue Apr 9 14:08:05 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>

39
openssl-ibmca.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package openssl-ibmca # spec file for package openssl1_1-ibmca
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
@ -25,21 +25,21 @@
%define flavor @BUILD_FLAVOR@%{nil} %define flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "" %if "%{flavor}" == ""
%global sslengcnf %{_sysconfdir}/ssl/engines.d %global sslengcnf %{_sysconfdir}/ssl/engines1.1.d
%global sslengdef %{_sysconfdir}/ssl/engdef.d %global sslengdef %{_sysconfdir}/ssl/engdef1.1.d
Name: openssl-ibmca Name: openssl1_1-ibmca
%endif %endif
%if "%{flavor}" == "openssl3" %if "%{flavor}" == "openssl3"
Name: openssl3-ibmca Name: openssl-ibmca
%endif %endif
%if "%{flavor}" == "engine" %if "%{flavor}" == "engine"
Name: openssl3-ibmca-engine Name: openssl-ibmca-engine
%endif %endif
%if "%{flavor}" == "provider" %if "%{flavor}" == "provider"
Name: openssl3-ibmca-provider Name: openssl-ibmca-provider
%endif %endif
Version: 2.4.1 Version: 2.4.1
@ -54,19 +54,31 @@ Source2: _multibuild
### ###
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: libtool
###
%if "%{flavor}" != ""
BuildRequires: libica-devel >= 4.0.0 BuildRequires: libica-devel >= 4.0.0
BuildRequires: libica-tools >= 4.0.0 BuildRequires: libica-tools >= 4.0.0
BuildRequires: libtool BuildRequires: libopenssl-3-devel
Requires: libica4 >= 4
%if "%{flavor}" != ""
BuildRequires: libopenssl3 BuildRequires: libopenssl3
Requires: libica4 >= 4.0.0
Requires: libopenssl3 Requires: libopenssl3
%else %else
BuildRequires: libica-openssl1_1-devel
BuildRequires: libica-openssl1_1-tools
BuildRequires: libopenssl-1_1-devel
BuildRequires: libopenssl1_1 BuildRequires: libopenssl1_1
BuildRequires: openssl
Requires: libica4-openssl1_1
Requires: libopenssl1_1 Requires: libopenssl1_1
%endif %endif
###
ExclusiveArch: s390x ExclusiveArch: s390x
%if "%{flavor}" == ""
Patch001: openssl1-rename-libica-files.patch
%endif
%description %description
This package contains a shared object OpenSSL dynamic engine which interfaces This package contains a shared object OpenSSL dynamic engine which interfaces
to libica, a library enabling the IBM s390/x CPACF crypto instructions. to libica, a library enabling the IBM s390/x CPACF crypto instructions.
@ -150,9 +162,9 @@ cp -p %{_datadir}/%{name}/openssl-ibmca.sectiondef.txt %{sslengcnf}/openssl-ibmc
cp -p %{_datadir}/%{name}/openssl-ibmca.enginedef.cnf %{sslengdef}/openssl-ibmca.cnf cp -p %{_datadir}/%{name}/openssl-ibmca.enginedef.cnf %{sslengdef}/openssl-ibmca.cnf
%if "%{flavor}" == "openssl3" %if "%{flavor}" == "openssl3"
cp -p /usr/share/doc/packages/openssl3-ibmca/ibmca-engine-opensslconfig /usr/share/doc/packages/openssl3-ibmca/ibmca-engine-opensslconfig.orig cp -p /usr/share/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig /usr/share/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig.orig
sed -e 's/ossl-modules/engines-3/' /usr/share/doc/packages/openssl3-ibmca/ibmca-engine-opensslconfig.orig > /usr/share/doc/packages/openssl3-ibmca/ibmca-engine-opensslconfig sed -e 's/ossl-modules/engines-3/' /usr/share/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig.orig > /usr/share/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig
rm /usr/share/doc/packages/openssl3-ibmca/ibmca-engine-opensslconfig.orig rm /usr/share/doc/packages/openssl-ibmca/ibmca-engine-opensslconfig.orig
%endif %endif
%postun %postun
@ -192,7 +204,6 @@ fi
%doc src/engine/openssl.cnf.sample %doc src/engine/openssl.cnf.sample
%{enginesdir}/ibmca.* %{enginesdir}/ibmca.*
%{_mandir}/man5/ibmca.5%{?ext_man} %{_mandir}/man5/ibmca.5%{?ext_man}
%{_mandir}/man5/ibmca-provider.5%{?ext_man}
%endif %endif
%changelog %changelog

65
openssl1-rename-libica-files.patch Normal file
View File

@ -0,0 +1,65 @@
--- openssl-ibmca-2.4.1/configure.ac 2023-09-21 08:52:43.000000000 +0200
+++ changed/configure.ac 2024-04-17 10:13:02.267582864 +0200
@@ -69,7 +69,7 @@
# Checks for header files.
AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stddef.h stdlib.h \
string.h strings.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h])
-AC_CHECK_HEADER([ica_api.h], [], AC_MSG_ERROR([*** libica-devel >= 3.6.0 is required ***]))
+AC_CHECK_HEADER([ica_api.h], [], AC_MSG_ERROR([*** libica-openssl1_1-devel >= 3.6.0 is required ***]))
# Checks for typedefs, structures, and compiler characteristics.
@@ -81,15 +81,15 @@
# Checks for library functions.
AC_CHECK_FUNCS([gethostbyaddr gethostbyname memset strcasecmp strncasecmp strstr malloc])
AC_CHECK_DECLS([ICA_FLAG_DHW,DES_ECB], [],
- AC_MSG_ERROR([*** libica-devel >= 3.6.0 are required ***]),
+ AC_MSG_ERROR([*** libica-openssl1_1-devel >= 3.6.0 are required ***]),
[#include <ica_api.h>])
AC_CHECK_DECLS([OSSL_ASYM_CIPHER_PARAM_IMPLICIT_REJECTION],
[openssl_implicit_rejection="yes"], [openssl_implicit_rejection="no"],
[#include <openssl/core_names.h>])
AM_CONDITIONAL([OPENSSL_IMPLICIT_REJECTION], [test "x$openssl_implicit_rejection" = xyes])
-AC_ARG_WITH([libica-cex],
- [AS_HELP_STRING([--with-libica-cex],[Use libica-cex as default library for the IBMCA engine])],
+AC_ARG_WITH([libica-openssl1_1-cex],
+ [AS_HELP_STRING([--with-libica-openssl1_1-cex],[Use libica-openssl1_1-cex as default library for the IBMCA engine])],
[usecexonly=${withval}],
[])
@@ -99,11 +99,11 @@
[libicaversion=4])
if test "x$usecexonly" = xyes; then
- defaultlib="libica-cex.so.$libicaversion"
- ica="ica-cex"
+ defaultlib="libica-openssl1_1-cex.so.$libicaversion"
+ ica="ica-openssl1_1-cex"
else
- defaultlib="libica.so.$libicaversion"
- ica="ica"
+ defaultlib="libica-openssl1_1.so.$libicaversion"
+ ica="ica-openssl1_1"
fi
# In cex-only mode, testing the ciphers does not make any sense since
# they will fall back to OpenSSL without the engine. So remove these
@@ -135,7 +135,7 @@
AC_DEFINE_UNQUOTED([LIBICA_SHARED_LIB],["$defaultlib"])
-AC_SUBST([ICA],["$ica"])
+AC_SUBST([ICA],["$ica-openssl1_1"])
AC_CHECK_PROG([openssl_var],[openssl],[yes],[no])
if test "x$openssl_var" != xyes; then
@@ -169,7 +169,7 @@
echo " default library: $defaultlib"
echo "IBMCA provider: $enable_provider"
if test "x$useproviderfulllibica" = xyes; then
- echo " libica library: libica"
+ echo " libica library: libica-openssl1_1"
else
- echo " libica library: libica-cex"
+ echo " libica library: libica-openssl1_1-cex"
fi