Hello community, here is the log from the commit of package openssl-ibmca for openSUSE:Factory checked in at 2017-09-23 21:36:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openssl-ibmca (Old) and /work/SRC/openSUSE:Factory/.openssl-ibmca.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openssl-ibmca" Sat Sep 23 21:36:11 2017 rev:27 rq:528233 version:1.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/openssl-ibmca/openssl-ibmca.changes 2017-04-14 13:41:51.704278882 +0200 +++ /work/SRC/openSUSE:Factory/.openssl-ibmca.new/openssl-ibmca.changes 2017-09-23 21:36:14.217358399 +0200 @@ -1,0 +2,12 @@ +Fri Sep 22 07:50:52 UTC 2017 - [email protected] + +- Now that the openSSL engines directory is versioned: + * Modified the spec file to query the libcrypto package + for which directory to install the engine into. + * Removed openssl-ibmca-fix-enginepath.patch. Replaced it + with a sed command so that it will provide the correct + versioned engines directory +- Removed openssl-ibmca-configure.patch. It doesn't seem to + be needed any longer. + +------------------------------------------------------------------- Old: ---- openssl-ibmca-configure.patch openssl-ibmca-fix-enginepath.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssl-ibmca.spec ++++++ --- /var/tmp/diff_new_pack.yO2TSK/_old 2017-09-23 21:36:14.889263905 +0200 +++ /var/tmp/diff_new_pack.yO2TSK/_new 2017-09-23 21:36:14.893263342 +0200 @@ -25,9 +25,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 -Patch3: openssl-ibmca-fix-sha512-evp-digest-to-use-evp_md_flag_pkey_method_signature.patch +Patch1: openssl-ibmca-fix-sha512-evp-digest-to-use-evp_md_flag_pkey_method_signature.patch BuildRequires: libica-devel >= 2.4.0 BuildRequires: libica-tools >= 2.4.0 BuildRequires: openssl-devel @@ -41,20 +39,26 @@ %prep %setup -q -%patch1 -%patch2 -p1 -%patch3 -p1 +%patch1 -p1 %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) + export CFLAGS="%{optflags}" export CPPFLAGS="%{optflags}" %configure \ - --libdir=/%{_lib}/engines + --libdir=%{_ENGINE_DIR} make %{?_smp_mflags} %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 + make %{?_smp_mflags} DESTDIR=%{buildroot} install -rm %{buildroot}/%{_lib}/engines/libibmca.la +rm %{buildroot}/%{_ENGINE_DIR}/libibmca.la %post #Original fix for bsc#942839 was to update on first install @@ -108,7 +112,7 @@ %defattr(-, root, root) %doc README COPYING %doc src/openssl.cnf.sample -/%{_lib}/engines/libibmca.* +%{_ENGINE_DIR}/libibmca.* %{_mandir}/man5/ibmca.5%{ext_man} %changelog
