update to 3.0,20

This switches to the new stable release branch.

10 files changed, 161 insertions, 182 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index fb170a3ff32..054d70bd1bd 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.113 2012/07/02 16:30:01 drochner Exp $
+# $NetBSD: Makefile,v 1.114 2012/07/02 18:53:02 drochner Exp $
 
-DISTNAME=	gnutls-2.12.20
+DISTNAME=	gnutls-3.0.20
 CATEGORIES=	security devel
 MASTER_SITES=	ftp://ftp.gnutls.org/pub/gnutls/ \
 		ftp://ftp.gnupg.org/gcrypt/gnutls/ \
 		${MASTER_SITE_GNU:=gnutls/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnutls.org/
@@ -43,8 +43,6 @@ EGDIR=		${PREFIX}/share/examples/gnutls
 INSTALLATION_DIRS=	${DOCDIR} ${EGDIR} include/gnutls
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/TODO ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/gnutls.ps ${DESTDIR}${DOCDIR}
 	cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} *.c ${DESTDIR}${EGDIR}
 
 .include "../../archivers/lzo/buildlink3.mk"
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index 0d732829858..0822cad037e 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,48 +1,48 @@
-@comment $NetBSD: PLIST,v 1.41 2011/08/11 11:03:35 adam Exp $
+@comment $NetBSD: PLIST,v 1.42 2012/07/02 18:53:02 drochner Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
 bin/gnutls-serv
+bin/ocsptool
 bin/psktool
 bin/srptool
 include/gnutls/abstract.h
 include/gnutls/compat.h
 include/gnutls/crypto.h
-include/gnutls/extra.h
+include/gnutls/dtls.h
 include/gnutls/gnutls.h
 include/gnutls/gnutlsxx.h
+include/gnutls/ocsp.h
 include/gnutls/openpgp.h
 include/gnutls/pkcs11.h
 include/gnutls/pkcs12.h
 include/gnutls/x509.h
-info/gnutls-certificate-user-use-case.png
 info/gnutls-client-server-use-case.png
-info/gnutls-extensions_st.png
+info/gnutls-guile.info
 info/gnutls-handshake-sequence.png
 info/gnutls-handshake-state.png
 info/gnutls-internals.png
 info/gnutls-layers.png
 info/gnutls-logo.png
-info/gnutls-mod_auth_st.png
-info/gnutls-objects.png
+info/gnutls-modauth.png
 info/gnutls-pgp.png
 info/gnutls-x509.png
 info/gnutls.info
 info/pkcs11-vision.png
-lib/libgnutls-extra.la
 lib/libgnutls.la
 lib/libgnutlsxx.la
-lib/pkgconfig/gnutls-extra.pc
 lib/pkgconfig/gnutls.pc
 man/man1/certtool.1
 man/man1/gnutls-cli-debug.1
 man/man1/gnutls-cli.1
 man/man1/gnutls-serv.1
+man/man1/ocsptool.1
 man/man1/p11tool.1
 man/man1/psktool.1
 man/man1/srptool.1
 man/man3/gnutls_alert_get.3
 man/man3/gnutls_alert_get_name.3
+man/man3/gnutls_alert_get_strname.3
 man/man3/gnutls_alert_send.3
 man/man3/gnutls_alert_send_appropriate.3
 man/man3/gnutls_anon_allocate_client_credentials.3
@@ -59,7 +59,6 @@ man/man3/gnutls_bye.3
 man/man3/gnutls_certificate_activation_time_peers.3
 man/man3/gnutls_certificate_allocate_credentials.3
 man/man3/gnutls_certificate_client_get_request_status.3
-man/man3/gnutls_certificate_client_set_retrieve_function.3
 man/man3/gnutls_certificate_expiration_time_peers.3
 man/man3/gnutls_certificate_free_ca_names.3
 man/man3/gnutls_certificate_free_cas.3
@@ -67,15 +66,12 @@ man/man3/gnutls_certificate_free_credentials.3
 man/man3/gnutls_certificate_free_crls.3
 man/man3/gnutls_certificate_free_keys.3
 man/man3/gnutls_certificate_get_issuer.3
-man/man3/gnutls_certificate_get_openpgp_keyring.3
 man/man3/gnutls_certificate_get_ours.3
 man/man3/gnutls_certificate_get_peers.3
-man/man3/gnutls_certificate_get_x509_cas.3
-man/man3/gnutls_certificate_get_x509_crls.3
 man/man3/gnutls_certificate_send_x509_rdn_sequence.3
 man/man3/gnutls_certificate_server_set_request.3
-man/man3/gnutls_certificate_server_set_retrieve_function.3
 man/man3/gnutls_certificate_set_dh_params.3
+man/man3/gnutls_certificate_set_key.3
 man/man3/gnutls_certificate_set_openpgp_key.3
 man/man3/gnutls_certificate_set_openpgp_key_file.3
 man/man3/gnutls_certificate_set_openpgp_key_file2.3
@@ -85,6 +81,7 @@ man/man3/gnutls_certificate_set_openpgp_keyring_file.3
 man/man3/gnutls_certificate_set_openpgp_keyring_mem.3
 man/man3/gnutls_certificate_set_params_function.3
 man/man3/gnutls_certificate_set_retrieve_function.3
+man/man3/gnutls_certificate_set_retrieve_function2.3
 man/man3/gnutls_certificate_set_rsa_export_params.3
 man/man3/gnutls_certificate_set_verify_flags.3
 man/man3/gnutls_certificate_set_verify_function.3
