diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 28bce6f4fa4e5..f91e8e688e829 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.230 2017/01/26 16:31:57 jperkin Exp $ +# $NetBSD: Makefile,v 1.236 2017/12/14 20:44:20 tron Exp $ -DISTNAME= openssl-1.0.2k +DISTNAME= openssl-1.0.2n +PKGREVISION= 1 CATEGORIES= security MASTER_SITES= https://www.openssl.org/source/ @@ -78,12 +79,16 @@ CONFIGURE_ARGS+= tru64-alpha-cc .elif ${OPSYS} == "Darwin" CONFIGURE_SCRIPT= ./Configure . if defined(ABI) && ${ABI} == "64" -CONFIGURE_ARGS+= darwin64-${MACHINE_ARCH}-cc -. elif ${MACHINE_ARCH} == "powerpc" -CONFIGURE_ARGS+= darwin-ppc-cc +_OS= darwin64 . else -CONFIGURE_ARGS+= darwin-${MACHINE_ARCH}-cc +_OS= darwin . endif +. if ${MACHINE_ARCH:Mpowerpc*} +_ARCH= ppc +. else +_ARCH= ${MACHINE_ARCH} +.endif +CONFIGURE_ARGS+= ${_OS}-${_ARCH}-cc SUBST_CLASSES+= dl SUBST_MESSAGE.dl= Adding dynamic link compatibility library. @@ -167,5 +172,17 @@ INSTALLATION_DIRS+= share/examples/openssl pre-configure: cd ${WRKSRC} && ${PERL5} util/perlpath.pl ${PERL5} +# BN_print.3 and bn_print.3 cannot co-exist on Darwin, we choose to remove +# bn_print.3 simply because it has more aliases to the same manual page. +PLIST_VARS+= notmac +.if ${OPSYS} == "Darwin" +post-install: + ${CP} -p ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/BN_print.3 ${WRKDIR} + ${RM} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/bn_print.3* + ${MV} -f ${WRKDIR}/BN_print.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3 +.else +PLIST.notmac= yes +.endif + .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/openssl/PLIST.common b/security/openssl/PLIST.common index e22001380543b..640ae33fe98b0 100644 --- a/security/openssl/PLIST.common +++ b/security/openssl/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.30 2016/09/22 12:28:55 jperkin Exp $ +@comment $NetBSD: PLIST.common,v 1.32 2017/12/14 09:18:47 jperkin Exp $ bin/c_rehash bin/openssl include/openssl/aes.h @@ -122,6 +122,48 @@ man/man1/openssl_md5.1 man/man1/openssl_mdc2.1 man/man1/openssl_nseq.1 man/man1/openssl_ocsp.1 +man/man1/openssl_openssl-asn1parse.1 +man/man1/openssl_openssl-ca.1 +man/man1/openssl_openssl-ciphers.1 +man/man1/openssl_openssl-cms.1 +man/man1/openssl_openssl-crl.1 +man/man1/openssl_openssl-crl2pkcs7.1 +man/man1/openssl_openssl-dgst.1 +man/man1/openssl_openssl-dhparam.1 +man/man1/openssl_openssl-dsa.1 +man/man1/openssl_openssl-dsaparam.1 +man/man1/openssl_openssl-ec.1 +man/man1/openssl_openssl-ecparam.1 +man/man1/openssl_openssl-enc.1 +man/man1/openssl_openssl-errstr.1 +man/man1/openssl_openssl-gendsa.1 +man/man1/openssl_openssl-genpkey.1 +man/man1/openssl_openssl-genrsa.1 +man/man1/openssl_openssl-nseq.1 +man/man1/openssl_openssl-ocsp.1 +man/man1/openssl_openssl-passwd.1 +man/man1/openssl_openssl-pkcs12.1 +man/man1/openssl_openssl-pkcs7.1 +man/man1/openssl_openssl-pkcs8.1 +man/man1/openssl_openssl-pkey.1 +man/man1/openssl_openssl-pkeyparam.1 +man/man1/openssl_openssl-pkeyutl.1 +man/man1/openssl_openssl-rand.1 +man/man1/openssl_openssl-req.1 +man/man1/openssl_openssl-rsa.1 +man/man1/openssl_openssl-rsautl.1 +man/man1/openssl_openssl-s_client.1 +man/man1/openssl_openssl-s_server.1 +man/man1/openssl_openssl-s_time.1 +man/man1/openssl_openssl-sess_id.1 +man/man1/openssl_openssl-smime.1 +man/man1/openssl_openssl-speed.1 +man/man1/openssl_openssl-spkac.1 +man/man1/openssl_openssl-ts.1 +man/man1/openssl_openssl-tsget.1 +man/man1/openssl_openssl-verify.1 +man/man1/openssl_openssl-version.1 +man/man1/openssl_openssl-x509.1 man/man1/openssl_passwd.1 man/man1/openssl_pkcs12.1 man/man1/openssl_pkcs7.1 @@ -814,6 +856,7 @@ man/man3/EVP_PKEY_CTX_set_rsa_padding.3 man/man3/EVP_PKEY_CTX_set_rsa_pss_saltlen.3 man/man3/EVP_PKEY_CTX_set_rsa_rsa_keygen_bits.3 man/man3/EVP_PKEY_CTX_set_signature_md.3 +man/man3/EVP_PKEY_METHOD.3 man/man3/EVP_PKEY_assign_DH.3 man/man3/EVP_PKEY_assign_DSA.3 man/man3/EVP_PKEY_assign_EC_KEY.3 @@ -837,6 +880,39 @@ man/man3/EVP_PKEY_get_default_digest.3 man/man3/EVP_PKEY_get_default_digest_nid.3 man/man3/EVP_PKEY_keygen.3 man/man3/EVP_PKEY_keygen_init.3 +man/man3/EVP_PKEY_meth_add0.3 +man/man3/EVP_PKEY_meth_copy.3 +man/man3/EVP_PKEY_meth_find.3 +man/man3/EVP_PKEY_meth_free.3 +man/man3/EVP_PKEY_meth_get_cleanup.3 +man/man3/EVP_PKEY_meth_get_copy.3 +man/man3/EVP_PKEY_meth_get_ctrl.3 +man/man3/EVP_PKEY_meth_get_decrypt.3 +man/man3/EVP_PKEY_meth_get_derive.3 +man/man3/EVP_PKEY_meth_get_encrypt.3 +man/man3/EVP_PKEY_meth_get_init.3 +man/man3/EVP_PKEY_meth_get_keygen.3 +man/man3/EVP_PKEY_meth_get_paramgen.3 +man/man3/EVP_PKEY_meth_get_sign.3 +man/man3/EVP_PKEY_meth_get_signctx.3 +man/man3/EVP_PKEY_meth_get_verify.3 +man/man3/EVP_PKEY_meth_get_verify_recover.3 +man/man3/EVP_PKEY_meth_get_verifyctx.3 +man/man3/EVP_PKEY_meth_new.3 +man/man3/EVP_PKEY_meth_set_cleanup.3 +man/man3/EVP_PKEY_meth_set_copy.3 +man/man3/EVP_PKEY_meth_set_ctrl.3 +man/man3/EVP_PKEY_meth_set_decrypt.3 +man/man3/EVP_PKEY_meth_set_derive.3 +man/man3/EVP_PKEY_meth_set_encrypt.3 +man/man3/EVP_PKEY_meth_set_init.3 +man/man3/EVP_PKEY_meth_set_keygen.3 +man/man3/EVP_PKEY_meth_set_paramgen.3 +man/man3/EVP_PKEY_meth_set_sign.3 +man/man3/EVP_PKEY_meth_set_signctx.3 +man/man3/EVP_PKEY_meth_set_verify.3 +man/man3/EVP_PKEY_meth_set_verify_recover.3 +man/man3/EVP_PKEY_meth_set_verifyctx.3 man/man3/EVP_PKEY_missing_parameters.3 man/man3/EVP_PKEY_new.3 man/man3/EVP_PKEY_paramgen.3 @@ -865,10 +941,14 @@ man/man3/EVP_SignUpdate.3 man/man3/EVP_VerifyFinal.3 man/man3/EVP_VerifyInit.3 man/man3/EVP_VerifyUpdate.3 +man/man3/EVP_aes_128_cbc_hmac_sha1.3 +man/man3/EVP_aes_128_cbc_hmac_sha256.3 man/man3/EVP_aes_128_ccm.3 man/man3/EVP_aes_128_gcm.3 man/man3/EVP_aes_192_ccm.3 man/man3/EVP_aes_192_gcm.3 +man/man3/EVP_aes_256_cbc_hmac_sha1.3 +man/man3/EVP_aes_256_cbc_hmac_sha256.3 man/man3/EVP_aes_256_ccm.3 man/man3/EVP_aes_256_gcm.3 man/man3/EVP_bf_cbc.3 @@ -918,6 +998,7 @@ man/man3/EVP_rc2_ecb.3 man/man3/EVP_rc2_ofb.3 man/man3/EVP_rc4.3 man/man3/EVP_rc4_40.3 +man/man3/EVP_rc4_hmac_md5.3 man/man3/EVP_rc5_32_12_16_cbc.3 man/man3/EVP_rc5_32_12_16_cfb.3 man/man3/EVP_rc5_32_12_16_ecb.3 @@ -1258,6 +1339,8 @@ man/man3/SSL_CTX_set_session_cache_mode.3 man/man3/SSL_CTX_set_session_id_context.3 man/man3/SSL_CTX_set_ssl_version.3 man/man3/SSL_CTX_set_timeout.3 +man/man3/SSL_CTX_set_tlsext_servername_arg.3 +man/man3/SSL_CTX_set_tlsext_servername_callback.3 man/man3/SSL_CTX_set_tlsext_status_arg.3 man/man3/SSL_CTX_set_tlsext_status_cb.3 man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 @@ -1307,6 +1390,7 @@ man/man3/SSL_clear_options.3 man/man3/SSL_connect.3 man/man3/SSL_ctrl.3 man/man3/SSL_do_handshake.3 +man/man3/SSL_export_keying_material.3 man/man3/SSL_flush_sessions.3 man/man3/SSL_free.3 man/man3/SSL_get0_alpn_selected.3 @@ -1342,6 +1426,8 @@ man/man3/SSL_get_quiet_shutdown.3 man/man3/SSL_get_rbio.3 man/man3/SSL_get_read_ahead.3 man/man3/SSL_get_secure_renegotiation_support.3 +man/man3/SSL_get_servername.3 +man/man3/SSL_get_servername_type.3 man/man3/SSL_get_session.3 man/man3/SSL_get_shared_curve.3 man/man3/SSL_get_shutdown.3 @@ -1494,6 +1580,7 @@ man/man3/X509_NAME_oneline.3 man/man3/X509_NAME_print.3 man/man3/X509_NAME_print_ex.3 man/man3/X509_NAME_print_ex_fp.3 +man/man3/X509_REQ_check_private_key.3 man/man3/X509_STORE_CTX_cleanup.3 man/man3/X509_STORE_CTX_free.3 man/man3/X509_STORE_CTX_get0_param.3 @@ -1537,6 +1624,7 @@ man/man3/X509_check_email.3 man/man3/X509_check_host.3 man/man3/X509_check_ip.3 man/man3/X509_check_ip_asc.3 +man/man3/X509_check_private_key.3 man/man3/X509_free.3 man/man3/X509_new.3 man/man3/X509_verify_cert.3 @@ -1560,7 +1648,7 @@ man/man3/bn_mul_normal.3 man/man3/bn_mul_part_recursive.3 man/man3/bn_mul_recursive.3 man/man3/bn_mul_words.3 -man/man3/bn_print.3 +${PLIST.notmac}man/man3/bn_print.3 man/man3/bn_set_high.3 man/man3/bn_set_low.3 man/man3/bn_set_max.3 diff --git a/security/openssl/distinfo b/security/openssl/distinfo index 60a5264e54f92..e424a0aa93e75 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.127 2017/01/26 16:31:57 jperkin Exp $ +$NetBSD: distinfo,v 1.130 2017/12/09 18:02:02 fhajny Exp $ -SHA1 (openssl-1.0.2k.tar.gz) = 5f26a624479c51847ebd2f22bb9f84b3b44dcb44 -RMD160 (openssl-1.0.2k.tar.gz) = 56b70831e49f83987ec14b3878d0d693f9a7d862 -SHA512 (openssl-1.0.2k.tar.gz) = 0d314b42352f4b1df2c40ca1094abc7e9ad684c5c35ea997efdd58204c70f22a1abcb17291820f0fff3769620a4e06906034203d31eb1a4d540df3e0db294016 -Size (openssl-1.0.2k.tar.gz) = 5309236 bytes +SHA1 (openssl-1.0.2n.tar.gz) = 0ca2957869206de193603eca6d89f532f61680b1 +RMD160 (openssl-1.0.2n.tar.gz) = 90fbf1df8986e04921e14e4c6e408458b5b31f6c +SHA512 (openssl-1.0.2n.tar.gz) = 144bf0d6aa27b4af01df0b7b734c39962649e1711554247d42e05e14d8945742b18745aefdba162e2dfc762b941fd7d3b2d5dc6a781ae4ba10a6f5a3cadb0687 +Size (openssl-1.0.2n.tar.gz) = 5375802 bytes SHA1 (patch-Configure) = 2d963d781314276a0ee1bc531df6bc50f0f6b32b SHA1 (patch-Makefile.org) = d2a9295003a8b88718a328b01ff6bcbbc102ec0b SHA1 (patch-Makefile.shared) = d317004d6ade167fc3b6e533bb8a1e93657188b2