pool/openssl-ibmca
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 528233 from security

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/528233
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl-ibmca?expand=0&rev=27
This commit is contained in:
Dominique Leuenberger 2017-09-23 19:36:11 +00:00 committed by Git OBS Bridge
parent 06e03e382b
commit a4aa0336da
4 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openssl-ibmca-configure.patch
View File

@ -1,11 +0,0 @@
--- 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. */

13
openssl-ibmca-fix-enginepath.patch
View File

@ -1,13 +0,0 @@
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

12
openssl-ibmca.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Sep 22 07:50:52 UTC 2017 - mpost@suse.com
- 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.
-------------------------------------------------------------------
Tue Apr 11 15:09:03 UTC 2017 - mpost@suse.com

22
openssl-ibmca.spec
View File

@ -25,9 +25,7 @@ Group: Hardware/Other
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 @@ IBM eServer Cryptographic Accelerator (ICA).
%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 @@ fi
%defattr(-, root, root)
%doc README COPYING
%doc src/openssl.cnf.sample
/%{_lib}/engines/libibmca.*
%{_ENGINE_DIR}/libibmca.*
%{_mandir}/man5/ibmca.5%{ext_man}
%changelog