@@ -97,6 +94,7 @@ man/man3/gnutls_certificate_set_x509_key_file.3
 man/man3/gnutls_certificate_set_x509_key_mem.3
 man/man3/gnutls_certificate_set_x509_simple_pkcs12_file.3
 man/man3/gnutls_certificate_set_x509_simple_pkcs12_mem.3
+man/man3/gnutls_certificate_set_x509_system_trust.3
 man/man3/gnutls_certificate_set_x509_trust.3
 man/man3/gnutls_certificate_set_x509_trust_file.3
 man/man3/gnutls_certificate_set_x509_trust_mem.3
@@ -105,9 +103,9 @@ man/man3/gnutls_certificate_type_get_id.3
 man/man3/gnutls_certificate_type_get_name.3
 man/man3/gnutls_certificate_type_list.3
 man/man3/gnutls_certificate_type_set_priority.3
-man/man3/gnutls_certificate_verify_peers.3
 man/man3/gnutls_certificate_verify_peers2.3
 man/man3/gnutls_check_version.3
+man/man3/gnutls_cipher_add_auth.3
 man/man3/gnutls_cipher_decrypt.3
 man/man3/gnutls_cipher_decrypt2.3
 man/man3/gnutls_cipher_deinit.3
@@ -120,9 +118,11 @@ man/man3/gnutls_cipher_get_key_size.3
 man/man3/gnutls_cipher_get_name.3
 man/man3/gnutls_cipher_init.3
 man/man3/gnutls_cipher_list.3
+man/man3/gnutls_cipher_set_iv.3
 man/man3/gnutls_cipher_set_priority.3
 man/man3/gnutls_cipher_suite_get_name.3
 man/man3/gnutls_cipher_suite_info.3
+man/man3/gnutls_cipher_tag.3
 man/man3/gnutls_compression_get.3
 man/man3/gnutls_compression_get_id.3
 man/man3/gnutls_compression_get_name.3
@@ -130,15 +130,6 @@ man/man3/gnutls_compression_list.3
 man/man3/gnutls_compression_set_priority.3
 man/man3/gnutls_credentials_clear.3
 man/man3/gnutls_credentials_set.3
-man/man3/gnutls_crypto_bigint_register2.3
-man/man3/gnutls_crypto_cipher_register2.3
-man/man3/gnutls_crypto_digest_register2.3
-man/man3/gnutls_crypto_mac_register2.3
-man/man3/gnutls_crypto_pk_register2.3
-man/man3/gnutls_crypto_rnd_register2.3
-man/man3/gnutls_crypto_single_cipher_register2.3
-man/man3/gnutls_crypto_single_digest_register2.3
-man/man3/gnutls_crypto_single_mac_register2.3
 man/man3/gnutls_db_check_entry.3
 man/man3/gnutls_db_get_ptr.3
 man/man3/gnutls_db_remove_session.3
@@ -162,15 +153,24 @@ man/man3/gnutls_dh_params_import_pkcs3.3
 man/man3/gnutls_dh_params_import_raw.3
 man/man3/gnutls_dh_params_init.3
 man/man3/gnutls_dh_set_prime_bits.3
+man/man3/gnutls_dtls_cookie_send.3
+man/man3/gnutls_dtls_cookie_verify.3
+man/man3/gnutls_dtls_get_data_mtu.3
+man/man3/gnutls_dtls_get_mtu.3
+man/man3/gnutls_dtls_get_timeout.3
+man/man3/gnutls_dtls_prestate_set.3
+man/man3/gnutls_dtls_set_mtu.3
+man/man3/gnutls_dtls_set_timeouts.3
+man/man3/gnutls_ecc_curve_get.3
+man/man3/gnutls_ecc_curve_get_name.3
+man/man3/gnutls_ecc_curve_get_size.3
+man/man3/gnutls_ecc_curve_list.3
 man/man3/gnutls_error_is_fatal.3
 man/man3/gnutls_error_to_alert.3
-man/man3/gnutls_ext_register.3
-man/man3/gnutls_extra_check_version.3
 man/man3/gnutls_fingerprint.3
-man/man3/gnutls_free.3
 man/man3/gnutls_global_deinit.3
 man/man3/gnutls_global_init.3
-man/man3/gnutls_global_init_extra.3
+man/man3/gnutls_global_set_audit_log_function.3
 man/man3/gnutls_global_set_log_function.3
 man/man3/gnutls_global_set_log_level.3
 man/man3/gnutls_global_set_mem_functions.3
@@ -197,27 +197,8 @@ man/man3/gnutls_hmac_fast.3
 man/man3/gnutls_hmac_get_len.3
 man/man3/gnutls_hmac_init.3
 man/man3/gnutls_hmac_output.3
-man/man3/gnutls_ia_allocate_client_credentials.3
-man/man3/gnutls_ia_allocate_server_credentials.3
-man/man3/gnutls_ia_enable.3
-man/man3/gnutls_ia_endphase_send.3
-man/man3/gnutls_ia_extract_inner_secret.3
-man/man3/gnutls_ia_free_client_credentials.3
-man/man3/gnutls_ia_free_server_credentials.3
-man/man3/gnutls_ia_generate_challenge.3
-man/man3/gnutls_ia_get_client_avp_ptr.3
-man/man3/gnutls_ia_get_server_avp_ptr.3
-man/man3/gnutls_ia_handshake.3
-man/man3/gnutls_ia_handshake_p.3
-man/man3/gnutls_ia_permute_inner_secret.3
-man/man3/gnutls_ia_recv.3
-man/man3/gnutls_ia_send.3
-man/man3/gnutls_ia_set_client_avp_function.3
-man/man3/gnutls_ia_set_client_avp_ptr.3
-man/man3/gnutls_ia_set_server_avp_function.3
-man/man3/gnutls_ia_set_server_avp_ptr.3
-man/man3/gnutls_ia_verify_endphase.3
 man/man3/gnutls_init.3
