diff options
Diffstat (limited to 'security')
| -rw-r--r-- | security/gnutls/Makefile | 6 | ||||
| -rw-r--r-- | security/gnutls/PLIST | 14 | ||||
| -rw-r--r-- | security/gnutls/PLIST.guile | 10 | ||||
| -rw-r--r-- | security/gnutls/buildlink3.mk | 8 | ||||
| -rw-r--r-- | security/gnutls/distinfo | 11 | ||||
| -rw-r--r-- | security/gnutls/options.mk | 12 | ||||
| -rw-r--r-- | security/gnutls/patches/patch-configure | 14 |
7 files changed, 62 insertions, 13 deletions
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index f83eda68b4e..d40ad05c087 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.209 2020/03/22 12:21:59 rillig Exp $ +# $NetBSD: Makefile,v 1.209.2.1 2020/06/09 11:55:34 bsiegert Exp $ -DISTNAME= gnutls-3.6.12 -PKGREVISION= 1 +DISTNAME= gnutls-3.6.14 CATEGORIES= security devel MASTER_SITES= https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/ EXTRACT_SUFX= .tar.xz @@ -22,7 +21,6 @@ USE_TOOLS+= msgfmt msgmerge xgettext GNU_CONFIGURE= yes # this library duplicates (and conflicts with) openssl CONFIGURE_ARGS+= --disable-openssl-compatibility -CONFIGURE_ARGS+= --disable-guile CONFIGURE_ARGS+= --disable-libdane CONFIGURE_ARGS+= --without-idn CONFIGURE_ARGS+= --without-tpm diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST index 7678c07d6e7..fa2b7dc4ffa 100644 --- a/security/gnutls/PLIST +++ b/security/gnutls/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.69 2020/02/09 13:56:28 wiz Exp $ +@comment $NetBSD: PLIST,v 1.69.2.1 2020/06/09 11:55:34 bsiegert Exp $ bin/certtool bin/gnutls-cli bin/gnutls-cli-debug @@ -261,6 +261,7 @@ man/man3/gnutls_est_record_overhead_size.3 man/man3/gnutls_ext_get_current_msg.3 man/man3/gnutls_ext_get_data.3 man/man3/gnutls_ext_get_name.3 +man/man3/gnutls_ext_get_name2.3 man/man3/gnutls_ext_raw_parse.3 man/man3/gnutls_ext_register.3 man/man3/gnutls_ext_set_data.3 @@ -310,6 +311,8 @@ man/man3/gnutls_hex_decode.3 man/man3/gnutls_hex_decode2.3 man/man3/gnutls_hex_encode.3 man/man3/gnutls_hex_encode2.3 +man/man3/gnutls_hkdf_expand.3 +man/man3/gnutls_hkdf_extract.3 man/man3/gnutls_hmac.3 man/man3/gnutls_hmac_copy.3 man/man3/gnutls_hmac_deinit.3 @@ -388,6 +391,7 @@ man/man3/gnutls_openpgp_privkey_sign_hash.3 man/man3/gnutls_openpgp_send_cert.3 man/man3/gnutls_packet_deinit.3 man/man3/gnutls_packet_get.3 +man/man3/gnutls_pbkdf2.3 man/man3/gnutls_pcert_deinit.3 man/man3/gnutls_pcert_export_openpgp.3 man/man3/gnutls_pcert_export_x509.3 @@ -520,6 +524,7 @@ man/man3/gnutls_pkcs7_get_signature_info.3 man/man3/gnutls_pkcs7_import.3 man/man3/gnutls_pkcs7_init.3 man/man3/gnutls_pkcs7_print.3 +man/man3/gnutls_pkcs7_print_signature_info.3 man/man3/gnutls_pkcs7_set_crl.3 man/man3/gnutls_pkcs7_set_crl_raw.3 man/man3/gnutls_pkcs7_set_crt.3 @@ -533,6 +538,7 @@ man/man3/gnutls_pkcs_schema_get_name.3 man/man3/gnutls_pkcs_schema_get_oid.3 man/man3/gnutls_prf.3 man/man3/gnutls_prf_early.3 +man/man3/gnutls_prf_hash_get.3 man/man3/gnutls_prf_raw.3 man/man3/gnutls_prf_rfc5705.3 man/man3/gnutls_priority_certificate_type_list.3 @@ -609,11 +615,15 @@ man/man3/gnutls_psk_client_get_hint.3 man/man3/gnutls_psk_free_client_credentials.3 man/man3/gnutls_psk_free_server_credentials.3 man/man3/gnutls_psk_server_get_username.3 +man/man3/gnutls_psk_server_get_username2.3 man/man3/gnutls_psk_set_client_credentials.3 +man/man3/gnutls_psk_set_client_credentials2.3 man/man3/gnutls_psk_set_client_credentials_function.3 +man/man3/gnutls_psk_set_client_credentials_function2.3 man/man3/gnutls_psk_set_params_function.3 man/man3/gnutls_psk_set_server_credentials_file.3 man/man3/gnutls_psk_set_server_credentials_function.3 +man/man3/gnutls_psk_set_server_credentials_function2.3 man/man3/gnutls_psk_set_server_credentials_hint.3 man/man3/gnutls_psk_set_server_dh_params.3 man/man3/gnutls_psk_set_server_known_dh_params.3 @@ -711,6 +721,7 @@ man/man3/gnutls_session_get_desc.3 man/man3/gnutls_session_get_flags.3 man/man3/gnutls_session_get_id.3 man/man3/gnutls_session_get_id2.3 +man/man3/gnutls_session_get_keylog_function.3 man/man3/gnutls_session_get_master_secret.3 man/man3/gnutls_session_get_ptr.3 man/man3/gnutls_session_get_random.3 @@ -720,6 +731,7 @@ man/man3/gnutls_session_key_update.3 man/man3/gnutls_session_resumption_requested.3 man/man3/gnutls_session_set_data.3 man/man3/gnutls_session_set_id.3 +man/man3/gnutls_session_set_keylog_function.3 man/man3/gnutls_session_set_premaster.3 man/man3/gnutls_session_set_ptr.3 man/man3/gnutls_session_set_verify_cert.3 diff --git a/security/gnutls/PLIST.guile b/security/gnutls/PLIST.guile new file mode 100644 index 00000000000..badcbc10196 --- /dev/null +++ b/security/gnutls/PLIST.guile @@ -0,0 +1,10 @@ +@comment $NetBSD: PLIST.guile,v 1.1.2.2 2020/06/09 11:55:34 bsiegert Exp $ +guile/2.2/lib/guile/2.2/extensions/guile-gnutls-v-2.a +guile/2.2/lib/guile/2.2/extensions/guile-gnutls-v-2.la +guile/2.2/lib/guile/2.2/extensions/guile-gnutls-v-2.so +guile/2.2/lib/guile/2.2/extensions/guile-gnutls-v-2.so.0 +guile/2.2/lib/guile/2.2/extensions/guile-gnutls-v-2.so.0.0.0 +guile/2.2/lib/guile/2.2/site-ccache/gnutls.go +guile/2.2/lib/guile/2.2/site-ccache/gnutls/extra.go +guile/2.2/share/guile/site/2.2/gnutls.scm +guile/2.2/share/guile/site/2.2/gnutls/extra.scm diff --git a/security/gnutls/buildlink3.mk b/security/gnutls/buildlink3.mk index 3000b804c08..06b7db3f26a 100644 --- a/security/gnutls/buildlink3.mk +++ b/security/gnutls/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.36 2020/03/08 16:48:06 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.36.2.1 2020/06/09 11:55:34 bsiegert Exp $ BUILDLINK_TREE+= gnutls @@ -18,6 +18,12 @@ BUILDLINK_API_DEPENDS.nettle+= nettle>=3.4.1 .include "../../security/nettle/buildlink3.mk" .include "../../security/p11-kit/buildlink3.mk" .include "../../textproc/libunistring/buildlink3.mk" +.if !empty(PKG_BUILD_OPTIONS.gnutls:Mdane) +.include "../../net/unbound/buildlink3.mk" +.endif +.if !empty(PKG_BUILD_OPTIONS.gnutls:Mguile) +.include "../../lang/guile22/buildlink3.mk" +.endif .endif # GNUTLS_BUILDLINK3_MK BUILDLINK_TREE+= -gnutls diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo index 898d25e1ca1..3115087d594 100644 --- a/security/gnutls/distinfo +++ b/security/gnutls/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.142 2020/02/09 13:56:28 wiz Exp $ +$NetBSD: distinfo,v 1.142.2.1 2020/06/09 11:55:34 bsiegert Exp $ -SHA1 (gnutls-3.6.12.tar.xz) = fa498b4d026e3ddfa74aa79adac27bfcd14e8b76 -RMD160 (gnutls-3.6.12.tar.xz) = f76e05c4a5f6c15277259b874bca475089c02630 -SHA512 (gnutls-3.6.12.tar.xz) = e1031fd1239d8b0f056a6b736e4c72c9268fb635f273527f310771c608b841cad7b6631401382ec3040d9b539180bf421882bf43427ad3549a5787d2864c2fa5 -Size (gnutls-3.6.12.tar.xz) = 5942064 bytes +SHA1 (gnutls-3.6.14.tar.xz) = bea1b5abcb691acf014e592f41d0a9580a41216a +RMD160 (gnutls-3.6.14.tar.xz) = 89c4f89e4453c2d08ad0918fbf099d9fbcfe9cba +SHA512 (gnutls-3.6.14.tar.xz) = b2d427b5542a4679117c011dffa8efb0e0bffa3ce9cebc319f8998d03f80f4168d08f9fda35df18dbeaaada59e479d325a6c1c77d5ca7f8ce221b44e42bfe604 +Size (gnutls-3.6.14.tar.xz) = 6069088 bytes +SHA1 (patch-configure) = 3653f74914f874aa369f62c8b267a46fd6b78eaa SHA1 (patch-lib_system_certs.c) = fba74b2834a36d66bddcd7d3405d0c91c1b14efc SHA1 (patch-src_libopts_autoopts_options.h) = ebeeafc834bce3b6b3f938e360b089e165ee4f9e SHA1 (patch-src_libopts_compat_compat.h) = 6e88b5e73a56c296f356aa5ce7e6048e1bcff450 diff --git a/security/gnutls/options.mk b/security/gnutls/options.mk index 3499a07c4b3..75e3c3c817e 100644 --- a/security/gnutls/options.mk +++ b/security/gnutls/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.2 2019/10/04 17:25:53 nia Exp $ +# $NetBSD: options.mk,v 1.2.2.1 2020/06/09 11:55:34 bsiegert Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gnutls -PKG_SUPPORTED_OPTIONS= dane +PKG_SUPPORTED_OPTIONS= dane guile .include "../../mk/bsd.options.mk" @@ -12,3 +12,11 @@ PLIST_SRC+= PLIST.dane .else CONFIGURE_ARGS+= --disable-libdane .endif + +.if !empty(PKG_OPTIONS:Mguile) +.include "../../lang/guile22/buildlink3.mk" +CONFIGURE_ARGS+= --enable-guile +PLIST_SRC+= PLIST.guile +.else +CONFIGURE_ARGS+= --disable-guile +.endif diff --git a/security/gnutls/patches/patch-configure b/security/gnutls/patches/patch-configure new file mode 100644 index 00000000000..f5afc871112 --- /dev/null +++ b/security/gnutls/patches/patch-configure @@ -0,0 +1,14 @@ +$NetBSD: patch-configure,v 1.5.2.2 2020/06/09 11:55:34 bsiegert Exp $ + +Fix linking on Darwin. + +--- configure.orig 2020-03-19 15:24:05.000000000 +0000 ++++ configure +@@ -9698,7 +9698,6 @@ $as_echo "#define _UNICODE 1" >>confdefs + *darwin*) + have_macosx=yes + save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -Wl,-no_weak_imports" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker supports -Wl,-no_weak_imports" >&5 + $as_echo_n "checking whether the linker supports -Wl,-no_weak_imports... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |