MFH: r407415, r408778, r409885 (dinoex):

- add new manpages
Submitted by:	olli hauer

- mark options ASM broken on sparc64
PR:		204527

- Security update to 1.0.2g

Security: https://www.openssl.org/news/secadv/20160301.txt
Security: CVE-2016-0800
Security: CVE-2016-0705
Security: CVE-2016-0798
Security: CVE-2016-0797
Security: CVE-2016-0799
Security: CVE-2016-0702
Security: CVE-2016-0703
Security: CVE-2016-0704
Approved by:	ports-secteam

3 files changed, 21 insertions, 15 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index f3789e1405be..41085e791f14 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	openssl
 PORTVERSION=	1.0.2
-DISTVERSIONSUFFIX=	f
-PORTREVISION=	7
+DISTVERSIONSUFFIX=	g
+PORTREVISION=	9
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/source/ \
 		ftp://ftp.openssl.org/source/ \
@@ -92,6 +92,7 @@ EXTRACONFIGURE+=	no-sse2
 .endif
 
 .if ${PORT_OPTIONS:MASM}
+BROKEN_sparc64=	option ASM generates illegal instructions
 EXTRACONFIGURE+=	enable-asm
 .else
 EXTRACONFIGURE+=	no-asm
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 54116eb08221..51fca0d9f242 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,10 +1,10 @@
-SHA256 (openssl-1.0.2f/openssl-1.0.2f.tar.gz) = 932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c
-SIZE (openssl-1.0.2f/openssl-1.0.2f.tar.gz) = 5258384
-SHA256 (openssl-1.0.2f/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 2eddcb7ab342285cb637ce6b6be143cca835f449f35dd9bb8c7b9167ba2117a7
-SIZE (openssl-1.0.2f/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3717
-SHA256 (openssl-1.0.2f/1002-backport-changes-from-upstream-padlock-module.patch) = aee88a24622ce9d71e38deeb874e58435dcf8ff5690f56194f0e4a00fb09b260
-SIZE (openssl-1.0.2f/1002-backport-changes-from-upstream-padlock-module.patch) = 5770
-SHA256 (openssl-1.0.2f/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = c10b8aaf56a4f4f79ca195fc587e0bb533f643e777d7a3e6fb0350399a6060ea
-SIZE (openssl-1.0.2f/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20935
-SHA256 (openssl-1.0.2f/1004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 2f7c850af078a3ae71b2dd38d5d0b3964ea4262e52673e36ff33498cc6223e6c
-SIZE (openssl-1.0.2f/1004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 809
+SHA256 (openssl-1.0.2g/openssl-1.0.2g.tar.gz) = b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33
+SIZE (openssl-1.0.2g/openssl-1.0.2g.tar.gz) = 5266102
+SHA256 (openssl-1.0.2g/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 2eddcb7ab342285cb637ce6b6be143cca835f449f35dd9bb8c7b9167ba2117a7
+SIZE (openssl-1.0.2g/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3717
+SHA256 (openssl-1.0.2g/1002-backport-changes-from-upstream-padlock-module.patch) = aee88a24622ce9d71e38deeb874e58435dcf8ff5690f56194f0e4a00fb09b260
+SIZE (openssl-1.0.2g/1002-backport-changes-from-upstream-padlock-module.patch) = 5770
+SHA256 (openssl-1.0.2g/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = c10b8aaf56a4f4f79ca195fc587e0bb533f643e777d7a3e6fb0350399a6060ea
+SIZE (openssl-1.0.2g/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20935
+SHA256 (openssl-1.0.2g/1004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 97eb4411d0fc0890e94bc7c2d682f68b71135da782af769ca73914b37da2b1fd
+SIZE (openssl-1.0.2g/1004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 832
diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist
index b1243acf75f8..22c2c7e988e5 100644
--- a/security/openssl/pkg-plist
+++ b/security/openssl/pkg-plist
@@ -1149,8 +1149,8 @@ man/man3/SSL_CTX_add1_chain_cert.3.gz
 man/man3/SSL_CTX_add_client_CA.3.gz
 man/man3/SSL_CTX_add_client_custom_ext.3.gz
 man/man3/SSL_CTX_add_extra_chain_cert.3.gz
-man/man3/SSL_CTX_add_session.3.gz
 man/man3/SSL_CTX_add_server_custom_ext.3.gz
+man/man3/SSL_CTX_add_session.3.gz
 man/man3/SSL_CTX_build_cert_chain.3.gz
 man/man3/SSL_CTX_callback_ctrl.3.gz
 man/man3/SSL_CTX_check_private_key.3.gz
@@ -1242,6 +1242,8 @@ man/man3/SSL_CTX_set_session_cache_mode.3.gz
 man/man3/SSL_CTX_set_session_id_context.3.gz
 man/man3/SSL_CTX_set_ssl_version.3.gz
 man/man3/SSL_CTX_set_timeout.3.gz
+man/man3/SSL_CTX_set_tlsext_status_arg.3.gz
+man/man3/SSL_CTX_set_tlsext_status_cb.3.gz
 man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3.gz
 man/man3/SSL_CTX_set_tmp_dh.3.gz
 man/man3/SSL_CTX_set_tmp_dh_callback.3.gz
@@ -1327,6 +1329,7 @@ man/man3/SSL_get_session.3.gz
 man/man3/SSL_get_shared_curve.3.gz
 man/man3/SSL_get_shutdown.3.gz
 man/man3/SSL_get_ssl_method.3.gz
+man/man3/SSL_get_tlsext_status_ocsp_resp.3.gz
 man/man3/SSL_get_verify_callback.3.gz
 man/man3/SSL_get_verify_depth.3.gz
 man/man3/SSL_get_verify_mode.3.gz
@@ -1377,6 +1380,8 @@ man/man3/SSL_set_session.3.gz
 man/man3/SSL_set_session_id_context.3.gz
 man/man3/SSL_set_shutdown.3.gz
 man/man3/SSL_set_ssl_method.3.gz
+man/man3/SSL_set_tlsext_status_ocsp_resp.3.gz
+man/man3/SSL_set_tlsext_status_type.3.gz
 man/man3/SSL_set_tmp_dh.3.gz
 man/man3/SSL_set_tmp_dh_callback.3.gz
 man/man3/SSL_set_tmp_rsa.3.gz
@@ -1540,8 +1545,8 @@ man/man3/d2i_DHparams.3.gz
 man/man3/d2i_DSAPrivateKey.3.gz
 man/man3/d2i_DSAPublicKey.3.gz
 man/man3/d2i_DSA_PUBKEY.3.gz
-man/man3/d2i_DSAparams.3.gz
 man/man3/d2i_DSA_SIG.3.gz
+man/man3/d2i_DSAparams.3.gz
 man/man3/d2i_ECDSA_SIG.3.gz
 man/man3/d2i_ECPKParameters.3.gz
 man/man3/d2i_ECPKParameters_bio.3.gz
@@ -1582,8 +1587,8 @@ man/man3/err.3.gz
 man/man3/evp.3.gz
 man/man3/hmac.3.gz
 man/man3/i2d_ASN1_OBJECT.3.gz
-man/man3/i2d_CMS_bio_stream.3.gz
 man/man3/i2d_CMS_ContentInfo.3.gz
+man/man3/i2d_CMS_bio_stream.3.gz
 man/man3/i2d_DHparams.3.gz
 man/man3/i2d_DSAPrivateKey.3.gz
 man/man3/i2d_DSAPublicKey.3.gz