+man/man3/gnutls_key_generate.3
 man/man3/gnutls_kx_get.3
 man/man3/gnutls_kx_get_id.3
 man/man3/gnutls_kx_get_name.3
@@ -229,7 +210,38 @@ man/man3/gnutls_mac_get_key_size.3
 man/man3/gnutls_mac_get_name.3
 man/man3/gnutls_mac_list.3
 man/man3/gnutls_mac_set_priority.3
-man/man3/gnutls_malloc.3
+man/man3/gnutls_ocsp_req_add_cert.3
+man/man3/gnutls_ocsp_req_add_cert_id.3
+man/man3/gnutls_ocsp_req_deinit.3
+man/man3/gnutls_ocsp_req_export.3
+man/man3/gnutls_ocsp_req_get_cert_id.3
+man/man3/gnutls_ocsp_req_get_extension.3
+man/man3/gnutls_ocsp_req_get_nonce.3
+man/man3/gnutls_ocsp_req_get_version.3
+man/man3/gnutls_ocsp_req_import.3
+man/man3/gnutls_ocsp_req_init.3
+man/man3/gnutls_ocsp_req_print.3
+man/man3/gnutls_ocsp_req_randomize_nonce.3
+man/man3/gnutls_ocsp_req_set_extension.3
+man/man3/gnutls_ocsp_req_set_nonce.3
+man/man3/gnutls_ocsp_resp_deinit.3
+man/man3/gnutls_ocsp_resp_export.3
+man/man3/gnutls_ocsp_resp_get_certs.3
+man/man3/gnutls_ocsp_resp_get_extension.3
+man/man3/gnutls_ocsp_resp_get_nonce.3
+man/man3/gnutls_ocsp_resp_get_produced.3
+man/man3/gnutls_ocsp_resp_get_responder.3
+man/man3/gnutls_ocsp_resp_get_response.3
+man/man3/gnutls_ocsp_resp_get_signature.3
+man/man3/gnutls_ocsp_resp_get_signature_algorithm.3
+man/man3/gnutls_ocsp_resp_get_single.3
+man/man3/gnutls_ocsp_resp_get_status.3
+man/man3/gnutls_ocsp_resp_get_version.3
+man/man3/gnutls_ocsp_resp_import.3
+man/man3/gnutls_ocsp_resp_init.3
+man/man3/gnutls_ocsp_resp_print.3
+man/man3/gnutls_ocsp_resp_verify.3
+man/man3/gnutls_ocsp_resp_verify_direct.3
 man/man3/gnutls_openpgp_crt_check_hostname.3
 man/man3/gnutls_openpgp_crt_deinit.3
 man/man3/gnutls_openpgp_crt_export.3
@@ -282,7 +294,6 @@ man/man3/gnutls_openpgp_privkey_get_preferred_key_id.3
 man/man3/gnutls_openpgp_privkey_get_revoked_status.3
 man/man3/gnutls_openpgp_privkey_get_subkey_count.3
 man/man3/gnutls_openpgp_privkey_get_subkey_creation_time.3
-man/man3/gnutls_openpgp_privkey_get_subkey_expiration_time.3
 man/man3/gnutls_openpgp_privkey_get_subkey_fingerprint.3
 man/man3/gnutls_openpgp_privkey_get_subkey_id.3
 man/man3/gnutls_openpgp_privkey_get_subkey_idx.3
@@ -295,6 +306,12 @@ man/man3/gnutls_openpgp_privkey_set_preferred_key_id.3
 man/man3/gnutls_openpgp_privkey_sign_hash.3
 man/man3/gnutls_openpgp_send_cert.3
 man/man3/gnutls_openpgp_set_recv_key_function.3
+man/man3/gnutls_pcert_deinit.3
+man/man3/gnutls_pcert_import_openpgp.3
+man/man3/gnutls_pcert_import_openpgp_raw.3
+man/man3/gnutls_pcert_import_x509.3
+man/man3/gnutls_pcert_import_x509_raw.3
+man/man3/gnutls_pcert_list_import_x509_raw.3
 man/man3/gnutls_pem_base64_decode.3
 man/man3/gnutls_pem_base64_decode_alloc.3
 man/man3/gnutls_pem_base64_encode.3
@@ -305,6 +322,7 @@ man/man3/gnutls_pk_bits_to_sec_param.3
 man/man3/gnutls_pk_get_id.3
 man/man3/gnutls_pk_get_name.3
 man/man3/gnutls_pk_list.3
+man/man3/gnutls_pk_to_sign.3
 man/man3/gnutls_pkcs11_add_provider.3
 man/man3/gnutls_pkcs11_copy_secret_key.3
 man/man3/gnutls_pkcs11_copy_x509_crt.3
@@ -322,10 +340,12 @@ man/man3/gnutls_pkcs11_obj_init.3
 man/man3/gnutls_pkcs11_obj_list_import_url.3
 man/man3/gnutls_pkcs11_privkey_deinit.3
 man/man3/gnutls_pkcs11_privkey_export_url.3
