Update to openssl-0.9.7-beta3 after repro-copy, use at own risk.

6 files changed, 47 insertions, 87 deletions

diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile
index 175444a02ff..99c4305cf28 100644
--- a/security/openssl-beta/Makefile
+++ b/security/openssl-beta/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	openssl
-PORTVERSION=	0.9.6g
+PKGNAMESUFFIX=	-beta
+PORTVERSION=	0.9.7-beta3
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/source/ \
 		ftp://ftp.openssl.org/source/ \
@@ -35,11 +36,12 @@ INSTALLS_SHLIB=	yes
 .endif
 
 .if defined(OPENSSL_OVERWRITE_BASE)
-PKGNAMESUFFIX=	-overwrite-base
+PKGNAMESUFFIX=	-beta-overwrite-base
 PREFIX=		/usr
 SHLIBVER=	2
 .endif
 
+NO_LATEST_LINK=	yes
 MANPREFIX=	${PREFIX}/openssl
 
 MAN1=		CA.pl.1 asn1parse.1 ca.1 ciphers.1 crl.1 crl2pkcs7.1 dgst.1 \
@@ -117,6 +119,11 @@ MAN5=		config.5
 
 MAN7=		des_modes.7
 
+MAN1+=		ocsp.1
+MAN3+=		BN_swap.3 EVP_BytesToKey.3 SSL_CTX_set_generate_session_id.3 \
+		SSL_CTX_set_max_cert_list.3 SSL_CTX_set_msg_callback.3 \
+		pem.3 ui.3 ui_compat.3
+
 .if defined(BATCH) || defined(OPENSSL_WITH_386)
 EXTRACONFIGURE=	386
 .endif
diff --git a/security/openssl-beta/Makefile.ssl b/security/openssl-beta/Makefile.ssl
deleted file mode 100644
index 316b1213a6f..00000000000
--- a/security/openssl-beta/Makefile.ssl
+++ /dev/null
@@ -1,56 +0,0 @@
-# makefile for use of:	OpenSSH
-# Date created:		31 May 2002
-# Whom:			dinoex
-#
-# $FreeBSD$
-#
-
-.if defined(USE_OPENSSL_BASE)
-OPENSSLBASE=		/usr
-OPENSSLDIR=		/etc/ssl
-
-.if !exists(/usr/lib/libcrypto.so)
-.BEGIN:
-	@${ECHO_CMD} "This port requires the OpenSSL library, which is part of"
-	@${ECHO_CMD} "the FreeBSD crypto distribution but not installed on your"
-	@${ECHO_CMD} "machine. Please see the \"OpenSSL\" section in the handbook"
-	@${ECHO_CMD} "(at \"http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/openssl.html\", for instance)"
-	@${ECHO_CMD} "for instructions on how to obtain and install the FreeBSD"
-	@${ECHO_CMD} "OpenSSL distribution."
-	@${FALSE}
-.endif
-
-# OpenSSL in the base system may not include IDEA for patent licensing reasons.
-.if defined(MAKE_IDEA) && !defined(OPENSSL_IDEA)
-OPENSSL_IDEA=		${MAKE_IDEA}
-.else
-OPENSSL_IDEA?=		NO
-.endif
-
-.if ${OPENSSL_IDEA} == "NO"
-# XXX This is a hack to work around the fact that /etc/make.conf clobbers
-#     our CFLAGS. It might not be enough for all future ports.
-.if defined(HAS_CONFIGURE)
-CFLAGS+=		-DNO_IDEA
-.else
-OPENSSL_CFLAGS+=	-DNO_IDEA
-.endif
-MAKE_ARGS+=		OPENSSL_CFLAGS="${OPENSSL_CFLAGS}"
-.endif
-
-.else
-
-OPENSSLBASE=		${LOCALBASE}
-OPENSSLDIR=		${OPENSSLBASE}/openssl
-LIB_DEPENDS+=		crypto.3:${PORTSDIR}/security/openssl
-
-.endif
-
-OPENSSLLIB=		${OPENSSLBASE}/lib
-OPENSSLINC=		${OPENSSLBASE}/include
-MAKE_ENV+=		OPENSSLLIB=${OPENSSLLIB} OPENSSLINC=${OPENSSLINC} \
-			OPENSSLBASE=${OPENSSLBASE} OPENSSLDIR=${OPENSSLDIR}
-
-### crypto
-#RESTRICTED=		"Contains cryptography."
-
diff --git a/security/openssl-beta/distinfo b/security/openssl-beta/distinfo
index 26834a786e2..0efddbf6664 100644
--- a/security/openssl-beta/distinfo
+++ b/security/openssl-beta/distinfo
@@ -1 +1 @@
-MD5 (openssl-0.9.6g.tar.gz) = 515ed54165a55df83f4eb4e4e9078d3f
+MD5 (openssl-0.9.7-beta3.tar.gz) = f669467fe29af10ec34caa0a1e87506e
diff --git a/security/openssl-beta/files/patch-ac b/security/openssl-beta/files/patch-ac
index 8c390d4186a..157ad672245 100644
--- a/security/openssl-beta/files/patch-ac
+++ b/security/openssl-beta/files/patch-ac
@@ -1,22 +1,22 @@
---- Configure.orig	Fri May 10 01:05:49 2002
-+++ Configure	Fri May 10 19:00:05 2002
-@@ -309,7 +309,7 @@
+--- Configure.orig	Tue Jul 23 15:31:59 2002
++++ Configure	Sat Aug 10 14:36:17 2002
+@@ -349,7 +349,7 @@
  #
  # This probably belongs in a different section.
  #
