rpms/openssl/devel .cvsignore, 1.14, 1.15 openssl-0.9.8a-padlock.patch, 1.1, 1.2 openssl.spec, 1.76, 1.77 sources, 1.16, 1.17 libica-1.3.4-urandom.patch, 1.4, NONE libica-1.3.6-linkcrypto.patch, 1.1, NONE libica-1.3.6-no-config-h.patch, 1.1, NONE libica-1.3.6-stale-handles.patch, 1.1, NONE openssl-0.9.7a-libica-autoconf.patch, 1.1, NONE openssl-0.9.8a-ICA_engine-sep142005.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jun 21 21:14:09 UTC 2006
Author: tmraz
Update of /cvs/dist/rpms/openssl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28503
Modified Files:
.cvsignore openssl-0.9.8a-padlock.patch openssl.spec sources
Removed Files:
libica-1.3.4-urandom.patch libica-1.3.6-linkcrypto.patch
libica-1.3.6-no-config-h.patch
libica-1.3.6-stale-handles.patch
openssl-0.9.7a-libica-autoconf.patch
openssl-0.9.8a-ICA_engine-sep142005.patch
Log Message:
* Wed Jun 21 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8b-3
- dropped libica and ica engine from build
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 11 May 2006 11:52:19 -0000 1.14
+++ .cvsignore 21 Jun 2006 21:14:05 -0000 1.15
@@ -1,2 +1 @@
-libica-1.3.6-rc3.tar.bz2
openssl-0.9.8b-usa.tar.bz2
openssl-0.9.8a-padlock.patch:
eng_all.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Index: openssl-0.9.8a-padlock.patch
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/openssl-0.9.8a-padlock.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openssl-0.9.8a-padlock.patch 4 Apr 2006 17:45:56 -0000 1.1
+++ openssl-0.9.8a-padlock.patch 21 Jun 2006 21:14:05 -0000 1.2
@@ -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
Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- openssl.spec 21 Jun 2006 12:49:44 -0000 1.76
+++ openssl.spec 21 Jun 2006 21:14:05 -0000 1.77
@@ -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 @@
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 @@
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 @@
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 @@
%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 @@
# 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 @@
# 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 @@
%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 @@
%postun -p /sbin/ldconfig
%changelog
-* Wed Jun 21 2006 Joe Orton <jorton at redhat.com> 0.9.8b-3
+* Wed Jun 21 2006 Tomas Mraz <tmraz at redhat.com> - 0.9.8b-3
+- dropped libica and ica engine from build
+
+* Wed Jun 21 2006 Joe Orton <jorton at redhat.com>
- update to new CA bundle from mozilla.org; adds CA certificates
from netlock.hu and startcom.org
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 11 May 2006 11:52:19 -0000 1.16
+++ sources 21 Jun 2006 21:14:05 -0000 1.17
@@ -1,2 +1 @@
-ec1e464d40fb61fed27b7b0078d2e3dd libica-1.3.6-rc3.tar.bz2
c99f8df9f19fdd38ee784b0ac06c2221 openssl-0.9.8b-usa.tar.bz2
--- libica-1.3.4-urandom.patch DELETED ---
--- libica-1.3.6-linkcrypto.patch DELETED ---
--- libica-1.3.6-no-config-h.patch DELETED ---
--- libica-1.3.6-stale-handles.patch DELETED ---
--- openssl-0.9.7a-libica-autoconf.patch DELETED ---
--- openssl-0.9.8a-ICA_engine-sep142005.patch DELETED ---
More information about the fedora-cvs-commits
mailing list