+man/man3/gnutls_pkcs11_privkey_generate.3
 man/man3/gnutls_pkcs11_privkey_get_info.3
 man/man3/gnutls_pkcs11_privkey_get_pk_algorithm.3
 man/man3/gnutls_pkcs11_privkey_import_url.3
 man/man3/gnutls_pkcs11_privkey_init.3
+man/man3/gnutls_pkcs11_reinit.3
 man/man3/gnutls_pkcs11_set_pin_function.3
 man/man3/gnutls_pkcs11_set_token_function.3
 man/man3/gnutls_pkcs11_token_get_flags.3
@@ -334,6 +354,7 @@ man/man3/gnutls_pkcs11_token_get_mechanism.3
 man/man3/gnutls_pkcs11_token_get_url.3
 man/man3/gnutls_pkcs11_token_init.3
 man/man3/gnutls_pkcs11_token_set_pin.3
+man/man3/gnutls_pkcs11_type_get_name.3
 man/man3/gnutls_pkcs12_bag_decrypt.3
 man/man3/gnutls_pkcs12_bag_deinit.3
 man/man3/gnutls_pkcs12_bag_encrypt.3
@@ -372,14 +393,21 @@ man/man3/gnutls_pkcs7_set_crt.3
 man/man3/gnutls_pkcs7_set_crt_raw.3
 man/man3/gnutls_prf.3
 man/man3/gnutls_prf_raw.3
+man/man3/gnutls_priority_certificate_type_list.3
+man/man3/gnutls_priority_compression_list.3
 man/man3/gnutls_priority_deinit.3
+man/man3/gnutls_priority_ecc_curve_list.3
+man/man3/gnutls_priority_get_cipher_suite_index.3
 man/man3/gnutls_priority_init.3
+man/man3/gnutls_priority_protocol_list.3
 man/man3/gnutls_priority_set.3
 man/man3/gnutls_priority_set_direct.3
+man/man3/gnutls_priority_sign_list.3
 man/man3/gnutls_privkey_decrypt_data.3
 man/man3/gnutls_privkey_deinit.3
 man/man3/gnutls_privkey_get_pk_algorithm.3
 man/man3/gnutls_privkey_get_type.3
+man/man3/gnutls_privkey_import_ext.3
 man/man3/gnutls_privkey_import_openpgp.3
 man/man3/gnutls_privkey_import_pkcs11.3
 man/man3/gnutls_privkey_import_x509.3
@@ -396,7 +424,6 @@ man/man3/gnutls_psk_allocate_server_credentials.3
 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_netconf_derive_key.3
 man/man3/gnutls_psk_server_get_username.3
 man/man3/gnutls_psk_set_client_credentials.3
 man/man3/gnutls_psk_set_client_credentials_function.3
@@ -407,16 +434,22 @@ man/man3/gnutls_psk_set_server_credentials_hint.3
 man/man3/gnutls_psk_set_server_dh_params.3
 man/man3/gnutls_psk_set_server_params_function.3
 man/man3/gnutls_pubkey_deinit.3
+man/man3/gnutls_pubkey_encrypt_data.3
 man/man3/gnutls_pubkey_export.3
 man/man3/gnutls_pubkey_get_key_id.3
 man/man3/gnutls_pubkey_get_key_usage.3
+man/man3/gnutls_pubkey_get_openpgp_key_id.3
 man/man3/gnutls_pubkey_get_pk_algorithm.3
 man/man3/gnutls_pubkey_get_pk_dsa_raw.3
+man/man3/gnutls_pubkey_get_pk_ecc_raw.3
+man/man3/gnutls_pubkey_get_pk_ecc_x962.3
 man/man3/gnutls_pubkey_get_pk_rsa_raw.3
 man/man3/gnutls_pubkey_get_preferred_hash_algorithm.3
 man/man3/gnutls_pubkey_get_verify_algorithm.3
 man/man3/gnutls_pubkey_import.3
 man/man3/gnutls_pubkey_import_dsa_raw.3
+man/man3/gnutls_pubkey_import_ecc_raw.3
+man/man3/gnutls_pubkey_import_ecc_x962.3
 man/man3/gnutls_pubkey_import_openpgp.3
 man/man3/gnutls_pubkey_import_pkcs11.3
 man/man3/gnutls_pubkey_import_pkcs11_url.3
@@ -426,15 +459,19 @@ man/man3/gnutls_pubkey_import_x509.3
 man/man3/gnutls_pubkey_init.3
 man/man3/gnutls_pubkey_set_key_usage.3
 man/man3/gnutls_pubkey_verify_data.3
+man/man3/gnutls_pubkey_verify_data2.3
 man/man3/gnutls_pubkey_verify_hash.3
+man/man3/gnutls_pubkey_verify_hash2.3
+man/man3/gnutls_random_art.3
 man/man3/gnutls_record_check_pending.3
 man/man3/gnutls_record_disable_padding.3
 man/man3/gnutls_record_get_direction.3
+man/man3/gnutls_record_get_discarded.3
 man/man3/gnutls_record_get_max_size.3
 man/man3/gnutls_record_recv.3
+man/man3/gnutls_record_recv_seq.3
 man/man3/gnutls_record_send.3
 man/man3/gnutls_record_set_max_size.3
-man/man3/gnutls_register_md5_handler.3
 man/man3/gnutls_rehandshake.3
 man/man3/gnutls_rnd.3
 man/man3/gnutls_rsa_export_get_modulus_bits.3
@@ -458,7 +495,9 @@ man/man3/gnutls_session_get_data.3
 man/man3/gnutls_session_get_data2.3
 man/man3/gnutls_session_get_id.3
 man/man3/gnutls_session_get_ptr.3
