Update to 3.6.5.

PR:		234012
Exp-run by:	antoine

4 files changed, 108 insertions, 72 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 02f51c20ce42..6296701e0082 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnutls
-PORTVERSION=	3.5.19
-PORTREVISION=	1
+PORTVERSION=	3.6.5
 CATEGORIES=	security net
 MASTER_SITES=	GNUPG/gnutls/v${PORTVERSION:R}
 
@@ -21,7 +20,7 @@ LIB_DEPENDS=	libgmp.so:math/gmp \
 BUILD_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
-USES=		cpe gmake iconv libtool localbase makeinfo \
+USES=		compiler:c11 cpe gmake iconv libtool localbase makeinfo \
 		pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 634b40d93479..748eb583550f 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1533909779
-SHA256 (gnutls-3.5.19.tar.xz) = 1936eb64f03aaefd6eb16cef0567457777618573826b94d03376bb6a4afadc44
-SIZE (gnutls-3.5.19.tar.xz) = 7239744
+TIMESTAMP = 1544794385
+SHA256 (gnutls-3.6.5.tar.xz) = 073eced3acef49a3883e69ffd5f0f0b5f46e2760ad86eddc6c0866df4e7abb35
+SIZE (gnutls-3.6.5.tar.xz) = 8192888
diff --git a/security/gnutls/files/patch-lib-random.c b/security/gnutls/files/patch-lib-random.c
deleted file mode 100644
index 15dd7c59a485..000000000000
--- a/security/gnutls/files/patch-lib-random.c
+++ /dev/null
@@ -1,53 +0,0 @@
---- lib/random.c.orig	2017-01-08 09:27:28 UTC
-+++ lib/random.c
-@@ -33,24 +33,24 @@ void *gnutls_rnd_ctx;
- GNUTLS_STATIC_MUTEX(gnutls_rnd_init_mutex);
- 
- #ifdef HAVE_STDATOMIC_H
--static atomic_uint rnd_initialized = 0;
-+static atomic_uint rnd_initialized = ATOMIC_VAR_INIT(0);
- 
- inline static int _gnutls_rnd_init(void)
- {
--	if (unlikely(!rnd_initialized)) {
-+	if (unlikely(!atomic_load(&rnd_initialized))) {
- 		if (_gnutls_rnd_ops.init == NULL) {
--			rnd_initialized = 1;
-+			atomic_store(&rnd_initialized, 1);
- 			return 0;
- 		}
- 
- 		GNUTLS_STATIC_MUTEX_LOCK(gnutls_rnd_init_mutex);
--		if (!rnd_initialized) {
-+		if (!atomic_load(&rnd_initialized)) {
- 			if (_gnutls_rnd_ops.init(&gnutls_rnd_ctx) < 0) {
- 				gnutls_assert();
- 				GNUTLS_STATIC_MUTEX_UNLOCK(gnutls_rnd_init_mutex);
- 				return GNUTLS_E_RANDOM_FAILED;
- 			}
--			rnd_initialized = 1;
-+			atomic_store(&rnd_initialized, 1);
- 		}
- 		GNUTLS_STATIC_MUTEX_UNLOCK(gnutls_rnd_init_mutex);
- 	}
-@@ -107,10 +107,10 @@ int _gnutls_rnd_preinit(void)
- 
- void _gnutls_rnd_deinit(void)
- {
--	if (rnd_initialized && _gnutls_rnd_ops.deinit != NULL) {
-+	if (atomic_load(&rnd_initialized) && _gnutls_rnd_ops.deinit != NULL) {
- 		_gnutls_rnd_ops.deinit(gnutls_rnd_ctx);
- 	}
--	rnd_initialized = 0;
-+	atomic_store(&rnd_initialized, 0);
- 
- 	_rnd_system_entropy_deinit();
- 
-@@ -162,6 +162,6 @@ int gnutls_rnd(gnutls_rnd_level_t level,
-  **/
- void gnutls_rnd_refresh(void)
- {
--	if (rnd_initialized && _gnutls_rnd_ops.rnd_refresh)
-+	if (atomic_load(&rnd_initialized) && _gnutls_rnd_ops.rnd_refresh)
- 		_gnutls_rnd_ops.rnd_refresh(gnutls_rnd_ctx);
- }
diff --git a/security/gnutls/pkg-plist b/security/gnutls/pkg-plist
index 2b728bb95285..ee0f9de5f5ed 100644
--- a/security/gnutls/pkg-plist
+++ b/security/gnutls/pkg-plist
@@ -27,21 +27,12 @@ include/gnutls/tpm.h
 include/gnutls/urls.h
 include/gnutls/x509-ext.h
 include/gnutls/x509.h
-share/info/gnutls-client-server-use-case.png
-share/info/gnutls-handshake-sequence.png
-share/info/gnutls-handshake-state.png
-share/info/gnutls-internals.png
-share/info/gnutls-layers.png
-share/info/gnutls-logo.png
-share/info/gnutls-modauth.png
-share/info/gnutls-x509.png
-share/info/pkcs11-vision.png
 %%DANE%%lib/libgnutls-dane.so
 %%DANE%%lib/libgnutls-dane.so.0
 %%DANE%%lib/libgnutls-dane.so.0.4.1
 lib/libgnutls.so
 lib/libgnutls.so.30
-lib/libgnutls.so.30.14.11
+lib/libgnutls.so.30.23.0
 lib/libgnutlsxx.so
 lib/libgnutlsxx.so.28
 lib/libgnutlsxx.so.28.1.0
@@ -78,6 +69,7 @@ man/man3/dane_verify_session_crt.3.gz
 man/man3/gnutls_aead_cipher_decrypt.3.gz
 man/man3/gnutls_aead_cipher_deinit.3.gz
 man/man3/gnutls_aead_cipher_encrypt.3.gz
+man/man3/gnutls_aead_cipher_encryptv.3.gz
 man/man3/gnutls_aead_cipher_init.3.gz
 man/man3/gnutls_alert_get.3.gz
 man/man3/gnutls_alert_get_name.3.gz
@@ -94,9 +86,17 @@ man/man3/gnutls_anon_set_params_function.3.gz
 man/man3/gnutls_anon_set_server_dh_params.3.gz
 man/man3/gnutls_anon_set_server_known_dh_params.3.gz
 man/man3/gnutls_anon_set_server_params_function.3.gz
+man/man3/gnutls_anti_replay_deinit.3.gz
+man/man3/gnutls_anti_replay_enable.3.gz
+man/man3/gnutls_anti_replay_init.3.gz
+man/man3/gnutls_anti_replay_set_add_function.3.gz
+man/man3/gnutls_anti_replay_set_ptr.3.gz
+man/man3/gnutls_anti_replay_set_window.3.gz
 man/man3/gnutls_auth_client_get_type.3.gz
 man/man3/gnutls_auth_get_type.3.gz
 man/man3/gnutls_auth_server_get_type.3.gz
+man/man3/gnutls_base64_decode2.3.gz
+man/man3/gnutls_base64_encode2.3.gz
 man/man3/gnutls_buffer_append_data.3.gz
 man/man3/gnutls_bye.3.gz
 man/man3/gnutls_certificate_activation_time_peers.3.gz
@@ -110,6 +110,7 @@ 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_ocsp_expiration.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
@@ -124,12 +125,15 @@ man/man3/gnutls_certificate_set_flags.3.gz
 man/man3/gnutls_certificate_set_key.3.gz
 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_file2.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_ocsp_status_request_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
 man/man3/gnutls_certificate_set_retrieve_function2.3.gz
+man/man3/gnutls_certificate_set_retrieve_function3.3.gz
 man/man3/gnutls_certificate_set_trust_list.3.gz
 man/man3/gnutls_certificate_set_verify_flags.3.gz
 man/man3/gnutls_certificate_set_verify_function.3.gz
@@ -150,6 +154,7 @@ man/man3/gnutls_certificate_set_x509_trust_dir.3.gz
 man/man3/gnutls_certificate_set_x509_trust_file.3.gz
 man/man3/gnutls_certificate_set_x509_trust_mem.3.gz
 man/man3/gnutls_certificate_type_get.3.gz
+man/man3/gnutls_certificate_type_get2.3.gz
 man/man3/gnutls_certificate_type_get_id.3.gz
 man/man3/gnutls_certificate_type_get_name.3.gz
 man/man3/gnutls_certificate_type_list.3.gz
@@ -189,6 +194,7 @@ man/man3/gnutls_crypto_register_cipher.3.gz
 man/man3/gnutls_crypto_register_digest.3.gz
 man/man3/gnutls_crypto_register_mac.3.gz
 man/man3/gnutls_db_check_entry.3.gz
+man/man3/gnutls_db_check_entry_expire_time.3.gz
 man/man3/gnutls_db_check_entry_time.3.gz
 man/man3/gnutls_db_get_default_cache_expiration.3.gz
 man/man3/gnutls_db_get_ptr.3.gz
@@ -199,6 +205,8 @@ man/man3/gnutls_db_set_remove_function.3.gz
 man/man3/gnutls_db_set_retrieve_function.3.gz
 man/man3/gnutls_db_set_store_function.3.gz
 man/man3/gnutls_decode_ber_digest_info.3.gz
+man/man3/gnutls_decode_gost_rs_value.3.gz
+man/man3/gnutls_decode_rs_value.3.gz
 man/man3/gnutls_deinit.3.gz
 man/man3/gnutls_dh_get_group.3.gz
 man/man3/gnutls_dh_get_peers_public_bits.3.gz
@@ -238,15 +246,20 @@ man/man3/gnutls_ecc_curve_get_pk.3.gz
 man/man3/gnutls_ecc_curve_get_size.3.gz
 man/man3/gnutls_ecc_curve_list.3.gz
 man/man3/gnutls_encode_ber_digest_info.3.gz
+man/man3/gnutls_encode_gost_rs_value.3.gz
+man/man3/gnutls_encode_rs_value.3.gz
 man/man3/gnutls_error_is_fatal.3.gz
 man/man3/gnutls_error_to_alert.3.gz
 man/man3/gnutls_est_record_overhead_size.3.gz
+man/man3/gnutls_ext_get_current_msg.3.gz
 man/man3/gnutls_ext_get_data.3.gz
 man/man3/gnutls_ext_get_name.3.gz
+man/man3/gnutls_ext_raw_parse.3.gz
 man/man3/gnutls_ext_register.3.gz
 man/man3/gnutls_ext_set_data.3.gz
 man/man3/gnutls_fingerprint.3.gz
 man/man3/gnutls_fips140_mode_enabled.3.gz
+man/man3/gnutls_fips140_set_mode.3.gz
 man/man3/gnutls_global_deinit.3.gz
 man/man3/gnutls_global_init.3.gz
 man/man3/gnutls_global_set_audit_log_function.3.gz
@@ -255,6 +268,12 @@ man/man3/gnutls_global_set_log_level.3.gz
 man/man3/gnutls_global_set_mem_functions.3.gz
 man/man3/gnutls_global_set_mutex.3.gz
 man/man3/gnutls_global_set_time_function.3.gz
+man/man3/gnutls_gost_paramset_get_name.3.gz
+man/man3/gnutls_gost_paramset_get_oid.3.gz
+man/man3/gnutls_group_get.3.gz
+man/man3/gnutls_group_get_id.3.gz
+man/man3/gnutls_group_get_name.3.gz
+man/man3/gnutls_group_list.3.gz
 man/man3/gnutls_handshake.3.gz
 man/man3/gnutls_handshake_description_get_name.3.gz
 man/man3/gnutls_handshake_get_last_in.3.gz
@@ -323,6 +342,7 @@ man/man3/gnutls_ocsp_req_set_nonce.3.gz
 man/man3/gnutls_ocsp_resp_check_crt.3.gz
 man/man3/gnutls_ocsp_resp_deinit.3.gz
 man/man3/gnutls_ocsp_resp_export.3.gz
+man/man3/gnutls_ocsp_resp_export2.3.gz
 man/man3/gnutls_ocsp_resp_get_certs.3.gz
 man/man3/gnutls_ocsp_resp_get_extension.3.gz
 man/man3/gnutls_ocsp_resp_get_nonce.3.gz
@@ -337,15 +357,19 @@ man/man3/gnutls_ocsp_resp_get_single.3.gz
 man/man3/gnutls_ocsp_resp_get_status.3.gz
 man/man3/gnutls_ocsp_resp_get_version.3.gz
 man/man3/gnutls_ocsp_resp_import.3.gz
+man/man3/gnutls_ocsp_resp_import2.3.gz
 man/man3/gnutls_ocsp_resp_init.3.gz
+man/man3/gnutls_ocsp_resp_list_import2.3.gz
 man/man3/gnutls_ocsp_resp_print.3.gz
 man/man3/gnutls_ocsp_resp_verify.3.gz
 man/man3/gnutls_ocsp_resp_verify_direct.3.gz
 man/man3/gnutls_ocsp_status_request_enable_client.3.gz
 man/man3/gnutls_ocsp_status_request_get.3.gz
+man/man3/gnutls_ocsp_status_request_get2.3.gz
 man/man3/gnutls_ocsp_status_request_is_checked.3.gz
 man/man3/gnutls_oid_to_digest.3.gz
 man/man3/gnutls_oid_to_ecc_curve.3.gz
+man/man3/gnutls_oid_to_gost_paramset.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
@@ -361,6 +385,7 @@ man/man3/gnutls_pcert_import_openpgp_raw.3.gz
 man/man3/gnutls_pcert_import_x509.3.gz
 man/man3/gnutls_pcert_import_x509_list.3.gz
 man/man3/gnutls_pcert_import_x509_raw.3.gz
+man/man3/gnutls_pcert_list_import_x509_file.3.gz
 man/man3/gnutls_pcert_list_import_x509_raw.3.gz
 man/man3/gnutls_pem_base64_decode.3.gz
 man/man3/gnutls_pem_base64_decode2.3.gz
@@ -399,6 +424,7 @@ man/man3/gnutls_pkcs11_obj_flags_get_str.3.gz
 man/man3/gnutls_pkcs11_obj_get_exts.3.gz
 man/man3/gnutls_pkcs11_obj_get_flags.3.gz
 man/man3/gnutls_pkcs11_obj_get_info.3.gz
+man/man3/gnutls_pkcs11_obj_get_ptr.3.gz
 man/man3/gnutls_pkcs11_obj_get_type.3.gz
 man/man3/gnutls_pkcs11_obj_import_url.3.gz
 man/man3/gnutls_pkcs11_obj_init.3.gz
@@ -422,9 +448,11 @@ man/man3/gnutls_pkcs11_privkey_status.3.gz
 man/man3/gnutls_pkcs11_reinit.3.gz
 man/man3/gnutls_pkcs11_set_pin_function.3.gz
 man/man3/gnutls_pkcs11_set_token_function.3.gz
+man/man3/gnutls_pkcs11_token_check_mechanism.3.gz
 man/man3/gnutls_pkcs11_token_get_flags.3.gz
 man/man3/gnutls_pkcs11_token_get_info.3.gz
 man/man3/gnutls_pkcs11_token_get_mechanism.3.gz
+man/man3/gnutls_pkcs11_token_get_ptr.3.gz
 man/man3/gnutls_pkcs11_token_get_random.3.gz
 man/man3/gnutls_pkcs11_token_get_url.3.gz
 man/man3/gnutls_pkcs11_token_init.3.gz
@@ -494,12 +522,15 @@ man/man3/gnutls_prf.3.gz
 man/man3/gnutls_prf_raw.3.gz
 man/man3/gnutls_prf_rfc5705.3.gz
 man/man3/gnutls_priority_certificate_type_list.3.gz
+man/man3/gnutls_priority_certificate_type_list2.3.gz
 man/man3/gnutls_priority_cipher_list.3.gz
 man/man3/gnutls_priority_compression_list.3.gz
 man/man3/gnutls_priority_deinit.3.gz
 man/man3/gnutls_priority_ecc_curve_list.3.gz
 man/man3/gnutls_priority_get_cipher_suite_index.3.gz
+man/man3/gnutls_priority_group_list.3.gz
 man/man3/gnutls_priority_init.3.gz
+man/man3/gnutls_priority_init2.3.gz
 man/man3/gnutls_priority_kx_list.3.gz
 man/man3/gnutls_priority_mac_list.3.gz
 man/man3/gnutls_priority_protocol_list.3.gz
@@ -508,23 +539,31 @@ man/man3/gnutls_priority_set_direct.3.gz
 man/man3/gnutls_priority_sign_list.3.gz
 man/man3/gnutls_priority_string_list.3.gz
 man/man3/gnutls_privkey_decrypt_data.3.gz
+man/man3/gnutls_privkey_decrypt_data2.3.gz
 man/man3/gnutls_privkey_deinit.3.gz
 man/man3/gnutls_privkey_export_dsa_raw.3.gz
+man/man3/gnutls_privkey_export_dsa_raw2.3.gz
 man/man3/gnutls_privkey_export_ecc_raw.3.gz
+man/man3/gnutls_privkey_export_ecc_raw2.3.gz
+man/man3/gnutls_privkey_export_gost_raw2.3.gz
 man/man3/gnutls_privkey_export_openpgp.3.gz
 man/man3/gnutls_privkey_export_pkcs11.3.gz
 man/man3/gnutls_privkey_export_rsa_raw.3.gz
+man/man3/gnutls_privkey_export_rsa_raw2.3.gz
 man/man3/gnutls_privkey_export_x509.3.gz
 man/man3/gnutls_privkey_generate.3.gz
 man/man3/gnutls_privkey_generate2.3.gz
 man/man3/gnutls_privkey_get_pk_algorithm.3.gz
 man/man3/gnutls_privkey_get_seed.3.gz
+man/man3/gnutls_privkey_get_spki.3.gz
 man/man3/gnutls_privkey_get_type.3.gz
 man/man3/gnutls_privkey_import_dsa_raw.3.gz
 man/man3/gnutls_privkey_import_ecc_raw.3.gz
 man/man3/gnutls_privkey_import_ext.3.gz
 man/man3/gnutls_privkey_import_ext2.3.gz
 man/man3/gnutls_privkey_import_ext3.3.gz
+man/man3/gnutls_privkey_import_ext4.3.gz
+man/man3/gnutls_privkey_import_gost_raw.3.gz
 man/man3/gnutls_privkey_import_openpgp.3.gz
 man/man3/gnutls_privkey_import_openpgp_raw.3.gz
 man/man3/gnutls_privkey_import_pkcs11.3.gz
@@ -538,8 +577,11 @@ man/man3/gnutls_privkey_import_x509_raw.3.gz
 man/man3/gnutls_privkey_init.3.gz
 man/man3/gnutls_privkey_set_flags.3.gz
 man/man3/gnutls_privkey_set_pin_function.3.gz
+man/man3/gnutls_privkey_set_spki.3.gz
 man/man3/gnutls_privkey_sign_data.3.gz
+man/man3/gnutls_privkey_sign_data2.3.gz
 man/man3/gnutls_privkey_sign_hash.3.gz
+man/man3/gnutls_privkey_sign_hash2.3.gz
 man/man3/gnutls_privkey_status.3.gz
 man/man3/gnutls_privkey_verify_params.3.gz
 man/man3/gnutls_privkey_verify_seed.3.gz
@@ -567,18 +609,24 @@ man/man3/gnutls_pubkey_encrypt_data.3.gz
 man/man3/gnutls_pubkey_export.3.gz
 man/man3/gnutls_pubkey_export2.3.gz
 man/man3/gnutls_pubkey_export_dsa_raw.3.gz
+man/man3/gnutls_pubkey_export_dsa_raw2.3.gz
 man/man3/gnutls_pubkey_export_ecc_raw.3.gz
+man/man3/gnutls_pubkey_export_ecc_raw2.3.gz
 man/man3/gnutls_pubkey_export_ecc_x962.3.gz
+man/man3/gnutls_pubkey_export_gost_raw2.3.gz
 man/man3/gnutls_pubkey_export_rsa_raw.3.gz
+man/man3/gnutls_pubkey_export_rsa_raw2.3.gz
 man/man3/gnutls_pubkey_get_key_id.3.gz
 man/man3/gnutls_pubkey_get_key_usage.3.gz
 man/man3/gnutls_pubkey_get_openpgp_key_id.3.gz
 man/man3/gnutls_pubkey_get_pk_algorithm.3.gz
 man/man3/gnutls_pubkey_get_preferred_hash_algorithm.3.gz
+man/man3/gnutls_pubkey_get_spki.3.gz
 man/man3/gnutls_pubkey_import.3.gz
 man/man3/gnutls_pubkey_import_dsa_raw.3.gz
 man/man3/gnutls_pubkey_import_ecc_raw.3.gz
 man/man3/gnutls_pubkey_import_ecc_x962.3.gz
+man/man3/gnutls_pubkey_import_gost_raw.3.gz
 man/man3/gnutls_pubkey_import_openpgp.3.gz
 man/man3/gnutls_pubkey_import_openpgp_raw.3.gz
 man/man3/gnutls_pubkey_import_pkcs11.3.gz
@@ -594,11 +642,13 @@ man/man3/gnutls_pubkey_init.3.gz
 man/man3/gnutls_pubkey_print.3.gz
 man/man3/gnutls_pubkey_set_key_usage.3.gz
 man/man3/gnutls_pubkey_set_pin_function.3.gz
+man/man3/gnutls_pubkey_set_spki.3.gz
 man/man3/gnutls_pubkey_verify_data2.3.gz
 man/man3/gnutls_pubkey_verify_hash2.3.gz
 man/man3/gnutls_pubkey_verify_params.3.gz
 man/man3/gnutls_random_art.3.gz
 man/man3/gnutls_range_split.3.gz
+man/man3/gnutls_reauth.3.gz
 man/man3/gnutls_record_can_use_length_hiding.3.gz
 man/man3/gnutls_record_check_corked.3.gz
 man/man3/gnutls_record_check_pending.3.gz
@@ -607,14 +657,19 @@ man/man3/gnutls_record_disable_padding.3.gz
 man/man3/gnutls_record_discard_queued.3.gz
 man/man3/gnutls_record_get_direction.3.gz
 man/man3/gnutls_record_get_discarded.3.gz
+man/man3/gnutls_record_get_max_early_data_size.3.gz
 man/man3/gnutls_record_get_max_size.3.gz
 man/man3/gnutls_record_get_state.3.gz
 man/man3/gnutls_record_overhead_size.3.gz
 man/man3/gnutls_record_recv.3.gz
+man/man3/gnutls_record_recv_early_data.3.gz
 man/man3/gnutls_record_recv_packet.3.gz
 man/man3/gnutls_record_recv_seq.3.gz
 man/man3/gnutls_record_send.3.gz
+man/man3/gnutls_record_send2.3.gz
+man/man3/gnutls_record_send_early_data.3.gz
 man/man3/gnutls_record_send_range.3.gz
+man/man3/gnutls_record_set_max_early_data_size.3.gz
 man/man3/gnutls_record_set_max_size.3.gz
 man/man3/gnutls_record_set_state.3.gz
 man/man3/gnutls_record_set_timeout.3.gz
@@ -646,6 +701,7 @@ man/man3/gnutls_session_get_ptr.3.gz
 man/man3/gnutls_session_get_random.3.gz
 man/man3/gnutls_session_get_verify_cert_status.3.gz
 man/man3/gnutls_session_is_resumed.3.gz
+man/man3/gnutls_session_key_update.3.gz
 man/man3/gnutls_session_resumption_requested.3.gz
 man/man3/gnutls_session_set_data.3.gz
 man/man3/gnutls_session_set_id.3.gz
@@ -658,7 +714,9 @@ man/man3/gnutls_session_supplemental_register.3.gz
 man/man3/gnutls_session_ticket_enable_client.3.gz
 man/man3/gnutls_session_ticket_enable_server.3.gz
 man/man3/gnutls_session_ticket_key_generate.3.gz
+man/man3/gnutls_session_ticket_send.3.gz
 man/man3/gnutls_set_default_priority.3.gz
+man/man3/gnutls_set_default_priority_append.3.gz
 man/man3/gnutls_sign_algorithm_get.3.gz
 man/man3/gnutls_sign_algorithm_get_client.3.gz
 man/man3/gnutls_sign_algorithm_get_requested.3.gz
@@ -668,7 +726,9 @@ man/man3/gnutls_sign_get_name.3.gz
 man/man3/gnutls_sign_get_oid.3.gz
 man/man3/gnutls_sign_get_pk_algorithm.3.gz
 man/man3/gnutls_sign_is_secure.3.gz
+man/man3/gnutls_sign_is_secure2.3.gz
 man/man3/gnutls_sign_list.3.gz
+man/man3/gnutls_sign_supports_pk_algorithm.3.gz
 man/man3/gnutls_srp_allocate_client_credentials.3.gz
 man/man3/gnutls_srp_allocate_server_credentials.3.gz
 man/man3/gnutls_srp_base64_decode.3.gz
@@ -823,6 +883,7 @@ man/man3/gnutls_x509_crq_get_pk_oid.3.gz
 man/man3/gnutls_x509_crq_get_private_key_usage_period.3.gz
 man/man3/gnutls_x509_crq_get_signature_algorithm.3.gz
 man/man3/gnutls_x509_crq_get_signature_oid.3.gz
+man/man3/gnutls_x509_crq_get_spki.3.gz
 man/man3/gnutls_x509_crq_get_subject_alt_name.3.gz
 man/man3/gnutls_x509_crq_get_subject_alt_othername_oid.3.gz
 man/man3/gnutls_x509_crq_get_tlsfeatures.3.gz
@@ -843,6 +904,7 @@ man/man3/gnutls_x509_crq_set_key_rsa_raw.3.gz
 man/man3/gnutls_x509_crq_set_key_usage.3.gz
 man/man3/gnutls_x509_crq_set_private_key_usage_period.3.gz
 man/man3/gnutls_x509_crq_set_pubkey.3.gz
+man/man3/gnutls_x509_crq_set_spki.3.gz
 man/man3/gnutls_x509_crq_set_subject_alt_name.3.gz
 man/man3/gnutls_x509_crq_set_subject_alt_othername.3.gz
 man/man3/gnutls_x509_crq_set_tlsfeatures.3.gz
@@ -853,6 +915,7 @@ man/man3/gnutls_x509_crq_verify.3.gz
 man/man3/gnutls_x509_crt_check_email.3.gz
 man/man3/gnutls_x509_crt_check_hostname.3.gz
 man/man3/gnutls_x509_crt_check_hostname2.3.gz
+man/man3/gnutls_x509_crt_check_ip.3.gz
 man/man3/gnutls_x509_crt_check_issuer.3.gz
 man/man3/gnutls_x509_crt_check_key_purpose.3.gz
 man/man3/gnutls_x509_crt_check_revocation.3.gz
@@ -882,6 +945,7 @@ man/man3/gnutls_x509_crt_get_extension_data2.3.gz
 man/man3/gnutls_x509_crt_get_extension_info.3.gz
 man/man3/gnutls_x509_crt_get_extension_oid.3.gz
 man/man3/gnutls_x509_crt_get_fingerprint.3.gz
+man/man3/gnutls_x509_crt_get_inhibit_anypolicy.3.gz
 man/man3/gnutls_x509_crt_get_issuer.3.gz
 man/man3/gnutls_x509_crt_get_issuer_alt_name.3.gz
 man/man3/gnutls_x509_crt_get_issuer_alt_name2.3.gz
@@ -899,6 +963,7 @@ man/man3/gnutls_x509_crt_get_name_constraints.3.gz
 man/man3/gnutls_x509_crt_get_pk_algorithm.3.gz
 man/man3/gnutls_x509_crt_get_pk_dsa_raw.3.gz
 man/man3/gnutls_x509_crt_get_pk_ecc_raw.3.gz
+man/man3/gnutls_x509_crt_get_pk_gost_raw.3.gz
 man/man3/gnutls_x509_crt_get_pk_oid.3.gz
 man/man3/gnutls_x509_crt_get_pk_rsa_raw.3.gz
 man/man3/gnutls_x509_crt_get_policy.3.gz
@@ -911,6 +976,7 @@ man/man3/gnutls_x509_crt_get_serial.3.gz
 man/man3/gnutls_x509_crt_get_signature.3.gz
 man/man3/gnutls_x509_crt_get_signature_algorithm.3.gz
 man/man3/gnutls_x509_crt_get_signature_oid.3.gz
+man/man3/gnutls_x509_crt_get_spki.3.gz
 man/man3/gnutls_x509_crt_get_subject.3.gz
 man/man3/gnutls_x509_crt_get_subject_alt_name.3.gz
 man/man3/gnutls_x509_crt_get_subject_alt_name2.3.gz
@@ -926,6 +992,7 @@ man/man3/gnutls_x509_crt_init.3.gz
 man/man3/gnutls_x509_crt_list_import.3.gz
 man/man3/gnutls_x509_crt_list_import2.3.gz
 man/man3/gnutls_x509_crt_list_import_pkcs11.3.gz
+man/man3/gnutls_x509_crt_list_import_url.3.gz
 man/man3/gnutls_x509_crt_list_verify.3.gz
 man/man3/gnutls_x509_crt_print.3.gz
 man/man3/gnutls_x509_crt_privkey_sign.3.gz
@@ -943,6 +1010,8 @@ man/man3/gnutls_x509_crt_set_dn.3.gz
 man/man3/gnutls_x509_crt_set_dn_by_oid.3.gz
 man/man3/gnutls_x509_crt_set_expiration_time.3.gz
 man/man3/gnutls_x509_crt_set_extension_by_oid.3.gz
+man/man3/gnutls_x509_crt_set_flags.3.gz
+man/man3/gnutls_x509_crt_set_inhibit_anypolicy.3.gz
 man/man3/gnutls_x509_crt_set_issuer_alt_name.3.gz
 man/man3/gnutls_x509_crt_set_issuer_alt_othername.3.gz
 man/man3/gnutls_x509_crt_set_issuer_dn.3.gz
@@ -959,6 +1028,7 @@ man/man3/gnutls_x509_crt_set_proxy.3.gz
 man/man3/gnutls_x509_crt_set_proxy_dn.3.gz
 man/man3/gnutls_x509_crt_set_pubkey.3.gz
 man/man3/gnutls_x509_crt_set_serial.3.gz
+man/man3/gnutls_x509_crt_set_spki.3.gz
 man/man3/gnutls_x509_crt_set_subject_alt_name.3.gz
 man/man3/gnutls_x509_crt_set_subject_alt_othername.3.gz
 man/man3/gnutls_x509_crt_set_subject_alternative_name.3.gz
@@ -986,6 +1056,7 @@ man/man3/gnutls_x509_ext_export_aia.3.gz
 man/man3/gnutls_x509_ext_export_authority_key_id.3.gz
 man/man3/gnutls_x509_ext_export_basic_constraints.3.gz
 man/man3/gnutls_x509_ext_export_crl_dist_points.3.gz
+man/man3/gnutls_x509_ext_export_inhibit_anypolicy.3.gz
 man/man3/gnutls_x509_ext_export_key_purposes.3.gz
 man/man3/gnutls_x509_ext_export_key_usage.3.gz
 man/man3/gnutls_x509_ext_export_name_constraints.3.gz
@@ -999,6 +1070,7 @@ man/man3/gnutls_x509_ext_import_aia.3.gz
 man/man3/gnutls_x509_ext_import_authority_key_id.3.gz
 man/man3/gnutls_x509_ext_import_basic_constraints.3.gz
 man/man3/gnutls_x509_ext_import_crl_dist_points.3.gz
+man/man3/gnutls_x509_ext_import_inhibit_anypolicy.3.gz
 man/man3/gnutls_x509_ext_import_key_purposes.3.gz
 man/man3/gnutls_x509_ext_import_key_usage.3.gz
 man/man3/gnutls_x509_ext_import_name_constraints.3.gz
@@ -1034,6 +1106,7 @@ man/man3/gnutls_x509_privkey_export2.3.gz
 man/man3/gnutls_x509_privkey_export2_pkcs8.3.gz
 man/man3/gnutls_x509_privkey_export_dsa_raw.3.gz
 man/man3/gnutls_x509_privkey_export_ecc_raw.3.gz
+man/man3/gnutls_x509_privkey_export_gost_raw.3.gz
 man/man3/gnutls_x509_privkey_export_pkcs8.3.gz
 man/man3/gnutls_x509_privkey_export_rsa_raw.3.gz
 man/man3/gnutls_x509_privkey_export_rsa_raw2.3.gz
@@ -1044,10 +1117,12 @@ man/man3/gnutls_x509_privkey_get_key_id.3.gz
 man/man3/gnutls_x509_privkey_get_pk_algorithm.3.gz
 man/man3/gnutls_x509_privkey_get_pk_algorithm2.3.gz
 man/man3/gnutls_x509_privkey_get_seed.3.gz
+man/man3/gnutls_x509_privkey_get_spki.3.gz
 man/man3/gnutls_x509_privkey_import.3.gz
 man/man3/gnutls_x509_privkey_import2.3.gz
 man/man3/gnutls_x509_privkey_import_dsa_raw.3.gz
 man/man3/gnutls_x509_privkey_import_ecc_raw.3.gz
+man/man3/gnutls_x509_privkey_import_gost_raw.3.gz
 man/man3/gnutls_x509_privkey_import_openssl.3.gz
 man/man3/gnutls_x509_privkey_import_pkcs8.3.gz
 man/man3/gnutls_x509_privkey_import_rsa_raw.3.gz
@@ -1056,6 +1131,7 @@ man/man3/gnutls_x509_privkey_init.3.gz
 man/man3/gnutls_x509_privkey_sec_param.3.gz
 man/man3/gnutls_x509_privkey_set_flags.3.gz
 man/man3/gnutls_x509_privkey_set_pin_function.3.gz
+man/man3/gnutls_x509_privkey_set_spki.3.gz
 man/man3/gnutls_x509_privkey_sign_data.3.gz
 man/man3/gnutls_x509_privkey_sign_hash.3.gz
 man/man3/gnutls_x509_privkey_verify_params.3.gz
@@ -1064,6 +1140,10 @@ man/man3/gnutls_x509_rdn_get.3.gz
 man/man3/gnutls_x509_rdn_get2.3.gz
 man/man3/gnutls_x509_rdn_get_by_oid.3.gz
 man/man3/gnutls_x509_rdn_get_oid.3.gz
+man/man3/gnutls_x509_spki_deinit.3.gz
+man/man3/gnutls_x509_spki_get_rsa_pss_params.3.gz
+man/man3/gnutls_x509_spki_init.3.gz
+man/man3/gnutls_x509_spki_set_rsa_pss_params.3.gz
 man/man3/gnutls_x509_tlsfeatures_add.3.gz
 man/man3/gnutls_x509_tlsfeatures_check_crt.3.gz
 man/man3/gnutls_x509_tlsfeatures_deinit.3.gz
@@ -1106,8 +1186,8 @@ man/man3/gnutls_x509_trust_list_verify_named_crt.3.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-psk.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-resume.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-srp.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-x509.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-x509-3.1.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-x509.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-crq.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-ocsp-client.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-pkcs11-list.c
@@ -1126,17 +1206,27 @@ man/man3/gnutls_x509_trust_list_verify_named_crt.3.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcp.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/udp.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/verify.c
+share/info/gnutls-client-server-use-case.png
+share/info/gnutls-handshake-sequence.png
+share/info/gnutls-handshake-state.png
+share/info/gnutls-internals.png
+share/info/gnutls-layers.png
+share/info/gnutls-logo.png
+share/info/gnutls-modauth.png
+share/info/gnutls-x509.png
+share/info/pkcs11-vision.png
 %%NLS%%share/locale/cs/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/de/LC_MESSAGES/gnutls.mo
-%%NLS%%share/locale/en@boldquot/LC_MESSAGES/gnutls.mo
-%%NLS%%share/locale/en@quot/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/it/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/gnutls.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/gnutls.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/gnutls.mo