--"FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"FreeBSD-alpha","$ENV{CC}:-DTERMIOS $ENV{CFLAGS}::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2:::",
+-"FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"FreeBSD-alpha","$ENV{CC}:-DTERMIOS $ENV{CFLAGS}::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  
  #### Alpha Linux with GNU C and Compaq C setups
  # Special notes:
-@@ -348,8 +348,8 @@
- "NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"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):-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "nextstep",	"cc:-O -Wall:<libc.h>:(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+@@ -393,8 +393,8 @@
+ "NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"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} -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"FreeBSD",      "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS} -Wall::(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)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "nextstep",	"cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
diff --git a/security/openssl-beta/files/patch-ag b/security/openssl-beta/files/patch-ag
index e0faf51d9bf..b768d1ec501 100644
--- a/security/openssl-beta/files/patch-ag
+++ b/security/openssl-beta/files/patch-ag
@@ -1,11 +1,11 @@
---- apps/dgst.c.orig	Thu Apr  5 13:08:50 2001
-+++ apps/dgst.c	Fri Apr 13 00:58:32 2001
-@@ -318,7 +318,7 @@
- 				err++;
- 				continue;
+--- apps/dgst.c.orig	Tue Jun 11 13:41:17 2002
++++ apps/dgst.c	Sat Aug 10 14:40:26 2002
+@@ -340,7 +340,7 @@
+ 			if(!out_bin)
+ 				{
+ 				tmp=tofree=OPENSSL_malloc(strlen(name)+strlen(argv[i])+5);
+-				sprintf(tmp,"%s(%s)= ",name,argv[i]);
++				sprintf(tmp,"%s(%s) = ",name,argv[i]);
  				}
--			if(!out_bin) BIO_printf(out, "%s(%s)= ",name,argv[i]);
-+			if(!out_bin) BIO_printf(out, "%s(%s) = ",name,argv[i]);
- 			do_fp(out, buf,inp,separator, out_bin, sigkey, 
- 								sigbuf, siglen);
- 			(void)BIO_reset(bmd);
+ 			else
+ 				tmp="";
diff --git a/security/openssl-beta/pkg-plist b/security/openssl-beta/pkg-plist
index 67060bf550d..c32fb6c9aa2 100644
--- a/security/openssl-beta/pkg-plist
+++ b/security/openssl-beta/pkg-plist
@@ -1,7 +1,9 @@
 bin/c_rehash
 bin/openssl
+include/openssl/aes.h
 include/openssl/asn1.h
 include/openssl/asn1_mac.h
+include/openssl/asn1t.h
 include/openssl/bio.h
 include/openssl/blowfish.h
 include/openssl/bn.h
@@ -12,25 +14,31 @@ include/openssl/conf.h
 include/openssl/conf_api.h
 include/openssl/crypto.h
 include/openssl/des.h
+include/openssl/des_old.h
 include/openssl/dh.h
 include/openssl/dsa.h
 include/openssl/dso.h
-include/openssl/e_os.h
 include/openssl/e_os2.h
 include/openssl/ebcdic.h
+include/openssl/ec.h
+include/openssl/engine.h
 include/openssl/err.h
 include/openssl/evp.h
 include/openssl/hmac.h
 include/openssl/idea.h
+include/openssl/krb5_asn.h
+include/openssl/kssl.h
 include/openssl/lhash.h
 include/openssl/md2.h
 include/openssl/md4.h
 include/openssl/md5.h
 include/openssl/mdc2.h
+include/openssl/ocsp.h
 include/openssl/obj_mac.h
 include/openssl/objects.h
 include/openssl/opensslconf.h
 include/openssl/opensslv.h
+include/openssl/ossl_typ.h
 include/openssl/pem.h
 include/openssl/pem2.h
 include/openssl/pkcs12.h
@@ -52,10 +60,11 @@ include/openssl/symhacks.h
 include/openssl/tls1.h
 include/openssl/tmdiff.h
 include/openssl/txt_db.h
+include/openssl/ui.h
+include/openssl/ui_compat.h
 include/openssl/x509.h
 include/openssl/x509_vfy.h
 include/openssl/x509v3.h
-lib/libRSAglue.a
 lib/libcrypto.a
 lib/libcrypto.so
 lib/libcrypto.so.%%SHLIBVER%%