+man/man3/gnutls_session_get_random.3
 man/man3/gnutls_session_is_resumed.3
+man/man3/gnutls_session_resumption_requested.3
 man/man3/gnutls_session_set_data.3
 man/man3/gnutls_session_set_ptr.3
 man/man3/gnutls_session_ticket_enable_client.3
@@ -466,7 +505,6 @@ man/man3/gnutls_session_ticket_enable_server.3
 man/man3/gnutls_session_ticket_key_generate.3
 man/man3/gnutls_set_default_export_priority.3
 man/man3/gnutls_set_default_priority.3
-man/man3/gnutls_sign_algorithm_get_name.3
 man/man3/gnutls_sign_algorithm_get_requested.3
 man/man3/gnutls_sign_callback_get.3
 man/man3/gnutls_sign_callback_set.3
@@ -488,23 +526,31 @@ man/man3/gnutls_srp_set_prime_bits.3
 man/man3/gnutls_srp_set_server_credentials_file.3
 man/man3/gnutls_srp_set_server_credentials_function.3
 man/man3/gnutls_srp_verifier.3
+man/man3/gnutls_store_commitment.3
+man/man3/gnutls_store_pubkey.3
 man/man3/gnutls_strerror.3
 man/man3/gnutls_strerror_name.3
 man/man3/gnutls_supplemental_get_name.3
+man/man3/gnutls_tdb_deinit.3
+man/man3/gnutls_tdb_init.3
+man/man3/gnutls_tdb_set_store_commitment_func.3
+man/man3/gnutls_tdb_set_store_func.3
+man/man3/gnutls_tdb_set_verify_func.3
 man/man3/gnutls_transport_get_ptr.3
 man/man3/gnutls_transport_get_ptr2.3
 man/man3/gnutls_transport_set_errno.3
 man/man3/gnutls_transport_set_errno_function.3
-man/man3/gnutls_transport_set_global_errno.3
-man/man3/gnutls_transport_set_lowat.3
 man/man3/gnutls_transport_set_ptr.3
 man/man3/gnutls_transport_set_ptr2.3
 man/man3/gnutls_transport_set_pull_function.3
+man/man3/gnutls_transport_set_pull_timeout_function.3
 man/man3/gnutls_transport_set_push_function.3
 man/man3/gnutls_transport_set_vec_push_function.3
+man/man3/gnutls_verify_stored_pubkey.3
 man/man3/gnutls_x509_crl_check_issuer.3
 man/man3/gnutls_x509_crl_deinit.3
 man/man3/gnutls_x509_crl_export.3
+man/man3/gnutls_x509_crl_get_authority_key_gn_serial.3
 man/man3/gnutls_x509_crl_get_authority_key_id.3
 man/man3/gnutls_x509_crl_get_crt_count.3
 man/man3/gnutls_x509_crl_get_crt_serial.3
@@ -523,6 +569,8 @@ man/man3/gnutls_x509_crl_get_this_update.3
 man/man3/gnutls_x509_crl_get_version.3
 man/man3/gnutls_x509_crl_import.3
 man/man3/gnutls_x509_crl_init.3
+man/man3/gnutls_x509_crl_list_import.3
+man/man3/gnutls_x509_crl_list_import2.3
 man/man3/gnutls_x509_crl_print.3
 man/man3/gnutls_x509_crl_privkey_sign.3
 man/man3/gnutls_x509_crl_set_authority_key_id.3
@@ -553,6 +601,7 @@ man/man3/gnutls_x509_crq_get_key_purpose_oid.3
 man/man3/gnutls_x509_crq_get_key_rsa_raw.3
 man/man3/gnutls_x509_crq_get_key_usage.3
 man/man3/gnutls_x509_crq_get_pk_algorithm.3
+man/man3/gnutls_x509_crq_get_private_key_usage_period.3
 man/man3/gnutls_x509_crq_get_subject_alt_name.3
 man/man3/gnutls_x509_crq_get_subject_alt_othername_oid.3
 man/man3/gnutls_x509_crq_get_version.3
@@ -568,6 +617,7 @@ man/man3/gnutls_x509_crq_set_key.3
 man/man3/gnutls_x509_crq_set_key_purpose_oid.3
 man/man3/gnutls_x509_crq_set_key_rsa_raw.3
 man/man3/gnutls_x509_crq_set_key_usage.3
+man/man3/gnutls_x509_crq_set_private_key_usage_period.3
 man/man3/gnutls_x509_crq_set_pubkey.3
 man/man3/gnutls_x509_crq_set_subject_alt_name.3
 man/man3/gnutls_x509_crq_set_version.3
@@ -581,6 +631,8 @@ man/man3/gnutls_x509_crt_cpy_crl_dist_points.3
 man/man3/gnutls_x509_crt_deinit.3
 man/man3/gnutls_x509_crt_export.3
 man/man3/gnutls_x509_crt_get_activation_time.3
+man/man3/gnutls_x509_crt_get_authority_info_access.3
+man/man3/gnutls_x509_crt_get_authority_key_gn_serial.3
 man/man3/gnutls_x509_crt_get_authority_key_id.3
 man/man3/gnutls_x509_crt_get_basic_constraints.3
 man/man3/gnutls_x509_crt_get_ca_status.3
@@ -609,6 +661,7 @@ man/man3/gnutls_x509_crt_get_pk_algorithm.3
 man/man3/gnutls_x509_crt_get_pk_dsa_raw.3
 man/man3/gnutls_x509_crt_get_pk_rsa_raw.3
 man/man3/gnutls_x509_crt_get_preferred_hash_algorithm.3
