- updated IBM ICA engine library and patch to latest upstream version

.cvsignore

@@ -1,3 +1,2 @@
-libica-1.3.5.tar.gz
-libica-1.3.5-3.tar.gz
 openssl-0.9.7f-usa.tar.bz2
+libica-1.3.6-rc2.tar.bz2

openssl.spec

@@ -17,12 +17,12 @@
 # Arches for which we don't build subpackages.
 %define optimize_arches i686
 
-%define libicaversion 1.3.5-3
+%define libicaversion 1.3.6-rc2
 
 Summary: The OpenSSL toolkit.
 Name: openssl
 Version: 0.9.7f
-Release: 10
+Release: 11
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -30,7 +30,8 @@ Source3: ca-bundle.crt
 Source4: https://rhn.redhat.com/help/RHNS-CA-CERT
 Source5: https://rhn.redhat.com/help/RHNS-CA-CERT.asc
 Source6: make-dummy-cert
-Source7: libica-%{libicaversion}.tar.gz
+# http://sourceforge.net/projects/opencryptoki/
+Source7: libica-%{libicaversion}.tar.bz2
 Source8: openssl-thread-test.c
 Source9: opensslconf-new.h
 Source10: opensslconf-new-warning.h
@@ -40,12 +41,11 @@ Patch2: openssl-0.9.7-beta6-ia64.patch
 Patch3: openssl-0.9.7e-soversion.patch
 Patch4: openssl-0.9.6-x509.patch
 Patch5: openssl-0.9.7-beta5-version-add-engines.patch
-Patch6: openssl-0.9.7d-ICA_engine-jun142004.patch
-Patch10: libica-1.2-struct.patch
+Patch6: openssl-0.9.7d-ICA_engine-sep142005.patch
+Patch10: libica-1.3.4-urandom.patch
 Patch11: libica-1.2-cleanup.patch
 Patch12: openssl-0.9.7a-libica-autoconf.patch
 Patch18: openssl-0.9.7a-krb5-1.3.patch
-Patch40: libica-1.3.4-urandom.patch
 Patch42: openssl-0.9.7e-krb5.patch
 Patch43: openssl-0.9.7f-bn-asm-uninitialized.patch
 Patch44: openssl-0.9.7f-ca-dir.patch
@@ -106,9 +106,12 @@ from other formats to the formats used by the OpenSSL toolkit.
 %patch5 -p1 -b .version-add-engines
 %patch6 -p1 -b .ibmca
 
-%ifarch s390 s390x
 pushd libica-%{libicaversion}
+# Patch for libica to use /dev/urandom instead of internal pseudo random number
+# generator.
+%patch10 -p2 -b .urandom
 %patch11 -p1 -b .cleanup
+%ifarch s390 s390x
 if [[ $RPM_BUILD_ROOT  ]] ; then
         export INSROOT=$RPM_BUILD_ROOT
 fi
@@ -117,15 +120,12 @@ touch Makefile.macros
 automake --gnu -acf
 autoconf
 libtoolize --copy --force
-popd
 %endif
+popd
 
 %patch12 -p1 -b .libica-autoconf
 %patch18 -p1 -b .krb5-1.3
 
-# Patch for libica to use /dev/urandom instead of internal pseudo random number
-# generator.
-%patch40 -p1 -b .urandom
 
 # Fix link line for libssl (bug #111154).
 %patch42 -p1 -b .krb5
@@ -410,6 +410,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libssl.so.%{soversion}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Oct 21 2005 Tomas Mraz <tmraz@redhat.com> 0.9.7f-11
+- updated IBM ICA engine library and patch to latest upstream version
+
 * Wed Oct 12 2005 Tomas Mraz <tmraz@redhat.com> 0.9.7f-10
 - fix CAN-2005-2969 - remove SSL_OP_MSIE_SSLV2_RSA_PADDING which
   disables the countermeasure against man in the middle attack in SSLv2

sources

@@ -1,3 +1,2 @@
-c8b206aa3ff78d963f81d8ae1fa9c4f4  libica-1.3.5.tar.gz
-ec395d0e264f756a5fc0a8ecdcc81d8b  libica-1.3.5-3.tar.gz
 1f93cf2986593d14b2a64983e4e347e3  openssl-0.9.7f-usa.tar.bz2
+a915bcff41b687cb5a4f0091374b421d  libica-1.3.6-rc2.tar.bz2