Upgrade to OpenSSL 0.9.3:

- some changes of the directory layout:
  e. g. ${PREFIX}/lib/openssl.cnf -> ${PREFIX}/openssl/openssl.cnf

7 files changed, 161 insertions, 105 deletions

diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile
index 7a500e1ba26e..18535153c88e 100644
--- a/security/openssl-beta/Makefile
+++ b/security/openssl-beta/Makefile
@@ -1,27 +1,22 @@
 # New ports collection makefile for:	OpenSSL
-# Version required:	0.9.2b
+# Version required:	0.9.3
 # Date created:		Sun Jan  3 19:36:27 CET 1999
 # Whom:			Dirk Froemberg <dirk@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.29 1999/04/13 22:37:02 dirk Exp $
+# $Id: Makefile,v 1.30 1999/04/22 00:17:15 scrappy Exp $
 #
 
-DISTNAME=	openssl-0.9.2b
+DISTNAME=	openssl-0.9.3
 CATEGORIES=	devel security
 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/
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	openssl-0.9.2b-rsaoaep.patch
-
 MAINTAINER=	dirk@FreeBSD.ORG
 
-ONLY_FOR_ARCHS=	i386
 RESTRICTED=	"Cryptography"
 USE_PERL5=	yes
-MAKE_ENV=	PERL="${PERL}"
 
 .if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
 pre-fetch:
@@ -33,21 +28,21 @@ pre-fetch:
 .elif defined(USA_RESIDENT)
 .if ${USA_RESIDENT} == YES && !defined(I_HAVE_AN_RSA_LICENSE)
 LIB_DEPENDS=	rsaref.2:${PORTSDIR}/security/rsaref
-
-post-configure:
-	${PATCH} ${PATCH_ARGS} < ${FILESDIR}/Makefile.patch
+RSAREF=		rsaref
 .endif
 .endif
 
 do-configure:
 	@cd ${WRKSRC} \
-	&& ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" ./config \
-	&& ${PERL} util/ssldir.pl ${PREFIX}
+	&& ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \
+	   ./config --prefix=${PREFIX} --openssldir=${PREFIX}/openssl \
+	   ${RSAREF} -L${PREFIX}/lib
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/openssl
 	@${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/openssl
 .endif
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/security/openssl-beta/distinfo b/security/openssl-beta/distinfo
index 2fa967f0c282..fde3e5370991 100644
--- a/security/openssl-beta/distinfo
+++ b/security/openssl-beta/distinfo
@@ -1,2 +1 @@
-MD5 (openssl-0.9.2b.tar.gz) = e78a6b30b443cd0d118b376a4dfe4745
-MD5 (openssl-0.9.2b-rsaoaep.patch) = 7336290517c4b3f8e74c462affff1c6b
+MD5 (openssl-0.9.3.tar.gz) = 41c15e89f3ad2b312dd71ae586e89487
diff --git a/security/openssl-beta/files/patch-ac b/security/openssl-beta/files/patch-ac
index 457756975903..5a2e1ec045c5 100644
--- a/security/openssl-beta/files/patch-ac
+++ b/security/openssl-beta/files/patch-ac
@@ -1,13 +1,31 @@
---- 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}:::",
+--- 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:::",
+ 
+ # 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 @@
+ my $perl;
+ 
+ $ranlib=&which("ranlib") or $ranlib="true";
+-$perl=&which("perl5") or $perl=&which("perl") or $perl="perl";
++$perl=$ENV{PERL};
+ 
+ &usage if ($#ARGV < 0);
+ 
diff --git a/security/openssl-beta/files/patch-ah b/security/openssl-beta/files/patch-ah
index 111ce78f8e57..09704c48181c 100644
--- a/security/openssl-beta/files/patch-ah
+++ b/security/openssl-beta/files/patch-ah
@@ -1,6 +1,6 @@
---- config.orig	Sun Jan 17 15:20:20 1999
-+++ config	Tue Mar 30 12:58:19 1999
-@@ -125,16 +125,12 @@
+--- 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
  	;;
  
@@ -8,8 +8,15 @@
 -	echo "${MACHINE}-whatever-freebsd3"; exit 0
 -	;;
 -
--    FreeBSD:*:*:*486*)
--	echo "i486-whatever-freebsd"; 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
  	;;
@@ -19,38 +26,47 @@
 +	echo "${MACHINE}-whatever-freebsd3"; exit 0
  	;;
  