+man/man3/gnutls_x509_crt_get_private_key_usage_period.3
 man/man3/gnutls_x509_crt_get_proxy.3
 man/man3/gnutls_x509_crt_get_raw_dn.3
 man/man3/gnutls_x509_crt_get_raw_issuer_dn.3
@@ -628,11 +681,13 @@ man/man3/gnutls_x509_crt_import_pkcs11.3
 man/man3/gnutls_x509_crt_import_pkcs11_url.3
 man/man3/gnutls_x509_crt_init.3
 man/man3/gnutls_x509_crt_list_import.3
+man/man3/gnutls_x509_crt_list_import2.3
 man/man3/gnutls_x509_crt_list_import_pkcs11.3
 man/man3/gnutls_x509_crt_list_verify.3
 man/man3/gnutls_x509_crt_print.3
 man/man3/gnutls_x509_crt_privkey_sign.3
 man/man3/gnutls_x509_crt_set_activation_time.3
+man/man3/gnutls_x509_crt_set_authority_info_access.3
 man/man3/gnutls_x509_crt_set_authority_key_id.3
 man/man3/gnutls_x509_crt_set_basic_constraints.3
 man/man3/gnutls_x509_crt_set_ca_status.3
@@ -647,6 +702,7 @@ man/man3/gnutls_x509_crt_set_issuer_dn_by_oid.3
 man/man3/gnutls_x509_crt_set_key.3
 man/man3/gnutls_x509_crt_set_key_purpose_oid.3
 man/man3/gnutls_x509_crt_set_key_usage.3
+man/man3/gnutls_x509_crt_set_private_key_usage_period.3
 man/man3/gnutls_x509_crt_set_proxy.3
 man/man3/gnutls_x509_crt_set_proxy_dn.3
 man/man3/gnutls_x509_crt_set_pubkey.3
@@ -666,10 +722,12 @@ man/man3/gnutls_x509_dn_get_rdn_ava.3
 man/man3/gnutls_x509_dn_import.3
 man/man3/gnutls_x509_dn_init.3
 man/man3/gnutls_x509_dn_oid_known.3
+man/man3/gnutls_x509_dn_oid_name.3
 man/man3/gnutls_x509_privkey_cpy.3
 man/man3/gnutls_x509_privkey_deinit.3
 man/man3/gnutls_x509_privkey_export.3
 man/man3/gnutls_x509_privkey_export_dsa_raw.3
+man/man3/gnutls_x509_privkey_export_ecc_raw.3
 man/man3/gnutls_x509_privkey_export_pkcs8.3
 man/man3/gnutls_x509_privkey_export_rsa_raw.3
 man/man3/gnutls_x509_privkey_export_rsa_raw2.3
@@ -679,6 +737,7 @@ man/man3/gnutls_x509_privkey_get_key_id.3
 man/man3/gnutls_x509_privkey_get_pk_algorithm.3
 man/man3/gnutls_x509_privkey_import.3
 man/man3/gnutls_x509_privkey_import_dsa_raw.3
+man/man3/gnutls_x509_privkey_import_ecc_raw.3
 man/man3/gnutls_x509_privkey_import_pkcs8.3
 man/man3/gnutls_x509_privkey_import_rsa_raw.3
 man/man3/gnutls_x509_privkey_import_rsa_raw2.3
@@ -686,41 +745,56 @@ man/man3/gnutls_x509_privkey_init.3
 man/man3/gnutls_x509_privkey_sec_param.3
 man/man3/gnutls_x509_privkey_sign_data.3
 man/man3/gnutls_x509_privkey_sign_hash.3
-man/man3/gnutls_x509_privkey_verify_data.3
+man/man3/gnutls_x509_privkey_verify_params.3
 man/man3/gnutls_x509_rdn_get.3
 man/man3/gnutls_x509_rdn_get_by_oid.3
 man/man3/gnutls_x509_rdn_get_oid.3
-share/doc/gnutls/TODO
-share/doc/gnutls/gnutls.ps
+man/man3/gnutls_x509_trust_list_add_cas.3
+man/man3/gnutls_x509_trust_list_add_crls.3
+man/man3/gnutls_x509_trust_list_add_named_crt.3
+man/man3/gnutls_x509_trust_list_deinit.3
+man/man3/gnutls_x509_trust_list_get_issuer.3
+man/man3/gnutls_x509_trust_list_init.3
+man/man3/gnutls_x509_trust_list_verify_crt.3
+man/man3/gnutls_x509_trust_list_verify_named_crt.3
 share/examples/gnutls/ex-alert.c
 share/examples/gnutls/ex-cert-select-pkcs11.c
 share/examples/gnutls/ex-cert-select.c
+share/examples/gnutls/ex-client-anon.c
+share/examples/gnutls/ex-client-dtls.c
 share/examples/gnutls/ex-client-psk.c
 share/examples/gnutls/ex-client-resume.c
 share/examples/gnutls/ex-client-srp.c
-share/examples/gnutls/ex-client1.c
-share/examples/gnutls/ex-client2.c
+share/examples/gnutls/ex-client-x509.c
 share/examples/gnutls/ex-crq.c
+share/examples/gnutls/ex-ocsp-client.c
+share/examples/gnutls/ex-pkcs11-list.c
 share/examples/gnutls/ex-pkcs12.c
-share/examples/gnutls/ex-rfc2818.c
 share/examples/gnutls/ex-serv-anon.c
