Upgrade openssl to 0.9.6a and bump the shlib version in the process

due to non-backwards compatible changes. The shlib bump necessitates
a corresponding bump in bsd.port.mk for the automagic openssl
dependency. Mistakes in the port are my responsibility. Approval for
the bsd.port.mk commit comes through asami -> kkenn -> me. Kris is
a little busy at the moment, so he asked me to lob it in.

Approved by:	kris

6 files changed, 85 insertions, 49 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 154d21347264..76d38ea220a3 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	openssl
-PORTVERSION=	0.9.5a
-PORTREVISION=	1
+PORTVERSION=	0.9.6a
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/source/ \
 		ftp://ftp.openssl.org/source/ \
@@ -22,9 +21,9 @@ FORBIDDEN=	"OpenSSL is already in the base system"
 .endif
 
 .if ${PORTOBJFORMAT} == "aout"
-MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=-Bforcearchive
+MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=-Bforcearchive
 .else
-MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive
+MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=--whole-archive
 .endif
 
 USE_PERL5=	yes
@@ -32,17 +31,19 @@ USE_PERL5=	yes
 PLIST=		${PKGDIR}/pkg-plist.noshared
 .else
 ALL_TARGET=	freebsd-shared all
-SHLIBVER=	1
+SHLIBVER=	2
 MAKE_ENV+=	SHLIBVER=${SHLIBVER}
 INSTALLS_SHLIB=	yes
 .endif
 
 MANPREFIX=	${PREFIX}/openssl
+
 MAN1=		CA.pl.1 asn1parse.1 ca.1 ciphers.1 crl.1 crl2pkcs7.1 dgst.1 \
 		dhparam.1 dsa.1 dsaparam.1 enc.1 gendsa.1 genrsa.1 nseq.1 \
 		openssl.1 passwd.1 pkcs12.1 pkcs7.1 pkcs8.1 rand.1 req.1 \
 		rsa.1 s_client.1 s_server.1 sess_id.1 smime.1 speed.1 \
-		spkac.1 verify.1 version.1 x509.1
+		spkac.1 verify.1 version.1 x509.1 rsautl.1
+
 MAN3=		BN_CTX_new.3 BN_CTX_start.3 BN_add.3 BN_add_word.3 \
 		BN_bn2bin.3 BN_cmp.3 BN_copy.3 BN_generate_prime.3 \
 		BN_mod_inverse.3 BN_mod_mul_montgomery.3 \
@@ -68,15 +69,48 @@ MAN3=		BN_CTX_new.3 BN_CTX_start.3 BN_add.3 BN_add_word.3 \
 		SSL_get_error.3 blowfish.3 bn.3 bn_internal.3 buffer.3 \
 		crypto.3 d2i_DHparams.3 d2i_RSAPublicKey.3 des.3 dh.3 dsa.3 \
 		err.3 hmac.3 lh_stats.3 lhash.3 md5.3 mdc2.3 rand.3 rc4.3 \
