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

1 files changed, 43 insertions, 9 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)