+share/examples/gnutls/ex-serv-dtls.c
 share/examples/gnutls/ex-serv-pgp.c
 share/examples/gnutls/ex-serv-psk.c
 share/examples/gnutls/ex-serv-srp.c
-share/examples/gnutls/ex-serv1.c
+share/examples/gnutls/ex-serv-x509.c
 share/examples/gnutls/ex-session-info.c
+share/examples/gnutls/ex-verify-ssh.c
 share/examples/gnutls/ex-verify.c
 share/examples/gnutls/ex-x509-info.c
+share/examples/gnutls/print-ciphersuites.c
 share/examples/gnutls/tcp.c
-share/locale/cs/LC_MESSAGES/libgnutls.mo
-share/locale/de/LC_MESSAGES/libgnutls.mo
-share/locale/en@boldquot/LC_MESSAGES/libgnutls.mo
-share/locale/en@quot/LC_MESSAGES/libgnutls.mo
-share/locale/fr/LC_MESSAGES/libgnutls.mo
-share/locale/it/LC_MESSAGES/libgnutls.mo
-share/locale/ms/LC_MESSAGES/libgnutls.mo
-share/locale/nl/LC_MESSAGES/libgnutls.mo
-share/locale/pl/LC_MESSAGES/libgnutls.mo
-share/locale/sv/LC_MESSAGES/libgnutls.mo
-share/locale/vi/LC_MESSAGES/libgnutls.mo
-share/locale/zh_CN/LC_MESSAGES/libgnutls.mo
+share/examples/gnutls/udp.c
+share/examples/gnutls/verify.c
+share/locale/cs/LC_MESSAGES/gnutls.mo
+share/locale/de/LC_MESSAGES/gnutls.mo
+share/locale/en@boldquot/LC_MESSAGES/gnutls.mo
+share/locale/en@quot/LC_MESSAGES/gnutls.mo
+share/locale/fi/LC_MESSAGES/gnutls.mo
+share/locale/fr/LC_MESSAGES/gnutls.mo
+share/locale/it/LC_MESSAGES/gnutls.mo
+share/locale/ms/LC_MESSAGES/gnutls.mo
+share/locale/nl/LC_MESSAGES/gnutls.mo
+share/locale/pl/LC_MESSAGES/gnutls.mo
+share/locale/sv/LC_MESSAGES/gnutls.mo
+share/locale/uk/LC_MESSAGES/gnutls.mo
+share/locale/vi/LC_MESSAGES/gnutls.mo
+share/locale/zh_CN/LC_MESSAGES/gnutls.mo
diff --git a/security/gnutls/buildlink3.mk b/security/gnutls/buildlink3.mk
index b37026439b5..f9aefce8180 100644
--- a/security/gnutls/buildlink3.mk
+++ b/security/gnutls/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2011/07/11 16:10:29 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2012/07/02 18:53:02 drochner Exp $
 
 BUILDLINK_TREE+=	gnutls
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gnutls
 GNUTLS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnutls+=	gnutls>=2.12.3
-BUILDLINK_ABI_DEPENDS.gnutls+=	gnutls>=2.12.3
+BUILDLINK_ABI_DEPENDS.gnutls+=	gnutls>=3.0.17
 BUILDLINK_PKGSRCDIR.gnutls?=	../../security/gnutls
 
 .include "../../archivers/lzo/buildlink3.mk"
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 57095bdc618..35b6ba43f09 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.85 2012/07/02 16:30:01 drochner Exp $
+$NetBSD: distinfo,v 1.86 2012/07/02 18:53:02 drochner Exp $
 
-SHA1 (gnutls-2.12.20.tar.bz2) = a8a7bb1f51b4da45d32242bd2e843ab3a66f63f6
-RMD160 (gnutls-2.12.20.tar.bz2) = 8b9fca72136113f250296e7399644b8aaa3503ed
-Size (gnutls-2.12.20.tar.bz2) = 7231438 bytes
-SHA1 (patch-ab) = 49de2419935972f958acacdffec32388986f1ea0
-SHA1 (patch-ae) = cadc476a6a120390c3c2792b52dd02d27a3884e6
-SHA1 (patch-af) = 321c3488dd383a09dd95f6a15f50b9f54f6aa5fc
-SHA1 (patch-ai) = 2c5c181ec6de9622cac66c2d5fe2cc8f3f89fbe8
-SHA1 (patch-lib_configure) = 7ae3ff8af52648fa132154ced88c31b7ecc1eb32
+SHA1 (gnutls-3.0.20.tar.xz) = 0c65f6a1e669c0fe85ddb2d645078b3bce9d1518
+RMD160 (gnutls-3.0.20.tar.xz) = a775877a7dec4e10a5612dc0ebb71d59f78ead39
+Size (gnutls-3.0.20.tar.xz) = 4426520 bytes
+SHA1 (patch-ae) = 71fbbeb43ac1689fca6fec7f8348d8534c1dc38a
 SHA1 (patch-lib_nettle_egd.c) = b7e9769e8c620519c43ca7b7481a558e9d389c68
