From 1c26d9497a31d7c369e1dcbffd27b7f582561cd0 Mon Sep 17 00:00:00 2001 From: Dirk Froemberg Date: Mon, 9 Aug 1999 18:48:15 +0000 Subject: Upgrade to 0.9.4. --- security/openssl-beta/Makefile | 10 ++-- security/openssl-beta/distinfo | 2 +- security/openssl-beta/files/patch-ac | 42 ++++++++--------- security/openssl-beta/files/patch-ah | 89 +++++++++++++++++------------------- security/openssl-beta/pkg-plist | 1 + 5 files changed, 69 insertions(+), 75 deletions(-) (limited to 'security/openssl-beta') diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile index 1cb39cd1797e..606f04d56589 100644 --- a/security/openssl-beta/Makefile +++ b/security/openssl-beta/Makefile @@ -1,19 +1,19 @@ # New ports collection makefile for: OpenSSL -# Version required: 0.9.3a +# Version required: 0.9.4 # Date created: Sun Jan 3 19:36:27 CET 1999 -# Whom: Dirk Froemberg +# Whom: Dirk Froemberg # -# $Id: Makefile,v 1.31 1999/06/02 07:30:30 dirk Exp $ +# $Id: Makefile,v 1.32 1999/06/06 09:56:00 dirk Exp $ # -DISTNAME= openssl-0.9.3a +DISTNAME= openssl-0.9.4 CATEGORIES= security devel MASTER_SITES= http://www.openssl.org/source/ \ ftp://ftp.openssl.org/source/ \ ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/ -MAINTAINER= dirk@FreeBSD.ORG +MAINTAINER= dirk@FreeBSD.org RESTRICTED= "Cryptography" USE_PERL5= yes diff --git a/security/openssl-beta/distinfo b/security/openssl-beta/distinfo index 3602ebb0124e..28fa47e94e3b 100644 --- a/security/openssl-beta/distinfo +++ b/security/openssl-beta/distinfo @@ -1 +1 @@ -MD5 (openssl-0.9.3a.tar.gz) = 1024c591024dec7d0558694635e7ebf1 +MD5 (openssl-0.9.4.tar.gz) = ee27fd88986143156920a0da362135fb diff --git a/security/openssl-beta/files/patch-ac b/security/openssl-beta/files/patch-ac index 5a2e1ec045c5..00f9f5b48023 100644 --- a/security/openssl-beta/files/patch-ac +++ b/security/openssl-beta/files/patch-ac @@ -1,26 +1,26 @@ ---- Configure.orig Sun May 23 18:29:07 1999 -+++ Configure Fri May 28 22:03:00 1999 -@@ -156,7 +156,7 @@ - "alpha-gcc","gcc:-O3:(unknown)::SIXTY_FOUR_BIT_LONG DES_UNROLL DES_RISC1:::", - "alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings:(unknown)::SIXTY_FOUR_BIT_LONG:::", - "alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings:(unknown)::SIXTY_FOUR_BIT_LONG:::", --"FreeBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer:(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:::", -+"FreeBSD-alpha","$ENV{CC}:-DTERMIOS $ENV{CFLAGS}:(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:::", +--- Configure.orig Sun Aug 8 13:56:29 1999 ++++ Configure Mon Aug 9 20:25:48 1999 +@@ -193,7 +193,7 @@ + "alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG DES_UNROLL DES_RISC1:::", + "alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG:::", + "alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG:::", +-"FreeBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:::", ++"FreeBSD-alpha","$ENV{CC}:-DTERMIOS $ENV{CFLAGS}::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:::", # assembler versions -- currently defunct: - ##"alpha-gcc","gcc:-O3:(unknown)::SIXTY_FOUR_BIT_LONG DES_UNROLL DES_RISC1:asm/alpha.o::", -@@ -175,8 +175,8 @@ - "NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN:(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", - "NetBSD-x86", "gcc:-DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:", - #"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", --"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", --"FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", -+"FreeBSD", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", -+"FreeBSD-elf", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", - "bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486:(unknown)::RSA_LLONG $x86_gcc_des $x86_gcc_opts:$x86_bsdi_asm", - "nextstep", "cc:-O3 -Wall:(unknown)::BN_LLONG $x86_gcc_des ${x86_gcc_opts}:::", - # NCR MP-RAS UNIX ver 02.03.01 -@@ -293,7 +293,7 @@ + ##"alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG DES_UNROLL DES_RISC1:asm/alpha.o::", +@@ -211,8 +211,8 @@ + "NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", + "NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", + "NetBSD-x86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:", +-"FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", +-"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", ++"FreeBSD-elf", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", ++"FreeBSD", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", + "bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG $x86_gcc_des $x86_gcc_opts:$x86_bsdi_asm", + "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", + "nextstep", "cc:-O -Wall::(unknown)::BN_LLONG $x86_gcc_des ${x86_gcc_opts}:::", +@@ -337,7 +337,7 @@ my $perl; $ranlib=&which("ranlib") or $ranlib="true"; diff --git a/security/openssl-beta/files/patch-ah b/security/openssl-beta/files/patch-ah index 09704c48181c..4d54b18d5fc2 100644 --- a/security/openssl-beta/files/patch-ah +++ b/security/openssl-beta/files/patch-ah @@ -1,71 +1,64 @@ ---- config.orig Sun May 23 18:04:11 1999 -+++ config Fri May 28 18:45:26 1999 -@@ -122,23 +122,12 @@ - echo "${MACHINE}-whatever-bsdi"; exit 0 - ;; - -- FreeBSD:3*:*:*) -- echo "${MACHINE}-whatever-freebsd3"; exit 0 -- ;; -- -- FreeBSD:*:*:*386*) -- case `sysctl -n hw.model` in -- Pentium*) -- echo "i586-whatever-freebsd"; exit 0 -- ;; -- *) -- echo "i386-whatever-freebsd"; exit 0 -- ;; -- esac; -+ FreeBSD:[12]*:*:*) -+ echo "${MACHINE}-whatever-freebsd"; exit 0 - ;; - - FreeBSD:*) -- echo "${MACHINE}-whatever-freebsd"; exit 0 -+ echo "${MACHINE}-whatever-freebsd3"; exit 0 - ;; - - NetBSD:*:*:*386*) -@@ -276,23 +265,6 @@ +--- config.orig Mon Aug 9 12:16:51 1999 ++++ config Mon Aug 9 20:30:08 1999 +@@ -297,40 +297,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 +-GCCVER=`(gcc --version) 2>/dev/null` +-if [ "$GCCVER" != "" ]; then - CC=gcc +- # then strip off whatever prefix Cygnus prepends the number with... +- GCCVER=`echo $GCCVER | sed 's/^[a-z]*\-//'` +- # peak single digit before and after first dot, e.g. 2.95.1 gives 29 +- GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'` -else - CC=cc -- if [ "$SYSTEM" = "SunOS" ] -- then -- case `cc -V 2>&1` in -- *4*) CC=cc;; -- *5*) CC=cc;; -- *) CC=sc3;; -- esac +-fi +- +-if [ "$SYSTEM" = "SunOS" ]; then +- # assume output is "blah-blah C x.x" +- CCVER=`(cc -V 2>&1) 2>/dev/null | \ +- egrep -e '^cc: .* C [0-9]\.[0-9]' | \ +- sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'` +- CCVER=${CCVER:-0} +- if [ $CCVER -gt 40 ]; then +- CC=cc # overrides gcc!!! +- if [ $CCVER -eq 50 ]; then +- echo "WARNING! Detected WorkShop C 5.0. Do make sure you have" +- echo " patch #107357-01 or later applied." +- sleep 5 +- fi +- elif [ "$CC" = "cc" -a $CCVER -gt 0 ]; then +- CC=sc3 - fi -fi +- +-GCCVER=${GCCVER:-0} +-CCVER=${CCVER:-0} - # read the output of the embedded GuessOS read GUESSOS -@@ -331,18 +303,6 @@ +@@ -423,21 +389,6 @@ # *-dgux) OUT="dgux" ;; *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;; esac - -# gcc < 2.8 does not support -mcpu=ultrasparc --if [ "$OUT" = solaris-usparc-gcc ] +-if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ] +-then +- echo "WARNING! Do consider upgrading to gcc-2.8 or later." +- sleep 5 +- OUT=solaris-sparcv9-gcc27 +-fi +-if [ "$OUT" = "linux-sparcv9" -a $GCCVER -lt 28 ] -then -- GCCVERMAJOR="`echo $GCCVER | sed 's/.*version \([^.]*\).*/\1/`" -- GCCVERMINOR="`echo $GCCVER | sed 's/.*version[^.]*\.\([^.]*\).*/\1/`" -- echo "gcc version $GCCVERMAJOR.$GCCVERMINOR.x" -- if [ $GCCVERMAJOR$GCCVERMINOR -lt 28 ] -- then -- OUT=solaris-usparc-oldgcc -- fi +- echo "WARNING! Falling down to 'linux-sparcv8'." +- echo " Upgrade to gcc-2.8 or later." +- sleep 5 +- OUT=linux-sparcv8 -fi case "$GUESSOS" in diff --git a/security/openssl-beta/pkg-plist b/security/openssl-beta/pkg-plist index 960eb7535773..170111ebcc6e 100644 --- a/security/openssl-beta/pkg-plist +++ b/security/openssl-beta/pkg-plist @@ -15,6 +15,7 @@ include/openssl/dh.h include/openssl/dsa.h include/openssl/e_os.h include/openssl/e_os2.h +include/openssl/ebcdic.h include/openssl/err.h include/openssl/evp.h include/openssl/hmac.h -- cgit v1.2.3