-		ripemd.3 rsa.3 sha.3 ssl.3 threads.3
+		ripemd.3 rsa.3 sha.3 ssl.3 threads.3 BIO_ctrl.3 BIO_f_base64.3 \
+		BIO_f_buffer.3 BIO_f_cipher.3 BIO_f_md.3 BIO_f_null.3 \
+		BIO_f_ssl.3 BIO_find_type.3 BIO_new.3 BIO_new_bio_pair.3 \
+		BIO_push.3 BIO_read.3 BIO_s_accept.3 BIO_s_bio.3 \
+		BIO_s_connect.3 BIO_s_fd.3 BIO_s_file.3 BIO_s_mem.3 \
+		BIO_s_null.3 BIO_s_socket.3 BIO_set_callback.3 \
+		BIO_should_retry.3 SSL_CIPHER_get_name.3 \
+		SSL_CTX_add_extra_chain_cert.3 SSL_CTX_add_session.3 \
+		SSL_CTX_flush_sessions.3 SSL_CTX_free.3 \
+		SSL_CTX_get_ex_new_index.3 SSL_CTX_get_verify_mode.3 \
+		SSL_CTX_load_verify_locations.3 SSL_CTX_new.3 \
+		SSL_CTX_sess_number.3 SSL_CTX_sess_set_cache_size.3 \
+		SSL_CTX_sess_set_get_cb.3 SSL_CTX_sessions.3 \
+		SSL_CTX_set_cipher_list.3 SSL_CTX_set_client_CA_list.3 \
+		SSL_CTX_set_default_passwd_cb.3 SSL_CTX_set_mode.3 \
+		SSL_CTX_set_options.3 SSL_CTX_set_session_cache_mode.3 \
+		SSL_CTX_set_session_id_context.3 SSL_CTX_set_ssl_version.3 \
+		SSL_CTX_set_timeout.3 SSL_CTX_set_verify.3 \
+		SSL_CTX_use_certificate.3 SSL_SESSION_free.3 \
+		SSL_SESSION_get_ex_new_index.3 SSL_SESSION_get_time.3 \
+		SSL_accept.3 SSL_clear.3 SSL_connect.3 \
+		SSL_free.3 SSL_get_ciphers.3 SSL_get_client_CA_list.3 \
+		SSL_get_current_cipher.3 SSL_get_ex_data_X509_STORE_CTX_idx.3 \
+		SSL_get_ex_new_index.3 SSL_get_fd.3 \
+		SSL_get_peer_cert_chain.3 SSL_get_peer_certificate.3 \
+		SSL_get_rbio.3 SSL_get_session.3 SSL_get_verify_result.3 \
+		SSL_get_version.3 SSL_library_init.3 \
+		SSL_load_client_CA_file.3 SSL_new.3 \
+		SSL_pending.3 SSL_read.3 SSL_set_bio.3 SSL_set_connect_state.3 \
+		SSL_set_fd.3 SSL_set_session.3 SSL_set_shutdown.3 \
+		SSL_set_verify_result.3 SSL_shutdown.3 SSL_write.3 \
+		bio.3 d2i_SSL_SESSION.3 evp.3
+
 MAN5=		config.5
+
 MAN7=		des_modes.7
 
 do-configure:
 	@cd ${WRKSRC} \
 	&& ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \
-	   ./config --prefix=${PREFIX} --openssldir=${PREFIX}/openssl \
-	   -L${PREFIX}/lib
+	./config --prefix=${PREFIX} --openssldir=${PREFIX}/openssl \
+	-L${PREFIX}/lib
 
 post-install:
 .if !defined(NOSHARED)
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 4c5f4c4055a5..47cc199f22c0 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1 +1 @@
-MD5 (openssl-0.9.5a.tar.gz) = 8fcb6a8ba511ec8b54b95f267ef52cf0
+MD5 (openssl-0.9.6a.tar.gz) = 6097d726aeb13373aba5213c35acd5c5
diff --git a/security/openssl/files/patch-ab b/security/openssl/files/patch-ab
index 8fbe55b661f0..571ebd87ca56 100644
--- a/security/openssl/files/patch-ab
+++ b/security/openssl/files/patch-ab
@@ -1,22 +1,18 @@
-
-$FreeBSD$
-
---- Makefile.org.orig	Thu Mar 16 21:46:20 2000
-+++ Makefile.org	Sun Apr 22 19:50:06 2001
-@@ -165,7 +165,7 @@
+--- Makefile.org.orig	Thu Apr  5 13:08:02 2001
++++ Makefile.org	Mon Apr 23 01:08:26 2001
+@@ -178,7 +178,7 @@
  ONEDIRS=out tmp
  EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS
  WDIRS=  windows
--LIBS=   libcrypto.a libssl.a 
+-LIBS=   libcrypto.a libssl.a
 +LIBS=   libcrypto.a libssl.a libRSAglue.a
+ SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
+ SHARED_SSL=libssl$(SHLIB_EXT)
+ SHARED_LIBS=
+@@ -250,6 +250,21 @@
+ 	done
  