diff --git a/security/gnutls/libgnutls-extra-config.mk b/security/gnutls/libgnutls-extra-config.mk
deleted file mode 100644
index 6b34e384a07..00000000000
--- a/security/gnutls/libgnutls-extra-config.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: libgnutls-extra-config.mk,v 1.2 2009/11/26 14:18:26 joerg Exp $
-
-# Makefile intended to be included by packages that need
-# "libgnutls-extra-config" during build time.
-
-USE_TOOLS+=	pkg-config
-
-pre-configure: hack-libgnutls-extra-config
-
-hack-libgnutls-extra-config:
-	${PRINTF} "#! ${SH}\\n\
-	  case \$$1 in\\n\
-	  --cflags|--libs) pkg-config \$$1 gnutls-extra;;\\n\
-	  --version) pkg-config --modversion gnutls-extra;;\\n\
-	  *) exit 1;;\\n\
-	  esac\\n\
-	" > ${BUILDLINK_DIR}/bin/libgnutls-extra-config
-	${CHMOD} +x ${BUILDLINK_DIR}/bin/libgnutls-extra-config
diff --git a/security/gnutls/patches/patch-ab b/security/gnutls/patches/patch-ab
deleted file mode 100644
index 4dfacdd7034..00000000000
--- a/security/gnutls/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.13 2011/04/26 10:35:30 adam Exp $
-
---- doc/Makefile.in.orig	2011-04-22 11:41:08.000000000 +0000
-+++ doc/Makefile.in
-@@ -942,7 +942,7 @@ top_srcdir = @top_srcdir@
- EXTRA_DIST = TODO certtool.cfg gnutls.ps gnutls.pdf gnutls.html \
- 	doxygen/Doxyfile.in doxygen/Doxyfile.orig texinfo.css \
- 	$(guile_texi) extract-guile-c-doc.scm
--SUBDIRS = examples cyclo scripts manpages credentials $(am__append_1)
-+SUBDIRS = cyclo scripts manpages credentials $(am__append_1)
- info_TEXINFOS = gnutls.texi
- 
- # Examples.
-@@ -1170,7 +1170,7 @@ gnutls.dvi: gnutls.texi $(srcdir)/versio
- gnutls.pdf: gnutls.texi $(srcdir)/version.texi $(gnutls_TEXINFOS)
- gnutls.html: gnutls.texi $(srcdir)/version.texi $(gnutls_TEXINFOS)
- $(srcdir)/version.texi:  $(srcdir)/stamp-vti
--$(srcdir)/stamp-vti: gnutls.texi $(top_srcdir)/configure
-+$(srcdir)/stamp-vti: gnutls.texi
- 	@(dir=.; test -f ./gnutls.texi || dir=$(srcdir); \
- 	set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/gnutls.texi`; \
- 	echo "@set UPDATED $$1 $$2 $$3"; \
diff --git a/security/gnutls/patches/patch-ae b/security/gnutls/patches/patch-ae
index 381dcda027d..00bc65d7f19 100644
--- a/security/gnutls/patches/patch-ae
+++ b/security/gnutls/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.3 2011/04/26 10:35:30 adam Exp $
+$NetBSD: patch-ae,v 1.4 2012/07/02 18:53:03 drochner Exp $
 
---- guile/src/core.c.orig	2007-09-27 11:17:17.000000000 +0000
+--- guile/src/core.c.orig	2012-04-12 20:05:11.000000000 +0000
 +++ guile/src/core.c
-@@ -27,7 +27,7 @@
- #include <gnutls/gnutls.h>
+@@ -28,7 +28,7 @@
+ #include <gnutls/openpgp.h>
  #include <libguile.h>
  
 -#include <alloca.h>
diff --git a/security/gnutls/patches/patch-af b/security/gnutls/patches/patch-af
deleted file mode 100644
index 3e90eceb60d..00000000000
--- a/security/gnutls/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2011/04/26 10:35:30 adam Exp $
-
---- guile/src/extra.c.orig	2007-09-04 18:12:51.000000000 +0200
-+++ guile/src/extra.c
-@@ -30,7 +30,7 @@
- #include <gnutls/openpgp.h>
- #include <libguile.h>
- 
--#include <alloca.h>
-+#include <stdlib.h>
- 
- #include "errors.h"
- #include "utils.h"
diff --git a/security/gnutls/patches/patch-ai b/security/gnutls/patches/patch-ai
deleted file mode 100644
index 3b79f80aca6..00000000000
--- a/security/gnutls/patches/patch-ai
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2008/10/29 11:38:09 shannonjr Exp $
-
---- libextra/gl/md5.h.orig	2008-10-05 07:41:43.000000000 -0600
-+++ libextra/gl/md5.h
-@@ -22,7 +22,11 @@
- #define _MD5_H 1
- 
- #include <stdio.h>
-+#if defined(__sun)
-+#include <sys/inttypes.h>
-+#else
- #include <stdint.h>
-+#endif
- 
- #define MD5_DIGEST_SIZE 16
- #define MD5_BLOCK_SIZE 64
diff --git a/security/gnutls/patches/patch-lib_configure b/security/gnutls/patches/patch-lib_configure
deleted file mode 100644
index 960663c5cca..00000000000
--- a/security/gnutls/patches/patch-lib_configure
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-lib_configure,v 1.3 2011/08/22 15:14:58 wiz Exp $
-
---- lib/configure.orig	2011-08-20 22:21:59.000000000 +0000
-+++ lib/configure
-@@ -17354,6 +17354,7 @@ else
-   ZLIB_HAS_PKGCONFIG=n
- fi
- 
-+if false; then # there is no zlib.pc in pkgsrc
- if test x$ac_zlib != xno; then
-   if test "$ZLIB_HAS_PKGCONFIG" = "y" ; then
-     if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
-@@ -17365,6 +17366,7 @@ if test x$ac_zlib != xno; then
-     GNUTLS_ZLIB_LIBS_PRIVATE="$LTLIBZ"
-   fi
- fi
-+fi
- 
- 
-