rpms/openssl-ibmca/devel openssl-ibmca-1.1-libica-soname.patch, NONE, 1.1 openssl-ibmca-1.1-linking.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 openssl-ibmca.spec, 1.2, 1.3 sources, 1.2, 1.3 openssl-ibmca-1.0.0-make.patch, 1.1, NONE

Tue Jun 29 07:37:43 UTC 2010

Author: sharkcz

Update of /cvs/pkgs/rpms/openssl-ibmca/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11898

Modified Files:
	.cvsignore openssl-ibmca.spec sources 
Added Files:
	openssl-ibmca-1.1-libica-soname.patch 
	openssl-ibmca-1.1-linking.patch 
Removed Files:
	openssl-ibmca-1.0.0-make.patch 
Log Message:
update to 1.1

openssl-ibmca-1.1-libica-soname.patch:
 e_ibmca.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openssl-ibmca-1.1-libica-soname.patch ---
diff -up openssl-ibmca-1.1/e_ibmca.c.soname openssl-ibmca-1.1/e_ibmca.c
--- openssl-ibmca-1.1/e_ibmca.c.soname	2010-04-22 13:18:48.000000000 +0200
+++ openssl-ibmca-1.1/e_ibmca.c	2010-04-22 13:19:11.000000000 +0200
@@ -113,7 +113,7 @@ typedef struct ibmca_sha256_ctx {
 } IBMCA_SHA256_CTX;
 #endif
 
-static const char *IBMCA_LIBNAME = "ica";
+static const char *IBMCA_LIBNAME = "ica-2.0";
 
 static int cipher_nids[] = { 
 	NID_des_ecb,

openssl-ibmca-1.1-linking.patch:
 Makefile.am  |    2 +-
 configure.in |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE openssl-ibmca-1.1-linking.patch ---
diff -up openssl-ibmca-1.1/configure.in.make openssl-ibmca-1.1/configure.in
--- openssl-ibmca-1.1/configure.in.make	2010-04-22 14:26:23.000000000 +0200
+++ openssl-ibmca-1.1/configure.in	2010-04-22 14:28:26.000000000 +0200
@@ -25,8 +25,11 @@ fi
 AC_MSG_CHECKING([libica-2.x])
 AC_CHECK_HEADER([ica_api.h], [], \
              AC_MSG_ERROR([*** libica header not found]))
+# 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])
+LIBS=$save_LIBS
 
 # OpenSSL location
 AC_MSG_CHECKING([OpenSSL])
diff -up openssl-ibmca-1.1/Makefile.am.make openssl-ibmca-1.1/Makefile.am
--- openssl-ibmca-1.1/Makefile.am.make	2010-01-26 12:51:47.000000000 +0100
+++ openssl-ibmca-1.1/Makefile.am	2010-04-22 14:25:13.000000000 +0200
@@ -1,4 +1,4 @@
 lib_LTLIBRARIES=libibmca.la
 
-libibmca_la_LDFLAGS=@LIBS@ -lc
 libibmca_la_SOURCES=e_ibmca.c e_ibmca.h e_ibmca_err.c
+libibmca_la_LDFLAGS=-module -version-info 0:1:0 -shared -no-undefined -avoid-version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openssl-ibmca/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Jul 2009 20:35:31 -0000	1.2
+++ .cvsignore	29 Jun 2010 07:37:42 -0000	1.3
@@ -1 +1 @@
-openssl-ibmca-1.0.0.tar.bz2
+openssl-ibmca-1.1.tar.gz


Index: openssl-ibmca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl-ibmca/devel/openssl-ibmca.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openssl-ibmca.spec	25 Jul 2009 20:54:30 -0000	1.2
+++ openssl-ibmca.spec	29 Jun 2010 07:37:43 -0000	1.3
@@ -1,14 +1,17 @@
 Summary: A dynamic OpenSSL engine for IBMCA
 Name: openssl-ibmca
-Version: 1.0.0
+Version: 1.1
 Release: 2%{?dist}
 License: OpenSSL
 Group: System Environment/Libraries
 URL: http://sourceforge.net/projects/opencryptoki
-Source0: http://downloads.sourceforge.net/opencryptoki/%{name}-%{version}.tar.bz2
-Patch0: openssl-ibmca-1.0.0-make.patch
+Source0: http://downloads.sourceforge.net/opencryptoki/%{name}-%{version}.tar.gz
+# fix linking
+Patch0: openssl-ibmca-1.1-linking.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=584765
+Patch1: openssl-ibmca-1.1-libica-soname.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: openssl >= 0.9.8
+Requires: libica
 BuildRequires: libica-devel automake libtool
 ExclusiveArch: s390 s390x
 
@@ -18,12 +21,14 @@ A dynamic OpenSSL engine for IBMCA crypt
 
 %prep
 %setup -q
-%patch0 -p1 -b .make
-autoreconf -i -f
+%patch0 -p1 -b .linking
+%patch1 -p1 -b .libica-soname
+
+sh ./bootstrap.sh
 
 
 %build
-%configure --with-openssl=%{_prefix} --with-engines-dir=%{_libdir}/openssl/engines
+%configure 
 make %{?_smp_mflags}
 
 
@@ -31,7 +36,9 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT/%{_libdir}/openssl/engines/libibmca.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libibmca.la
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/openssl/engines
+mv $RPM_BUILD_ROOT%{_libdir}/*.so $RPM_BUILD_ROOT%{_libdir}/openssl/engines
 
 
 %clean
@@ -45,6 +52,26 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 22 2010 Dan Horák <dhorak at redhat.com> - 1.1-2
+- fixed opening of the libica library (#584765)
+- Resolves: #584765
+
+* Thu Mar  4 2010 Dan Horák <dhorak at redhat.com> - 1.1-1
+- rebased to 1.1 instead of patching
+- Resolves: #568847
+
+* Thu Feb 18 2010 Dan Horák <dhorak at redhat.com> - 1.0.0-5
+- added patch with port to libica 2.x API
+- Related: #543948
+
+* Wed Feb 10 2010 Dan Horák <dhorak at redhat.com> - 1.0.0-4
+- added explicit dependency on libica, because it's dlopened
+- Related: #543948
+
+* Tue Jan 12 2010 Dan Horák <dhorak at redhat.com> - 1.0.0-3
+- rebuild
+- Related: #543948
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openssl-ibmca/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Jul 2009 20:35:31 -0000	1.2
+++ sources	29 Jun 2010 07:37:43 -0000	1.3
@@ -1 +1 @@
-403fb0544017ebf6c1c9bd2501015154  openssl-ibmca-1.0.0.tar.bz2
+c94f2b5cbef6c78eefa49d71d0f4b972  openssl-ibmca-1.1.tar.gz


--- openssl-ibmca-1.0.0-make.patch DELETED ---