- GENERAL=        Makefile
- BASENAME=       openssl
-@@ -189,6 +189,21 @@
- 	do \
- 	(cd $$i && echo "making all in $$i..." && \
- 	$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
-+	done;
+ build-shared: clean-shared do_$(SHLIB_TARGET) link-shared
 +
 +freebsd-shared:
 +	for i in ${SHLIBDIRS}; do \
@@ -31,6 +27,7 @@ $FreeBSD$
 +	@set -x; \
 +	for i in ${SHLIBDIRS}; do \
 +	ln -s lib$$i.so.${SHLIBVER} lib$$i.so; \
- 	done;
++	done;
  
- linux-shared:
+ do_bsd-gcc-shared: do_gnu-shared
+ do_linux-shared: do_gnu-shared
diff --git a/security/openssl/files/patch-ac b/security/openssl/files/patch-ac
index e155fb2697f6..ee53834a5973 100644
--- a/security/openssl/files/patch-ac
+++ b/security/openssl/files/patch-ac
@@ -1,22 +1,22 @@
---- Configure.orig	Mon Mar 27 23:28:10 2000
-+++ Configure	Sat Apr 15 13:30:38 2000
-@@ -243,7 +243,7 @@
- "alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:asm/alpha.o::",
- "alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/alpha.o::",
- "alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/alpha.o::",
--"FreeBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2:::",
+--- Configure.orig	Thu Apr  5 13:07:55 2001
++++ Configure	Fri Apr 13 00:53:07 2001
+@@ -270,7 +270,7 @@
+ "alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${alpha_asm}:dlfcn:tru64-shared::.so",
+ "alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared::.so",
+ "alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared::.so",
+-"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:::",
  
  #### Alpha Linux with GNU C and Compaq C setups
  # Special notes:
-@@ -277,8 +277,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}",
+@@ -307,8 +307,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::(unknown)::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)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_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/files/patch-ag b/security/openssl/files/patch-ag
index d43c842332ff..e0faf51d9bfa 100644
--- a/security/openssl/files/patch-ag
+++ b/security/openssl/files/patch-ag
@@ -1,11 +1,11 @@
---- apps/dgst.c.orig	Mon Dec 21 20:00:13 1998
-+++ apps/dgst.c	Tue Jan 19 16:16:38 1999
-@@ -187,7 +187,7 @@
+--- 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;
  				}
--			printf("%s(%s)= ",name,argv[i]);
-+			printf("%s (%s) = ",name,argv[i]);
- 			do_fp(buf,inp,separator);
- 			BIO_reset(bmd);
- 			}
+-			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);
diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist
index 890ede42b0ec..071c42297585 100644
--- a/security/openssl/pkg-plist
+++ b/security/openssl/pkg-plist
@@ -9,10 +9,12 @@ include/openssl/buffer.h
 include/openssl/cast.h
 include/openssl/comp.h
 include/openssl/conf.h
+include/openssl/conf_api.h
 include/openssl/crypto.h
 include/openssl/des.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
@@ -22,8 +24,10 @@ include/openssl/hmac.h
 include/openssl/idea.h
 include/openssl/lhash.h
 include/openssl/md2.h
+include/openssl/md4.h
 include/openssl/md5.h
 include/openssl/mdc2.h
+include/openssl/obj_mac.h
 include/openssl/objects.h
 include/openssl/opensslconf.h
 include/openssl/opensslv.h
@@ -44,6 +48,7 @@ include/openssl/ssl2.h
 include/openssl/ssl23.h
 include/openssl/ssl3.h
 include/openssl/stack.h
+include/openssl/symhacks.h
 include/openssl/tls1.h
 include/openssl/tmdiff.h
 include/openssl/txt_db.h
@@ -53,10 +58,10 @@ include/openssl/x509v3.h
 lib/libRSAglue.a
 lib/libcrypto.a
 lib/libcrypto.so
-lib/libcrypto.so.1
+lib/libcrypto.so.2
 lib/libssl.a
 lib/libssl.so
-lib/libssl.so.1
+lib/libssl.so.2
 openssl/misc/CA.pl
 openssl/misc/CA.sh
 openssl/misc/c_hash