3 files changed, 10 insertions, 88 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 4ed724ab9639..d4c9fd34ce3a 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnutls
-PORTVERSION=	3.5.8
+PORTVERSION=	3.5.9
 CATEGORIES=	security net
 MASTER_SITES=	GNUPG/gnutls/v${PORTVERSION:R}
 
@@ -27,20 +27,17 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-guile \
 		--enable-local-libopts \
 		--with-trousers-lib=${LOCALBASE}/lib/libtspi.so.1 \
+		--without-libidn2 \
 		ac_cv_type_max_align_t=yes
 MAKE_ENV=	MAKEINFOFLAGS=--no-split
 INSTALL_TARGET=	install-strip
 
 CPE_VENDOR=	gnu
 
-OPTIONS_DEFINE=		CRYWRAP DANE EXAMPLES IDN NLS P11KIT TPM ZLIB
-OPTIONS_DEFAULT=	CRYWRAP IDN P11KIT TPM ZLIB
+OPTIONS_DEFINE=		DANE EXAMPLES IDN NLS P11KIT TPM ZLIB
+OPTIONS_DEFAULT=	IDN P11KIT TPM ZLIB
 OPTIONS_SUB=		yes
 
-CRYWRAP_DESC=			Enable Crywrap TLS proxy service
-CRYWRAP_IMPLIES=		IDN
-CRYWRAP_CONFIGURE_ENABLE=	crywrap
-
 DANE_DESC=		Certificate verification via DNSSEC
 DANE_LIB_DEPENDS=	libunbound.so:dns/unbound
 DANE_CONFIGURE_ENABLE=	libdane
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 8ac132b43bc5..a845635be88f 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483969740
-SHA256 (gnutls-3.5.8.tar.xz) = 0e97f243ae72b70307d684b84c7fe679385aa7a7a0e37e5be810193dcc17d4ff
-SIZE (gnutls-3.5.8.tar.xz) = 7264448
+TIMESTAMP = 1486998078
+SHA256 (gnutls-3.5.9.tar.xz) = 82b10f0c4ef18f4e64ad8cef5dbaf14be732f5095a41cf366b4ecb4050382951
+SIZE (gnutls-3.5.9.tar.xz) = 7166932
diff --git a/security/gnutls/pkg-plist b/security/gnutls/pkg-plist
index 9756b1feaf7d..71b87dc8f692 100644
--- a/security/gnutls/pkg-plist
+++ b/security/gnutls/pkg-plist
@@ -34,7 +34,6 @@ info/gnutls-internals.png
 info/gnutls-layers.png
 info/gnutls-logo.png
 info/gnutls-modauth.png
-info/gnutls-pgp.png
 info/gnutls-x509.png
 info/pkcs11-vision.png
 %%DANE%%lib/libgnutls-dane.so
@@ -42,7 +41,7 @@ info/pkcs11-vision.png
 %%DANE%%lib/libgnutls-dane.so.0.4.1
 lib/libgnutls.so
 lib/libgnutls.so.30
-lib/libgnutls.so.30.13.1
+lib/libgnutls.so.30.14.0
 lib/libgnutlsxx.so
 lib/libgnutlsxx.so.28
 lib/libgnutlsxx.so.28.1.0
@@ -111,8 +110,6 @@ man/man3/gnutls_certificate_free_crls.3.gz
 man/man3/gnutls_certificate_free_keys.3.gz
 man/man3/gnutls_certificate_get_crt_raw.3.gz
 man/man3/gnutls_certificate_get_issuer.3.gz
-man/man3/gnutls_certificate_get_openpgp_crt.3.gz
-man/man3/gnutls_certificate_get_openpgp_key.3.gz
 man/man3/gnutls_certificate_get_ours.3.gz
 man/man3/gnutls_certificate_get_peers.3.gz
 man/man3/gnutls_certificate_get_peers_subkey_id.3.gz
@@ -129,13 +126,6 @@ man/man3/gnutls_certificate_set_known_dh_params.3.gz
 man/man3/gnutls_certificate_set_ocsp_status_request_file.3.gz
 man/man3/gnutls_certificate_set_ocsp_status_request_function.3.gz
 man/man3/gnutls_certificate_set_ocsp_status_request_function2.3.gz
-man/man3/gnutls_certificate_set_openpgp_key.3.gz
-man/man3/gnutls_certificate_set_openpgp_key_file.3.gz
-man/man3/gnutls_certificate_set_openpgp_key_file2.3.gz
-man/man3/gnutls_certificate_set_openpgp_key_mem.3.gz
-man/man3/gnutls_certificate_set_openpgp_key_mem2.3.gz
-man/man3/gnutls_certificate_set_openpgp_keyring_file.3.gz
-man/man3/gnutls_certificate_set_openpgp_keyring_mem.3.gz
 man/man3/gnutls_certificate_set_params_function.3.gz
 man/man3/gnutls_certificate_set_pin_function.3.gz
 man/man3/gnutls_certificate_set_retrieve_function.3.gz
@@ -299,6 +289,8 @@ man/man3/gnutls_hmac_get_len.3.gz
 man/man3/gnutls_hmac_init.3.gz
 man/man3/gnutls_hmac_output.3.gz
 man/man3/gnutls_hmac_set_nonce.3.gz
+man/man3/gnutls_idna_map.3.gz
+man/man3/gnutls_idna_reverse_map.3.gz
 man/man3/gnutls_init.3.gz
 man/man3/gnutls_key_generate.3.gz
 man/man3/gnutls_kx_get.3.gz
