From fbceffe006720e24aa7e5ba1c88cef8b0457800a84489347134c02dbc3089373 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 18 Oct 2016 08:41:29 +0000 Subject: [PATCH] Accepting request 434703 from security - fixed ssl configuration merging (bsc#1004463) - openssl-ibmca-fix-enginepath.patch: fix the engine path - Use macro for configure (fate#319941) OBS-URL: https://build.opensuse.org/request/show/434703 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl-ibmca?expand=0&rev=25 --- openssl-ibmca-fix-enginepath.patch | 13 +++++++++++++ openssl-ibmca.changes | 8 +++++++- openssl-ibmca.spec | 6 ++++-- 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 openssl-ibmca-fix-enginepath.patch diff --git a/openssl-ibmca-fix-enginepath.patch b/openssl-ibmca-fix-enginepath.patch new file mode 100644 index 0000000..5936e70 --- /dev/null +++ b/openssl-ibmca-fix-enginepath.patch @@ -0,0 +1,13 @@ +Index: openssl-ibmca-1.3.0/src/openssl.cnf.sample +=================================================================== +--- openssl-ibmca-1.3.0.orig/src/openssl.cnf.sample ++++ openssl-ibmca-1.3.0/src/openssl.cnf.sample +@@ -23,7 +23,7 @@ ibmca = ibmca_section + # The openssl engine path for libibmca.so. + # Set the dynamic_path to where the libibmca.so engine + # resides on the system. +-dynamic_path = /usr/local/lib/libibmca.so ++dynamic_path = /lib64/engines/libibmca.so + engine_id = ibmca + init = 1 + diff --git a/openssl-ibmca.changes b/openssl-ibmca.changes index 98a3c1e..9006551 100644 --- a/openssl-ibmca.changes +++ b/openssl-ibmca.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Thu Oct 13 09:36:50 UTC 2016 - meissner@suse.com + +- fixed ssl configuration merging (bsc#1004463) +- openssl-ibmca-fix-enginepath.patch: fix the engine path + ------------------------------------------------------------------- Wed Apr 6 19:07:43 UTC 2016 - mpluskal@suse.com -- Use macro for configure +- Use macro for configure (fate#319941) - Use url for source - Enable parallel building - Cleanup spec file with spec-cleaner diff --git a/openssl-ibmca.spec b/openssl-ibmca.spec index ae3a677..359de66 100644 --- a/openssl-ibmca.spec +++ b/openssl-ibmca.spec @@ -26,6 +26,7 @@ Url: http://sourceforge.net/projects/opencryptoki Source: http://sourceforge.net/projects/opencryptoki/files/libica%%20OpenSSL%%20Engine/ibmca-%{version}/openssl-ibmca-%{version}.tar.bz2 Source1: baselibs.conf Patch1: openssl-ibmca-configure.patch +Patch2: openssl-ibmca-fix-enginepath.patch BuildRequires: libica2-devel >= 2.4.0 BuildRequires: openssl-devel Requires: libica2 >= 2.4.0 @@ -40,6 +41,7 @@ IBM eServer Cryptographic Accelerator (ICA). %prep %setup -q %patch1 +%patch2 -p1 %build export CFLAGS="%{optflags}" @@ -56,7 +58,7 @@ rm %{buildroot}/%{_lib}/engines/libibmca.la #Original fix for bsc#942839 was to update on first install #For bsc#966139 update if openssl_def not found SSLCNF=%{_sysconfdir}/ssl/openssl.cnf -SSLSMP=%{_docdir}/${name}/openssl.cnf.sample +SSLSMP=%{_docdir}/%{name}/openssl.cnf.sample if [ -f ${SSLCNF} -a -f ${SSLSMP} ]; then if grep '^openssl_conf[[:space:]]*=[[:space:]]*openssl_def$' ${SSLCNF} >/dev/null 2>&1; then @@ -74,7 +76,7 @@ if [ -f ${SSLCNF} -a -f ${SSLSMP} ]; then fi else CNFSZE=350 # Size in lines of original openssl.cnf - SMPSZE=46 # Size in lines of original sample config file + SMPSZE=52 # Size in lines of original sample config file CNFINS=9 # Line number in openssl.cnf to insert new line SMPUSE=11 # Line number in sample to copy from if [ $(wc -l ${SSLCNF} | cut -d ' ' -f 1) -ne ${CNFSZE} ]; then