From 4f250d39860d6c5b87bcac53fe2a45eb043fd3d1 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 09:40:40 +0000 Subject: auto-import openssl-0.9.6b-15 from openssl-0.9.6b-15.src.rpm --- diff --git a/hobble-openssl b/hobble-openssl index c95cf2d..31e11f8 100755 --- a/hobble-openssl +++ b/hobble-openssl @@ -6,7 +6,8 @@ # RC5: 5,724,428 03/03/2015 # Bah. Assembler is hard to port. -(find crypto/{idea,mdc2,rc5,sha}/asm -type f | xargs -r rm -fv) +#(find crypto/{idea,mdc2,rc5,sha}/asm -type f | xargs -r rm -fv) +(find crypto/{idea,mdc2,rc5}/asm -type f | xargs -r rm -fv) # IDEA, MDC2 and RC5. for c in `find crypto/{idea,mdc2,rc5} -name "*.c" -a \! -name "*test*" -type f` ; do diff --git a/openssl.spec b/openssl.spec index ac5bc5a..861f03c 100644 --- a/openssl.spec +++ b/openssl.spec @@ -3,7 +3,7 @@ Summary: The OpenSSL toolkit. Name: openssl Version: 0.9.6b -Release: 8 +Release: 15 Source: openssl-engine-%{version}-usa.tar.bz2 Source1: hobble-openssl Source2: Makefile.certificate @@ -97,7 +97,9 @@ LD_LIBRARY_PATH=${TOPDIR}:${TOPDIR}/bin ; export LD_LIBRARY_PATH perl util/perlpath.pl `dirname %{__perl}` %ifarch %ix86 sslarch=linux-elf -sslflags="no-asm 386" +if ! echo %{_target} | grep -q i686 ; then + sslflags="no-asm 386" +fi %endif %ifarch sparc sslarch=linux-sparcv9 @@ -105,7 +107,6 @@ sslflags=no-asm %endif %ifarch ia64 sslarch=linux-ia64 -sslflags=no-asm %endif %ifarch alpha sslarch=alpha-gcc @@ -202,10 +203,11 @@ ln -s certs/ca-bundle.crt $RPM_BUILD_ROOT%{_datadir}/ssl/cert.pem %attr(0755,root,root) %{_bindir}/openssl %attr(0755,root,root) /lib/*.so.%{version} -%attr(0644,root,root) %{_mandir}/man1*/* +%attr(0644,root,root) %{_mandir}/man1*/[ABD-Zabcd-z]* %attr(0644,root,root) %{_mandir}/man5*/* %attr(0644,root,root) %{_mandir}/man7*/* +%ifnarch i686 %files devel %defattr(-,root,root) %{_prefix}/include/openssl @@ -218,12 +220,38 @@ ln -s certs/ca-bundle.crt $RPM_BUILD_ROOT%{_datadir}/ssl/cert.pem %attr(0755,root,root) %{_bindir}/c_rehash %attr(0644,root,root) %{_mandir}/man1*/*.pl* %{_datadir}/ssl/misc/*.pl +%endif %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %changelog +* Fri Mar 15 2002 Nalin Dahyabhai 0.9.6b-15 +- only build subpackages on primary arches + +* Fri Mar 15 2002 Nalin Dahyabhai 0.9.6b-14 +- rebuild + +* Thu Mar 14 2002 Nalin Dahyabhai 0.9.6b-13 +- on ia32, only disable use of assembler on i386 +- enable assembly on ia64 + +* Wed Jan 09 2002 Tim Powers 0.9.6b-12 +- automated rebuild + +* Mon Jan 07 2002 Florian La Roche 0.9.6b-11 +- fix sparcv9 entry + +* Wed Oct 10 2001 Florian La Roche 0.9.6b-10 +- delete BN_LLONG for s390x, patch from Oliver Paukstadt + +* Mon Sep 17 2001 Nalin Dahyabhai 0.9.6b-9 +- update AEP driver patch + +* Mon Sep 10 2001 Nalin Dahyabhai +- adjust RNG disabling patch to match version of patch from Broadcom + * Fri Sep 7 2001 Nalin Dahyabhai 0.9.6b-8 - disable the RNG in the ubsec engine driver diff --git a/sources b/sources index 53c621d..36b5abe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e2e5ad4a37709e8c7a854fb2adf2901f openssl-engine-0.9.6b-usa.tar.bz2 +cf3e2f9189bd835aab3c6464444b1b9f openssl-engine-0.9.6b-usa.tar.bz2