From def39f16e57cc18ad171ee0e69cc667cf9240669 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 09:35:12 +0000 Subject: auto-import changelog data from openssl-0.9.5a-17.src.rpm Tue Sep 26 2000 Bill Nottingham - fix some issues in building when it's not installed --- diff --git a/openssl.spec b/openssl.spec index b9ba350..42bbcd6 100644 --- a/openssl.spec +++ b/openssl.spec @@ -4,7 +4,7 @@ Summary: Secure Sockets Layer Toolkit Name: openssl Version: 0.9.5a -Release: 14 +Release: 17 Source: openssl-%{version}-usa.tar.bz2 Source1: hobble-openssl Source2: Makefile.certificate @@ -14,6 +14,7 @@ Patch0: openssl-0.9.5-redhat.patch Patch1: openssl-0.9.5-rsanull.patch Patch2: openssl-0.9.5a-64.patch Patch3: openssl-0.9.5a-defaults.patch +Patch4: openssl-0.9.5a-ia64.patch Copyright: BSDish Group: System Environment/Libraries URL: http://www.openssl.org/ @@ -64,6 +65,7 @@ This package allows you to call OpenSSL functions from python scripts. %patch2 -p1 %endif %patch3 -p1 +%patch4 -p1 # Extract what we need for building extensions. gzip -dc %{SOURCE3} | tar xf - @@ -140,10 +142,11 @@ popd # Build the python extensions. pushd m2crypto-%{m2crypto_version}/swig +export PATH=`pwd`/../../bin:$PATH make \ - INCLUDE=-I. -I../../include \ + INCLUDE="-I. -I../../include" \ LIBS="-L${TOPDIR} -lssl -lcrypto -lc" \ - PYINCLUDE="-DHAVE_CONFIG_H -I/usr/include/python1.5 -I/usr/lib/python1.5/config" + PYINCLUDE="-DHAVE_CONFIG_H -I/usr/include/python1.5 -I/usr/lib/python1.5/config" \ PYLIB=/usr/lib/python1.5/config cd ../doc sh -x go @@ -167,6 +170,13 @@ install -m644 $RPM_SOURCE_DIR/Makefile.certificate $RPM_BUILD_ROOT%{_datadir}/ss strip $RPM_BUILD_ROOT%{_bindir}/* ||: strip -g $RPM_BUILD_ROOT%{_libdir}/lib* ||: +# Make sure we actually include the headers we built against. +for header in $RPM_BUILD_ROOT%{_includedir}/openssl/* ; do + if [ -f ${header} -a -f include/openssl/$(basename ${header}) ] ; then + install -m644 include/openssl/`basename ${header}` ${header} + fi +done + # Fudge this. mv $RPM_BUILD_ROOT%{_mandir}/man1/passwd.1 $RPM_BUILD_ROOT%{_mandir}/man1/sslpasswd.1 mv $RPM_BUILD_ROOT%{_mandir}/man3/rand.3 $RPM_BUILD_ROOT%{_mandir}/man3/sslrand.3 @@ -230,24 +240,57 @@ popd %postun -p /sbin/ldconfig %changelog -* Thu Sep 21 2000 Nalin Dahyabhai +* Tue Sep 26 2000 Bill Nottingham +- fix some issues in building when it's not installed + +* Wed Sep 6 2000 Nalin Dahyabhai +- make sure the headers we include are the ones we built with (aaaaarrgh!) + +* Fri Sep 1 2000 Nalin Dahyabhai +- add Richard Henderson's patch for BN on ia64 +- clean up the changelog + +* Tue Aug 29 2000 Nalin Dahyabhai +- fix the building of python modules without openssl-devel already installed + +* Wed Aug 23 2000 Nalin Dahyabhai +- byte-compile python extensions without the build-root +- adjust the makefile to not remove temporary files (like .key files when + building .csr files) by marking them as .PRECIOUS + +* Sat Aug 19 2000 Nalin Dahyabhai +- break out python extensions into a subpackage + +* Mon Jul 17 2000 Nalin Dahyabhai - tweak the makefile some more + +* Tue Jul 11 2000 Nalin Dahyabhai - disable MD2 support + +* Thu Jul 6 2000 Nalin Dahyabhai - disable MDC2 support + +* Sun Jul 2 2000 Nalin Dahyabhai +- tweak the disabling of RC5, IDEA support - tweak the makefile -- rework certificate makefile to have the right parts for Apache + +* Thu Jun 29 2000 Nalin Dahyabhai - strip binaries and libraries -- enable actual RSA support -- use %{__perl} instead of /usr/bin/perl +- rework certificate makefile to have the right parts for Apache + +* Wed Jun 28 2000 Nalin Dahyabhai +- use %%{_perl} instead of /usr/bin/perl +- disable alpha until it passes its own test suite + +* Fri Jun 9 2000 Nalin Dahyabhai - move the passwd.1 man page out of the passwd package's way + +* Fri Jun 2 2000 Nalin Dahyabhai - update to 0.9.5a, modified for U.S. - add perl as a build-time requirement -- disable RC5, IDEA support -- break out python extensions -- byte-compile python extensions without the build-root -- adjust the makefile to not remove temporary files (like .key files when - building .csr files) -- fix the building of python modules without openssl-devel already installed +- move certificate makefile to another package +- disable RC5, IDEA, RSA support +- remove optimizations for now * Wed Mar 1 2000 Florian La Roche - Bero told me to move the Makefile into this package