@@ -357,75 +349,8 @@ man/man3/gnutls_oid_to_ecc_curve.3.gz
 man/man3/gnutls_oid_to_mac.3.gz
 man/man3/gnutls_oid_to_pk.3.gz
 man/man3/gnutls_oid_to_sign.3.gz
-man/man3/gnutls_openpgp_crt_check_email.3.gz
-man/man3/gnutls_openpgp_crt_check_hostname.3.gz
-man/man3/gnutls_openpgp_crt_check_hostname2.3.gz
-man/man3/gnutls_openpgp_crt_deinit.3.gz
-man/man3/gnutls_openpgp_crt_export.3.gz
-man/man3/gnutls_openpgp_crt_export2.3.gz
-man/man3/gnutls_openpgp_crt_get_auth_subkey.3.gz
-man/man3/gnutls_openpgp_crt_get_creation_time.3.gz
-man/man3/gnutls_openpgp_crt_get_expiration_time.3.gz
-man/man3/gnutls_openpgp_crt_get_fingerprint.3.gz
-man/man3/gnutls_openpgp_crt_get_key_id.3.gz
-man/man3/gnutls_openpgp_crt_get_key_usage.3.gz
-man/man3/gnutls_openpgp_crt_get_name.3.gz
-man/man3/gnutls_openpgp_crt_get_pk_algorithm.3.gz
-man/man3/gnutls_openpgp_crt_get_pk_dsa_raw.3.gz
-man/man3/gnutls_openpgp_crt_get_pk_rsa_raw.3.gz
-man/man3/gnutls_openpgp_crt_get_preferred_key_id.3.gz
-man/man3/gnutls_openpgp_crt_get_revoked_status.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_count.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_creation_time.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_expiration_time.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_fingerprint.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_id.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_idx.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_pk_algorithm.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_pk_dsa_raw.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_pk_rsa_raw.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_revoked_status.3.gz
-man/man3/gnutls_openpgp_crt_get_subkey_usage.3.gz
-man/man3/gnutls_openpgp_crt_get_version.3.gz
-man/man3/gnutls_openpgp_crt_import.3.gz
-man/man3/gnutls_openpgp_crt_init.3.gz
-man/man3/gnutls_openpgp_crt_print.3.gz
-man/man3/gnutls_openpgp_crt_set_preferred_key_id.3.gz
-man/man3/gnutls_openpgp_crt_verify_ring.3.gz
-man/man3/gnutls_openpgp_crt_verify_self.3.gz
-man/man3/gnutls_openpgp_keyring_check_id.3.gz
-man/man3/gnutls_openpgp_keyring_deinit.3.gz
-man/man3/gnutls_openpgp_keyring_get_crt.3.gz
-man/man3/gnutls_openpgp_keyring_get_crt_count.3.gz
-man/man3/gnutls_openpgp_keyring_import.3.gz
-man/man3/gnutls_openpgp_keyring_init.3.gz
-man/man3/gnutls_openpgp_privkey_deinit.3.gz
-man/man3/gnutls_openpgp_privkey_export.3.gz
-man/man3/gnutls_openpgp_privkey_export2.3.gz
-man/man3/gnutls_openpgp_privkey_export_dsa_raw.3.gz
-man/man3/gnutls_openpgp_privkey_export_rsa_raw.3.gz
-man/man3/gnutls_openpgp_privkey_export_subkey_dsa_raw.3.gz
-man/man3/gnutls_openpgp_privkey_export_subkey_rsa_raw.3.gz
-man/man3/gnutls_openpgp_privkey_get_fingerprint.3.gz
-man/man3/gnutls_openpgp_privkey_get_key_id.3.gz
-man/man3/gnutls_openpgp_privkey_get_pk_algorithm.3.gz
-man/man3/gnutls_openpgp_privkey_get_preferred_key_id.3.gz
-man/man3/gnutls_openpgp_privkey_get_revoked_status.3.gz
-man/man3/gnutls_openpgp_privkey_get_subkey_count.3.gz
-man/man3/gnutls_openpgp_privkey_get_subkey_creation_time.3.gz
-man/man3/gnutls_openpgp_privkey_get_subkey_expiration_time.3.gz
-man/man3/gnutls_openpgp_privkey_get_subkey_fingerprint.3.gz
-man/man3/gnutls_openpgp_privkey_get_subkey_id.3.gz
-man/man3/gnutls_openpgp_privkey_get_subkey_idx.3.gz
-man/man3/gnutls_openpgp_privkey_get_subkey_pk_algorithm.3.gz
-man/man3/gnutls_openpgp_privkey_get_subkey_revoked_status.3.gz
-man/man3/gnutls_openpgp_privkey_import.3.gz
-man/man3/gnutls_openpgp_privkey_init.3.gz
-man/man3/gnutls_openpgp_privkey_sec_param.3.gz
-man/man3/gnutls_openpgp_privkey_set_preferred_key_id.3.gz
 man/man3/gnutls_openpgp_privkey_sign_hash.3.gz
 man/man3/gnutls_openpgp_send_cert.3.gz
-man/man3/gnutls_openpgp_set_recv_key_function.3.gz
 man/man3/gnutls_packet_deinit.3.gz
 man/man3/gnutls_packet_get.3.gz
 man/man3/gnutls_pcert_deinit.3.gz