-     NetBSD:*:*:*486*)
-@@ -282,15 +278,6 @@
+     NetBSD:*:*:*386*)
+@@ -276,23 +265,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`
+-GCCVER=`(gcc -v) 2>&1`
 -if [ $? = "0" ]; then
 -  CC=gcc
 -else
 -  CC=cc
+-  if [ "$SYSTEM" = "SunOS" ]
+-  then
+-   case `cc -V 2>&1` in
+-    *4*) CC=cc;;
+-    *5*) CC=cc;;
+-    *) CC=sc3;;
+-   esac
+-  fi
 -fi
 -
  # read the output of the embedded GuessOS 
  read GUESSOS
  
-@@ -334,7 +321,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 +336,7 @@
- if [ "$TEST" = "true" ]; then
-   echo ./Configure $OUT $options
- else
--  perl ./Configure $OUT $options
-+  ${PERL} ./Configure $OUT $options
- fi
+@@ -331,18 +303,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 ]
+-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
+-fi
  
- )
+ case "$GUESSOS" in
+   i386-*) options="$options 386" ;;
diff --git a/security/openssl-beta/files/patch-ak b/security/openssl-beta/files/patch-ak
new file mode 100644
index 000000000000..819def697e15
--- /dev/null
+++ b/security/openssl-beta/files/patch-ak
@@ -0,0 +1,13 @@
+--- apps/Makefile.ssl.orig	Sun May 23 14:36:09 1999
++++ apps/Makefile.ssl	Fri May 28 22:29:19 1999
+@@ -101,8 +101,8 @@
+ 	 cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \
+ 	 chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
+ 	 done
+-	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR); \
+-	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
++	@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.sample; \
++	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.sample
+ 
+ tags:
+ 	ctags $(SRC)
diff --git a/security/openssl-beta/pkg-message b/security/openssl-beta/pkg-message
new file mode 100644
index 000000000000..5a671a0900b9
--- /dev/null
+++ b/security/openssl-beta/pkg-message
@@ -0,0 +1,4 @@
+
+Copy ${PREFIX}/openssl/openssl.cnf.sample to ${PREFIX}/openssl/openssl.cnf
+and edit it to fit your needs.
+
diff --git a/security/openssl-beta/pkg-plist b/security/openssl-beta/pkg-plist
index 03f50724ced1..960eb7535773 100644
--- a/security/openssl-beta/pkg-plist
+++ b/security/openssl-beta/pkg-plist
@@ -1,62 +1,67 @@
-bin/CA.pl
-bin/CA.sh
-bin/c_hash
-bin/c_info
-bin/c_issuer
-bin/c_name
 bin/c_rehash
-bin/der_chop
 bin/openssl
-include/asn1.h
-include/asn1_mac.h
-include/bio.h
-include/blowfish.h
-include/bn.h
-include/buffer.h
-include/cast.h
-include/comp.h
-include/conf.h
-include/cryptall.h
-include/crypto.h
-include/des.h
-include/dh.h
-include/dsa.h
-include/err.h
-include/evp.h
-include/hmac.h
-include/idea.h
-include/lhash.h
-include/md2.h
-include/md5.h
-include/mdc2.h
-include/objects.h
-include/opensslv.h
-include/pem.h
-include/pem2.h
-include/pkcs7.h
-include/rand.h
-include/rc2.h
-include/rc4.h
-include/rc5.h
-include/ripemd.h
-include/rsa.h
-include/sha.h
-include/ssl.h
-include/ssl2.h
-include/ssl23.h
-include/ssl3.h
-include/stack.h
-include/tls1.h
-include/tmdiff.h
-include/txt_db.h
-include/x509.h
-include/x509_vfy.h
-include/x509v3.h
+include/openssl/asn1.h
+include/openssl/asn1_mac.h
+include/openssl/bio.h
+include/openssl/blowfish.h
+include/openssl/bn.h
+include/openssl/buffer.h
+include/openssl/cast.h
+include/openssl/comp.h
+include/openssl/conf.h
+include/openssl/crypto.h
+include/openssl/des.h
+include/openssl/dh.h
+include/openssl/dsa.h
+include/openssl/e_os.h
+include/openssl/e_os2.h
+include/openssl/err.h
+include/openssl/evp.h
+include/openssl/hmac.h
+include/openssl/idea.h
+include/openssl/lhash.h
+include/openssl/md2.h
+include/openssl/md5.h
+include/openssl/mdc2.h
+include/openssl/objects.h
+include/openssl/opensslconf.h
+include/openssl/opensslv.h
+include/openssl/pem.h
+include/openssl/pem2.h
+include/openssl/pkcs12.h
+include/openssl/pkcs7.h
+include/openssl/rand.h
+include/openssl/rc2.h
+include/openssl/rc4.h
+include/openssl/rc5.h
+include/openssl/ripemd.h
+include/openssl/rsa.h
+include/openssl/safestack.h
+include/openssl/sha.h
+include/openssl/ssl.h
+include/openssl/ssl2.h
+include/openssl/ssl23.h
+include/openssl/ssl3.h
+include/openssl/stack.h
+include/openssl/tls1.h
+include/openssl/tmdiff.h
+include/openssl/txt_db.h
+include/openssl/x509.h
+include/openssl/x509_vfy.h
+include/openssl/x509v3.h
 lib/libRSAglue.a
 lib/libcrypto.a
 lib/libssl.a
-lib/openssl.cnf
+openssl/misc/CA.pl
+openssl/misc/CA.sh
+openssl/misc/c_hash
+openssl/misc/c_info
+openssl/misc/c_issuer
+openssl/misc/c_name
+openssl/misc/der_chop
+openssl/openssl.cnf.sample
 share/doc/openssl/README
+share/doc/openssl/c-indentation.el
 share/doc/openssl/crypto.pod
 share/doc/openssl/openssl.pod
 share/doc/openssl/openssl.txt
@@ -64,4 +69,10 @@ share/doc/openssl/openssl_button.gif
 share/doc/openssl/openssl_button.html
 share/doc/openssl/ssl.pod
 share/doc/openssl/ssleay.txt
+@dirrm include/openssl
+@dirrm openssl/certs
+@dirrm openssl/lib
+@dirrm openssl/misc
+@dirrm openssl/private
+@dirrm openssl
 @dirrm share/doc/openssl