Hello community, here is the log from the commit of package openssl-ibmca for openSUSE:Factory checked in at 2016-04-28 16:54:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-03-27 09:39:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openssl-ibmca.new/openssl-ibmca.changes 2016-04-28 16:57:20.000000000 +0200 @@ -1,0 +2,38 @@ +Wed Apr 6 19:07:43 UTC 2016 - [email protected] + +- Use macro for configure +- Use url for source +- Enable parallel building +- Cleanup spec file with spec-cleaner + +------------------------------------------------------------------- +Thu Mar 31 21:20:34 UTC 2016 - [email protected] + +- Upgraded to version 1.3.0 (fate#319941) + - Updated openssl-ibmca-configure.patch to apply cleanly + - Removed obsolete patches + - openssl-ibmca-README.patch + - openssl-ibmca-sha256-digest-length.patch + - openssl-pkey.patch + - openssl-des-ede.patch +- Did some spec file cleanup. + +------------------------------------------------------------------- +Mon Mar 21 20:53:02 UTC 2016 - [email protected] + +- Fixed %post script to update library path (the only dynamic part + of the ibmca configuration) every time the package is installed. + (bsc#966139) + +------------------------------------------------------------------- +Tue Oct 27 06:36:06 UTC 2015 - [email protected] + +- Updated AUTHORS, INSTALL, and README (bsc#942839) +- %post and %postun added to properly update openssl.cnf (bsc#942839) + +------------------------------------------------------------------- +Tue Oct 27 03:46:00 UTC 2015 - [email protected] + +- Updated to used libica2 == v2.4.2 for SLE12-SP1 (bsc#951138) + +------------------------------------------------------------------- @@ -8,0 +47,5 @@ + +------------------------------------------------------------------- +Wed Dec 3 09:22:24 UTC 2014 - [email protected] + +- the openssl engines moved to /%_lib/engines bnc#905480 Old: ---- openssl-des-ede.patch openssl-ibmca-1.2.0.tar.gz openssl-ibmca-README.patch openssl-ibmca-sha256-digest-length.patch openssl-pkey.patch New: ---- openssl-ibmca-1.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssl-ibmca.spec ++++++ --- /var/tmp/diff_new_pack.lFRkwD/_old 2016-04-28 16:57:21.000000000 +0200 +++ /var/tmp/diff_new_pack.lFRkwD/_new 2016-04-28 16:57:21.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package openssl-ibmca # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,29 +17,21 @@ Name: openssl-ibmca -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libica-2_3_0-devel -BuildRequires: libtool -BuildRequires: openssl-devel +Version: 1.3.0 +Release: 0 Summary: The IBMCA OpenSSL dynamic engine License: IPL-1.0 Group: Hardware/Other -Version: 1.2.0 -Release: 0 -Source: openssl-ibmca-1.2.0.tar.gz -Source2: baselibs.conf -Patch1: openssl-ibmca-README.patch -Patch2: openssl-ibmca-configure.patch -Patch3: openssl-ibmca-sha256-digest-length.patch -Patch4: openssl-pkey.patch -Patch5: openssl-des-ede.patch Url: http://sourceforge.net/projects/opencryptoki -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: libica-2_3_0 +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 +BuildRequires: libica2-devel >= 2.4.0 +BuildRequires: openssl-devel +Requires: libica2 >= 2.4.0 Requires: openssl +BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: s390 s390x -# %description This package contains a shared object OpenSSL dynamic engine for the @@ -48,26 +40,71 @@ %prep %setup -q %patch1 -%patch2 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build -autoreconf --force --install -%configure --with-engines-dir=%_libdir/engines --libdir=%_libdir/engines -make +export CFLAGS="%{optflags}" +export CPPFLAGS="%{optflags}" +%configure \ + --libdir=/%{_lib}/engines +make %{?_smp_mflags} %install -%makeinstall -#(cd $RPM_BUILD_ROOT; libtool --finish ./%_libdir/engines) -rm ${RPM_BUILD_ROOT}%{_libdir}/engines/libibmca.la +make %{?_smp_mflags} DESTDIR=%{buildroot} install +rm %{buildroot}/%{_lib}/engines/libibmca.la + +%post +#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 + +if [ -f ${SSLCNF} -a -f ${SSLSMP} ]; then + if grep '^openssl_conf[[:space:]]*=[[:space:]]*openssl_def$' ${SSLCNF} >/dev/null 2>&1; then + # Config already installed. Update library path if necessary + SECTSTART=$(grep -n '\[ibmca_section\]' ${SSLCNF} | head -n1 | cut -d':' -f1) + REPLINE="" + if [ "z${SECTSTART}" != "z" ]; then + REPLINE=$((SECTSTART - 1 + $(tail -n+${SECTSTART} ${SSLCNF} | grep -n 'dynamic_path' | head -n1 | cut -d':' -f1) )) + fi + if [ "z${REPLINE}" != "z" ]; then + head -n$((REPLINE - 1)) ${SSLCNF} > ${SSLCNF}.temp + grep 'dynamic_path' ${SSLSMP} >> ${SSLCNF}.temp + tail -n+$((REPLINE + 1)) ${SSLCNF} >> ${SSLCNF}.temp + mv ${SSLCNF}.temp ${SSLCNF} + fi + else + CNFSZE=350 # Size in lines of original openssl.cnf + SMPSZE=46 # 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 + echo Original ${SSLCNF} incorrect size. Please manually update from ${SSLSMP} + elif [ $(wc -l ${SSLSMP} | cut -d ' ' -f 1) -ne ${SMPSZE} ]; then + echo Original ${SSLSMP} incorrect size. Please manually update to ${SSLCNF} + else + mv ${SSLCNF} ${SSLCNF}.orig + head -n ${CNFINS} ${SSLCNF}.orig > ${SSLCNF} + head -n ${SMPUSE} ${SSLSMP} | tail -n 1 >> ${SSLCNF} + tail -n $((CNFSZE - CNFINS)) ${SSLCNF}.orig >> ${SSLCNF} + head -n $((SMPUSE - 1)) ${SSLSMP} >> ${SSLCNF} + tail -n $((SMPSZE - SMPUSE)) ${SSLSMP} >> ${SSLCNF} + fi + fi +fi + +%postun +if [ $1 -eq 0 ]; then #last uninstall, modify %{_sysconfdir}/openssl.cnf (bsc#942839) + SSLCNF=%{_sysconfdir}/ssl/openssl.cnf + if [ -f ${SSLCNF}.orig ]; then + mv ${SSLCNF}.orig ${SSLCNF} + fi +fi %files %defattr(-, root, root) %doc README COPYING -%doc openssl.cnf.sample -%dir %{_libdir}/engines -%{_libdir}/engines/libibmca.* +%doc src/openssl.cnf.sample +/%{_lib}/engines/libibmca.* +%{_mandir}/man5/ibmca.5%{ext_man} %changelog ++++++ openssl-ibmca-1.2.0.tar.gz -> openssl-ibmca-1.3.0.tar.bz2 ++++++ ++++ 48361 lines of diff (skipped) ++++++ openssl-ibmca-configure.patch ++++++ --- /var/tmp/diff_new_pack.lFRkwD/_old 2016-04-28 16:57:22.000000000 +0200 +++ /var/tmp/diff_new_pack.lFRkwD/_new 2016-04-28 16:57:22.000000000 +0200 @@ -1,11 +1,11 @@ ---- configure.in -+++ configure.in -@@ -28,7 +28,7 @@ - # libica is dlopened, so do not add it to LIBS - save_LIBS=$LIBS - AC_CHECK_LIB(ica, ica_open_adapter, [], \ -- AC_MSG_ERROR([*** libica-2.x library not found]), [-lssl]) -+ AC_MSG_ERROR([*** libica-2.x library not found]), [-lssl -lrt -lcrypto -lpthread]) - LIBS=$save_LIBS +--- configure 2016-03-31 18:07:02.238114067 -0400 ++++ configure 2016-03-31 18:09:16.168114067 -0400 +@@ -11511,7 +11511,7 @@ + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lica $LIBS" ++LIBS="-lica -lpthread $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ - # OpenSSL location
