From 0d16fe8fa86db897ad7b3561801c5548369666cc Mon Sep 17 00:00:00 2001
From: Dirk Froemberg <dirk@FreeBSD.org>
Date: Fri, 26 Mar 1999 08:42:49 +0000
Subject: Upgrade to 0.9.2b.

According to the OpenSSL-core-team you are strongly encouraged to upgrade
any old version. The new version has a lot of bug fixes.

- ${PREFIX}/bin/ssleay was renamed to ${PREFIX}/bin/openssl and
  ${PREFIX}/etc/ssleay.cnf to ${PREFIX}/lib/openssl.cnf

- there are no links from e. g. ${PREFIX}/bin/md5 to ${PREFIX}/bin/ssleay
  any longer, instead you have to call "openssl md5" now

- replaced HAS_CONFIGURE, CONFIGURE_SCRIPT and CONFIGURE_ENV with a
  do-configure target and changed the indention level

- some perl scripts need perl5 now, so set USE_PERL5 and replace perl
  with ${PERL5} where neccessary.

- honour ${CFLAGS}
---
 security/openssl-beta/files/patch-ab |  8 ++++----
 security/openssl-beta/files/patch-ac | 13 +++++++++++++
 security/openssl-beta/files/patch-ah | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 security/openssl-beta/files/patch-ac
 create mode 100644 security/openssl-beta/files/patch-ah

(limited to 'security/openssl-beta/files')

diff --git a/security/openssl-beta/files/patch-ab b/security/openssl-beta/files/patch-ab
index 2040fc110d81..e65b4eef33a2 100644
--- a/security/openssl-beta/files/patch-ab
+++ b/security/openssl-beta/files/patch-ab
@@ -1,11 +1,11 @@
---- Makefile.ssl.orig	Wed Dec 23 09:20:52 1998
-+++ Makefile.ssl	Sun Jan  3 20:03:00 1999
-@@ -174,7 +174,7 @@
+--- Makefile.ssl.orig	Mon Mar 22 18:18:18 1999
++++ Makefile.ssl	Wed Mar 24 17:25:25 1999
+@@ -149,7 +149,7 @@
  ONEDIRS=out tmp
  EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep
  WDIRS=  windows
 -LIBS=   libcrypto.a libssl.a 
-+LIBS=	libcrypto.a libssl.a libRSAglue.a
++LIBS=   libcrypto.a libssl.a libRSAglue.a
  
  GENERAL=        Makefile
  BASENAME=       openssl
diff --git a/security/openssl-beta/files/patch-ac b/security/openssl-beta/files/patch-ac
new file mode 100644
index 000000000000..457756975903
--- /dev/null
+++ b/security/openssl-beta/files/patch-ac
@@ -0,0 +1,13 @@
+--- Configure.orig	Fri Mar 12 21:31:13 1999
++++ Configure	Tue Mar 23 22:06:03 1999
+@@ -157,8 +157,8 @@
+ "NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
+ "NetBSD-x86",	"gcc:-DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
+ #"FreeBSD",   "gcc:-DTERMIOS -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
+-"FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
+-"FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
++"FreeBSD",      "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
++"FreeBSD-elf",  "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
+ "bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::RSA_LLONG $x86_gcc_des $x86_gcc_opts:$x86_bsdi_asm",
+ "nextstep",	"cc:-O3 -Wall::BN_LLONG $x86_gcc_des ${x86_gcc_opts}:::",
+ # NCR MP-RAS UNIX ver 02.03.01
diff --git a/security/openssl-beta/files/patch-ah b/security/openssl-beta/files/patch-ah
new file mode 100644
index 000000000000..c549f01d9119
--- /dev/null
+++ b/security/openssl-beta/files/patch-ah
@@ -0,0 +1,36 @@
+--- config.orig	Sun Jan 17 15:20:20 1999
++++ config	Tue Mar 23 23:26:36 1999
+@@ -282,15 +282,6 @@
+ esac
+ done
+ 
+-# figure out if gcc is available and if so we use it otherwise
+-# we fallback to whatever cc does on the system
+-GCCVER=`gcc -v 2>&1`
+-if [ $? = "0" ]; then
+-  CC=gcc
+-else
+-  CC=cc
+-fi
+-
+ # read the output of the embedded GuessOS 
+ read GUESSOS
+ 
+@@ -334,7 +325,7 @@
+ # run Configure to check to see if we need to specify the 
+ # compiler for the platform ... in which case we add it on
+ # the end ... otherwise we leave it off
+-perl ./Configure 2>&1 | grep "$OUT-$CC" > /dev/null
++${PERL} ./Configure 2>&1 | grep "$OUT-$CC" > /dev/null
+ if [ $? = "0" ]; then
+   OUT="$OUT-$CC"
+ fi
+@@ -349,7 +340,7 @@
+ if [ "$TEST" = "true" ]; then
+   echo ./Configure $OUT $options
+ else
+-  perl ./Configure $OUT $options
++  ${PERL} ./Configure $OUT $options
+ fi
+ 
+ )
-- 
cgit v1.2.3