diff --git a/openssl-ibmca-2.1.1.tar.gz b/openssl-ibmca-2.1.1.tar.gz deleted file mode 100644 index a3bf82c..0000000 --- a/openssl-ibmca-2.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57304a3d35fa679f7eb7c73825c293655415125557d233beb371d085b3e71389 -size 45678 diff --git a/openssl-ibmca-2.2.1.tar.gz b/openssl-ibmca-2.2.1.tar.gz new file mode 100644 index 0000000..54f6b14 --- /dev/null +++ b/openssl-ibmca-2.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1dd77f6f749f07721f993ddecc27b68b1c1fd8c09f524fae6529e86298ed7f01 +size 98187 diff --git a/openssl-ibmca.changes b/openssl-ibmca.changes index 8a116b0..5f38d24 100644 --- a/openssl-ibmca.changes +++ b/openssl-ibmca.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Fri Sep 17 19:32:37 UTC 2021 - Mark Post + +- Upgraded to version 2.2.1 + * openssl-ibmca 2.2.1 + Bug fixes + * openssl-ibmca 2.2.0 + Implement fallbacks based on OpenSSL + Disable software fallbacks from libica + Allow to specify default library (libica vs. libica-cex) to use + Provide "libica" engine ctrl to switch library at load time + Update README.md + Remove libica link dependency + Generate sample configuration files from system configuration + Restructure registration global data + * openssl-ibmca 2.1.3 + Bug fix + * openssl-ibmca 2.1.2 + Bug fixes +- Modified spec file to + * Define a global variable enginedir the same was as IBM does + instead of _ENGINE_DIR as we had been doing. + * Implemented %make_build macro according to spec-cleaner + * Changed the package description to match IBM's. + * Removed the redundant "autoreconf --force --install" + ------------------------------------------------------------------- Wed Sep 16 20:06:12 UTC 2020 - Mark Post diff --git a/openssl-ibmca.spec b/openssl-ibmca.spec index a95e753..135e2d8 100644 --- a/openssl-ibmca.spec +++ b/openssl-ibmca.spec @@ -1,7 +1,7 @@ # # spec file for package openssl-ibmca # -# Copyright (c) 2018-2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,10 @@ # +%global enginesdir %(pkg-config --variable=enginesdir libcrypto) + Name: openssl-ibmca -Version: 2.1.1 +Version: 2.2.1 Release: 0 Summary: The IBMCA OpenSSL dynamic engine License: Apache-2.0 @@ -37,32 +39,27 @@ Requires: openssl ExclusiveArch: s390x %description -This package contains a shared object OpenSSL dynamic engine for the -IBM eServer Cryptographic Accelerator (ICA). +This package contains a shared object OpenSSL dynamic engine which interfaces +to libica, a library enabling the IBM s390/x CPACF crypto instructions. %prep %autosetup ./bootstrap.sh %build -# The directory where crypto engines are located is owned by the libcrypto package. -# Find out where that is for this version of the distribution. -%define _ENGINE_DIR %(pkg-config --variable=enginesdir libcrypto) - -autoreconf --force --install export CFLAGS="%{optflags}" export CPPFLAGS="%{optflags}" %configure \ - --libdir=%{_ENGINE_DIR} -make %{?_smp_mflags} + --libdir=%{enginesdir} +%make_build %install # Update the sample config file so that the dynamic path points # to the correct version of the engines directory. -sed -i -e "/^dynamic_path/s, = .*/, = %{_ENGINE_DIR}/," src/openssl.cnf.sample +sed -i -e "/^dynamic_path/s, = .*/, = %{enginesdir}/," src/openssl.cnf.sample %make_install -rm %{buildroot}/%{_ENGINE_DIR}/ibmca.la +rm %{buildroot}/%{enginesdir}/ibmca.la %post #Original fix for bsc#942839 was to update on first install @@ -116,7 +113,12 @@ fi %license LICENSE %doc README.md %doc src/openssl.cnf.sample -%{_ENGINE_DIR}/ibmca.* +%doc src/openssl.cnf.defaultlibica +%doc src/openssl.cnf.libica +%doc src/openssl.cnf.libica-cex +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/openssl.cnf.* +%{enginesdir}/ibmca.* %{_mandir}/man5/ibmca.5%{?ext_man} %changelog