diff --git a/.gitignore b/.gitignore index 97de89b..880087c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ openssl-ibmca-1.1.tar.gz /openssl-ibmca-1.4.0.tar.gz /openssl-ibmca-1.4.1.tar.gz /openssl-ibmca-2.0.0.tar.gz +/openssl-ibmca-2.0.2.tar.gz diff --git a/openssl-ibmca-2.0.0-libica-soname.patch b/openssl-ibmca-2.0.0-libica-soname.patch deleted file mode 100644 index 06aa8a3..0000000 --- a/openssl-ibmca-2.0.0-libica-soname.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up openssl-ibmca-2.0.0/src/e_ibmca.c.orig openssl-ibmca-2.0.0/src/e_ibmca.c ---- openssl-ibmca-2.0.0/src/e_ibmca.c.orig 2018-06-12 12:37:00.803473301 +0200 -+++ openssl-ibmca-2.0.0/src/e_ibmca.c 2018-06-12 12:37:09.263473301 +0200 -@@ -43,7 +43,7 @@ - #ifndef OPENSSL_NO_HW_IBMCA - - #define IBMCA_LIB_NAME "ibmca engine" --#define LIBICA_SHARED_LIB "libica.so" -+#define LIBICA_SHARED_LIB "libica.so.3" - - #define AP_PATH "/sys/devices/ap" - diff --git a/openssl-ibmca-2.0.0-linking.patch b/openssl-ibmca-2.0.0-linking.patch deleted file mode 100644 index fbc72e6..0000000 --- a/openssl-ibmca-2.0.0-linking.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a6a837166e45e6537f35f6d35c38db54c6f4a640 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Tue, 12 Jun 2018 12:51:12 +0200 -Subject: [PATCH] omit version from filename - -The ibmca.so file is a dlopen()-ed module, so having the version info -in the filename is superfluous. ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index fa37e4d..2254379 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -13,7 +13,7 @@ ibmca_la_SOURCES=e_ibmca.c \ - - ibmca_la_LIBADD=-ldl - ibmca_la_LDFLAGS=-module -version-info ${VERSION} -shared -no-undefined \ -- -Wl,--version-script=${srcdir}/../ibmca.map -+ -avoid-version -Wl,--version-script=${srcdir}/../ibmca.map - - dist_ibmca_la_SOURCES=ibmca.h e_ibmca_err.h - EXTRA_DIST = openssl.cnf.sample --- -2.14.3 - diff --git a/openssl-ibmca.spec b/openssl-ibmca.spec index e4eafe1..543a7d6 100644 --- a/openssl-ibmca.spec +++ b/openssl-ibmca.spec @@ -2,16 +2,12 @@ Summary: A dynamic OpenSSL engine for IBMCA Name: openssl-ibmca -Version: 2.0.0 -Release: 3%{?dist} +Version: 2.0.2 +Release: 1%{?dist} License: ASL 2.0 Group: System Environment/Libraries URL: https://github.com/opencryptoki Source0: https://github.com/opencryptoki/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -# https://bugzilla.redhat.com/show_bug.cgi?id=584765 -Patch0: %{name}-2.0.0-libica-soname.patch -# https://github.com/opencryptoki/openssl-ibmca/pull/44 -Patch1: %{name}-2.0.0-linking.patch Requires: libica >= 3.3.0 BuildRequires: gcc BuildRequires: libica-devel >= 3.3.0 @@ -55,6 +51,9 @@ make check %changelog +* Thu Dec 13 2018 Dan Horák - 2.0.2-1 +- updated to 2.0.2 + * Thu Aug 23 2018 Dan Horák - 2.0.0-3 - run upstream test-suite during build diff --git a/sources b/sources index 666a5c7..4dc7c23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openssl-ibmca-2.0.0.tar.gz) = 1a2d881b828369c7686d1514d6539451eb41f53f582f683513c7d64d4e081fd0f86c624ee2792fc4debcbf510611a9889e614f2a9999bf1d230658954e4d4f3f +SHA512 (openssl-ibmca-2.0.2.tar.gz) = 05590b1d1764fd70ad2fac2c5ca4096ccaaf231cd38483d90f27caba1fc523dffcab1223b01413b80e607b91b416e0af0d861cf8bd9f1d7c9103a3529a12496c