diff --git a/.cvsignore b/.cvsignore index 12278ad..664ec60 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -libica-1.3.6-rc3.tar.bz2 openssl-0.9.8b-usa.tar.bz2 diff --git a/openssl-0.9.8a-padlock.patch b/openssl-0.9.8a-padlock.patch index 7df0c5b..def4e80 100644 --- a/openssl-0.9.8a-padlock.patch +++ b/openssl-0.9.8a-padlock.patch @@ -1,16 +1,16 @@ ---- openssl-0.9.8a/crypto/engine/eng_all.c.padlock 2005-11-22 16:36:22.000000000 +0100 -+++ openssl-0.9.8a/crypto/engine/eng_all.c 2006-04-04 18:03:13.000000000 +0200 -@@ -72,6 +72,9 @@ - #if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_IBMCA) - ENGINE_load_ibmca(); +--- openssl-0.9.8b/crypto/engine/eng_all.c.padlock 2005-04-19 15:24:44.000000000 +0200 ++++ openssl-0.9.8b/crypto/engine/eng_all.c 2006-06-21 19:57:29.000000000 +0200 +@@ -69,6 +69,9 @@ + ENGINE_load_openssl(); #endif + ENGINE_load_dynamic(); +#if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK) + ENGINE_load_padlock(); +#endif #ifndef OPENSSL_NO_STATIC_ENGINE #ifndef OPENSSL_NO_HW #ifndef OPENSSL_NO_HW_4758_CCA -@@ -98,9 +101,6 @@ +@@ -95,9 +98,6 @@ #ifndef OPENSSL_NO_HW_UBSEC ENGINE_load_ubsec(); #endif diff --git a/openssl.spec b/openssl.spec index ae3d9f1..b5f3f5f 100644 --- a/openssl.spec +++ b/openssl.spec @@ -18,8 +18,6 @@ # Arches for which we don't build subpackages. %define optimize_arches i686 -%define libicaversion 1.3.6-rc3 - Summary: The OpenSSL toolkit Name: openssl Version: 0.9.8b @@ -31,8 +29,6 @@ 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 -# http://sourceforge.net/projects/opencryptoki/ -Source7: libica-%{libicaversion}.tar.bz2 Source8: openssl-thread-test.c Source9: opensslconf-new.h Source10: opensslconf-new-warning.h @@ -43,14 +39,7 @@ Patch2: openssl-0.9.8a-link-krb5.patch Patch3: openssl-0.9.8b-soversion.patch Patch4: openssl-0.9.8a-enginesdir.patch Patch5: openssl-0.9.8a-no-rpath.patch -Patch6: openssl-0.9.7a-libica-autoconf.patch -# Added engines -Patch20: libica-1.3.4-urandom.patch -Patch21: libica-1.3.6-linkcrypto.patch -Patch22: openssl-0.9.8a-ICA_engine-sep142005.patch -Patch23: libica-1.3.6-stale-handles.patch Patch24: openssl-0.9.8a-padlock.patch -Patch25: libica-1.3.6-no-config-h.patch # Functionality changes Patch32: openssl-0.9.7-beta6-ia64.patch Patch33: openssl-0.9.7f-ca-dir.patch @@ -98,7 +87,7 @@ package provides Perl scripts for converting certificates and keys from other formats to the formats used by the OpenSSL toolkit. %prep -%setup -q -a 7 +%setup -q %{SOURCE1} > /dev/null %patch0 -p1 -b .redhat @@ -108,17 +97,7 @@ from other formats to the formats used by the OpenSSL toolkit. %patch3 -p1 -b .soversion %patch4 -p1 -b .enginesdir %patch5 -p1 -b .no-rpath -%patch6 -p1 -b .libica-autoconf - -pushd libica-%{libicaversion} -# Patch for libica to use /dev/urandom instead of internal pseudo random number -# generator. -%patch20 -p2 -b .urandom -%patch21 -p1 -b .linkcrypto -%patch23 -p1 -b .stale-handles -%patch25 -p1 -b .no-config-h -popd -%patch22 -p1 -b .ibmca + %patch24 -p1 -b .padlock %patch32 -p1 -b .ia64 @@ -199,18 +178,6 @@ make -C test apps tests # Patch33 must be patched after tests otherwise they will fail patch -p1 -b -z .ca-dir < %{PATCH33} -%ifarch s390 s390x -pushd libica-%{libicaversion} -if [[ $RPM_BUILD_ROOT ]] ; then - export INSROOT=$RPM_BUILD_ROOT -fi -CPPFLAGS=-I../../include -export CPPFLAGS -%configure -make -popd -%endif - %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT # Install OpenSSL. @@ -321,21 +288,6 @@ rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/pki/tls/misc/*.pl # Remove fips fingerprint script rm -rf $RPM_BUILD_ROOT/%{_bindir}/openssl_fips_fingerprint -%ifarch s390 s390x -pushd libica-%{libicaversion} -if [[ $RPM_BUILD_ROOT ]] ; -then - export INSROOT=$RPM_BUILD_ROOT -fi -%makeinstall -mkdir -p $RPM_BUILD_ROOT/%{_libdir} -mv $RPM_BUILD_ROOT/%{_bindir}/libica.so $RPM_BUILD_ROOT/%{_libdir}/libica.so -cp -f include/ica_api.h $RPM_BUILD_ROOT%{_includedir} -popd -rm -f $RPM_BUILD_ROOT/%{_libdir}/libcrypto.so.%{soversion} -rm -f $RPM_BUILD_ROOT/%{_libdir}/libssl.so.%{soversion} -%endif - %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -367,17 +319,11 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libssl.so.%{soversion} %attr(0644,root,root) %{_mandir}/man1*/[ABD-Zabcd-z]* %attr(0644,root,root) %{_mandir}/man5*/* %attr(0644,root,root) %{_mandir}/man7*/* -%ifarch s390 s390x -%attr(0755,root,root) %{_libdir}/libica.so -%endif %ifnarch %{optimize_arches} %files devel %defattr(-,root,root) %{_prefix}/include/openssl -%ifarch s390 s390x -%{_includedir}/*.h -%endif %attr(0644,root,root) %{_libdir}/*.a %attr(0755,root,root) %{_libdir}/*.so %attr(0644,root,root) %{_mandir}/man3*/* @@ -396,7 +342,10 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libssl.so.%{soversion} %postun -p /sbin/ldconfig %changelog -* Wed Jun 21 2006 Joe Orton 0.9.8b-3 +* Wed Jun 21 2006 Tomas Mraz - 0.9.8b-3 +- dropped libica and ica engine from build + +* Wed Jun 21 2006 Joe Orton - update to new CA bundle from mozilla.org; adds CA certificates from netlock.hu and startcom.org diff --git a/sources b/sources index e8e1c64..8e58421 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -ec1e464d40fb61fed27b7b0078d2e3dd libica-1.3.6-rc3.tar.bz2 c99f8df9f19fdd38ee784b0ac06c2221 openssl-0.9.8b-usa.tar.bz2