From 7099544096539870a6e1283b5e24f08b9da7923d Mon Sep 17 00:00:00 2001 From: nectar Date: Sat, 10 Aug 2002 01:48:01 +0000 Subject: [PATCH] Import of OpenSSL 0.9.6g. --- crypto/openssl/CHANGES | 6 ++++++ crypto/openssl/FAQ | 2 +- crypto/openssl/Makefile.org | 7 ++++--- crypto/openssl/Makefile.ssl | 9 +++++---- crypto/openssl/NEWS | 4 ++++ crypto/openssl/README | 2 +- crypto/openssl/config | 3 +++ crypto/openssl/crypto/opensslv.h | 4 ++-- crypto/openssl/openssl.spec | 2 +- 9 files changed, 27 insertions(+), 12 deletions(-) diff --git a/crypto/openssl/CHANGES b/crypto/openssl/CHANGES index dc066c01315f..75ebac55bf53 100644 --- a/crypto/openssl/CHANGES +++ b/crypto/openssl/CHANGES @@ -2,6 +2,12 @@ OpenSSL CHANGES _______________ + Changes between 0.9.6f and 0.9.6g [9 Aug 2002] + + *) [In 0.9.6g-engine release:] + Fix crypto/engine/vendor_defns/cswift.h for WIN32 (use '_stdcall'). + [Lynn Gazis ] + Changes between 0.9.6e and 0.9.6f [8 Aug 2002] *) Fix ASN1 checks. Check for overflow by comparing with LONG_MAX diff --git a/crypto/openssl/FAQ b/crypto/openssl/FAQ index b49423960b5d..f9cd7d2820a9 100644 --- a/crypto/openssl/FAQ +++ b/crypto/openssl/FAQ @@ -61,7 +61,7 @@ OpenSSL - Frequently Asked Questions * Which is the current version of OpenSSL? The current version is available from . -OpenSSL 0.9.6f was released on 8 August 2002. +OpenSSL 0.9.6g was released on 9 August 2002. In addition to the current stable release, you can also access daily snapshots of the OpenSSL development version at $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \ done; \ - @for i in doc/crypto/*.pod doc/ssl/*.pod; do \ + for i in doc/crypto/*.pod doc/ssl/*.pod; do \ fn=`basename $$i .pod`; \ if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \ echo "installing man$$sec/`basename $$i .pod`.$$sec"; \ diff --git a/crypto/openssl/Makefile.ssl b/crypto/openssl/Makefile.ssl index f6edb188f791..43b5ac39582b 100644 --- a/crypto/openssl/Makefile.ssl +++ b/crypto/openssl/Makefile.ssl @@ -4,7 +4,7 @@ ## Makefile for OpenSSL ## -VERSION=0.9.6f +VERSION=0.9.6g MAJOR=0 MINOR=9.6 SHLIB_VERSION_NUMBER=0.9.6 @@ -679,7 +679,8 @@ install: all install_docs done; \ ( here="`pwd`"; \ cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \ - $(MAKE) -f $$here/Makefile link-shared ); \ + set $(MAKE); \ + $$1 -f $$here/Makefile link-shared ); \ fi install_docs: @@ -688,7 +689,7 @@ install_docs: $(INSTALL_PREFIX)$(MANDIR)/man3 \ $(INSTALL_PREFIX)$(MANDIR)/man5 \ $(INSTALL_PREFIX)$(MANDIR)/man7 - @pod2man=`cd ../../util; ./pod2mantest ignore`; \ + @pod2man=`cd util; ./pod2mantest ignore`; \ for i in doc/apps/*.pod; do \ fn=`basename $$i .pod`; \ if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \ @@ -699,7 +700,7 @@ install_docs: --release=$(VERSION) `basename $$i`") \ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \ done; \ - @for i in doc/crypto/*.pod doc/ssl/*.pod; do \ + for i in doc/crypto/*.pod doc/ssl/*.pod; do \ fn=`basename $$i .pod`; \ if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \ echo "installing man$$sec/`basename $$i .pod`.$$sec"; \ diff --git a/crypto/openssl/NEWS b/crypto/openssl/NEWS index e597dcd213a8..577db09cff5e 100644 --- a/crypto/openssl/NEWS +++ b/crypto/openssl/NEWS @@ -5,6 +5,10 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 0.9.6f and OpenSSL 0.9.6g: + + o Important building fixes on Unix. + Major changes between OpenSSL 0.9.6e and OpenSSL 0.9.6f: o Various important bugfixes. diff --git a/crypto/openssl/README b/crypto/openssl/README index df4267cf0c89..da9015331f68 100644 --- a/crypto/openssl/README +++ b/crypto/openssl/README @@ -1,5 +1,5 @@ - OpenSSL 0.9.6f 8 August 2002 + OpenSSL 0.9.6g 9 August 2002 Copyright (c) 1998-2002 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson diff --git a/crypto/openssl/config b/crypto/openssl/config index 5f4ed18f0eca..40ad0fe6cf48 100755 --- a/crypto/openssl/config +++ b/crypto/openssl/config @@ -384,6 +384,9 @@ done GCCVER=`(gcc -dumpversion) 2>/dev/null` if [ "$GCCVER" != "" ]; then CC=gcc + # then strip off whatever prefix egcs prepends the number with... + # Hopefully, this will work for any future prefixes as well. + GCCVER=`echo $GCCVER | sed 's/^[a-zA-Z]*\-//'` # Since gcc 3.1 gcc --version behaviour has changed. gcc -dumpversion # does give us what we want though, so we use that. We just just the # major and minor version numbers. diff --git a/crypto/openssl/crypto/opensslv.h b/crypto/openssl/crypto/opensslv.h index f1465ece09b9..b6ae9458cc5c 100644 --- a/crypto/openssl/crypto/opensslv.h +++ b/crypto/openssl/crypto/opensslv.h @@ -25,8 +25,8 @@ * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -#define OPENSSL_VERSION_NUMBER 0x0090606fL -#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.6f 8 Aug 2002" +#define OPENSSL_VERSION_NUMBER 0x0090607fL +#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.6g 9 Aug 2002" #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT diff --git a/crypto/openssl/openssl.spec b/crypto/openssl/openssl.spec index dd22218984cb..9bd9edb4b0e9 100644 --- a/crypto/openssl/openssl.spec +++ b/crypto/openssl/openssl.spec @@ -1,7 +1,7 @@ %define libmaj 0 %define libmin 9 %define librel 6 -%define librev f +%define librev g Release: 1 %define openssldir /var/ssl