Hello community,

here is the log from the commit of package openssl-ibmca for openSUSE:Factory 
checked in at 2016-10-18 10:41:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openssl-ibmca (Old)
 and      /work/SRC/openSUSE:Factory/.openssl-ibmca.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "openssl-ibmca"

Changes:
--------
--- /work/SRC/openSUSE:Factory/openssl-ibmca/openssl-ibmca.changes      
2016-04-28 16:57:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openssl-ibmca.new/openssl-ibmca.changes 
2016-10-18 10:41:30.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Oct 13 09:36:50 UTC 2016 - meiss...@suse.com
+
+- fixed ssl configuration merging (bsc#1004463)
+- openssl-ibmca-fix-enginepath.patch: fix the engine path
+
+-------------------------------------------------------------------
@@ -4 +10 @@
-- Use macro for configure
+- Use macro for configure (fate#319941)

New:
----
  openssl-ibmca-fix-enginepath.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ openssl-ibmca.spec ++++++
--- /var/tmp/diff_new_pack.EM9UnE/_old  2016-10-18 10:41:31.000000000 +0200
+++ /var/tmp/diff_new_pack.EM9UnE/_new  2016-10-18 10:41:31.000000000 +0200
@@ -26,6 +26,7 @@
 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 @@
 %prep
 %setup -q
 %patch1
+%patch2 -p1
 
 %build
 export CFLAGS="%{optflags}"
@@ -56,7 +58,7 @@
 #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 @@
     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

++++++ openssl-ibmca-fix-enginepath.patch ++++++
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
 

Reply via email to