Changes 2.12.3:

* libgnutls: Several minor bugfixes.
* libgnutls: Restored HMAC-MD5 for compatibility. Although considered weak,
  several sites require it for connection. It is enabled for "NORMAL" and
  "PERFORMANCE" priority strings.
* libgnutls: depend on libdl.
* libgnutls: gnutls_transport_set_global_errno() was deprecated. Use your
  system's errno fascility or gnutls_transport_set_errno().
* gnutls-cli: Correction with usage of select to check for pending data in
  gnutls sessions. It now uses gnutls_record_check_pending().
* tests: More fixes and updates for win32. Patches by LRN.
* libgnutls: Several files unnecessarily included <gcrypt.h>; this has been
  fixed.
** API and ABI modifications: gnutls_transport_set_global_errno: DEPRECATED

Changes 2.12.2:
* libgnutls: Several updates and fixes for win32. Patches by LRN.
* libgnutls: Several bug and memory leak fixes.
* srptool: Accepts the -d option to enable debugging.
* libgnutls: Corrected bug in gnutls_srp_verifier() that prevented the
  allocation of a verifier. Reported by Andrew Wiseman.

Changes 2.12.1:
* certtool: Generated certificate request with stricter permissions.
* libgnutls: Bug fixes in opencdk code. Reported by Vitaly Kruglikov.
* libgnutls: Corrected windows system_errno() function prototype.
* libgnutls: C++ compatibility fix for compat.h. Reported by Mark Brand.
* libgnutls: Fix size of gnutls_openpgp_keyid_t by using the
  GNUTLS_OPENPGP_KEYID_SIZE definition. Reported by Andreas Metzler.

9 files changed, 118 insertions, 192 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 13d41aa362a..928a88435e3 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.98 2011/04/22 13:42:00 obache Exp $
+# $NetBSD: Makefile,v 1.99 2011/04/26 10:35:29 adam Exp $
 
-DISTNAME=	gnutls-2.10.5
-PKGREVISION=	2
+DISTNAME=	gnutls-2.12.3
 CATEGORIES=	security devel
 MASTER_SITES=	ftp://ftp.gnutls.org/pub/gnutls/ \
 		ftp://ftp.gnupg.org/gcrypt/gnutls/ \
@@ -54,6 +53,7 @@ BUILDLINK_API_DEPENDS.libgcrypt+=	libgcrypt>=1.4
 .include "../../security/libgcrypt/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libtasn1+=	libtasn1>=0.3.4
 .include "../../security/libtasn1/buildlink3.mk"
+.include "../../security/nettle/buildlink3.mk"
 # guile is useful for selftests, but bindings should be separate pkgs
 #.include "../../lang/guile/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index a29b73392c0..10e274367b8 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,16 +1,19 @@
-@comment $NetBSD: PLIST,v 1.38 2010/09/01 16:32:17 drochner Exp $
+@comment $NetBSD: PLIST,v 1.39 2011/04/26 10:35:29 adam Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
 bin/gnutls-serv
+bin/p11tool
 bin/psktool
 bin/srptool
+include/gnutls/abstract.h
 include/gnutls/compat.h
 include/gnutls/crypto.h
 include/gnutls/extra.h
 include/gnutls/gnutls.h
 include/gnutls/gnutlsxx.h
 include/gnutls/openpgp.h
+include/gnutls/pkcs11.h
 include/gnutls/pkcs12.h
 include/gnutls/x509.h
 info/gnutls-certificate-user-use-case.png
@@ -26,6 +29,7 @@ info/gnutls-objects.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
@@ -35,6 +39,7 @@ man/man1/certtool.1
 man/man1/gnutls-cli-debug.1
 man/man1/gnutls-cli.1
 man/man1/gnutls-serv.1
+man/man1/p11tool.1
 man/man1/psktool.1
 man/man1/srptool.1
 man/man3/gnutls_alert_get.3
@@ -79,6 +84,7 @@ man/man3/gnutls_certificate_set_openpgp_key_mem2.3
 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_rsa_export_params.3
 man/man3/gnutls_certificate_set_verify_flags.3
 man/man3/gnutls_certificate_set_verify_function.3
@@ -103,8 +109,10 @@ man/man3/gnutls_certificate_verify_peers.3
 man/man3/gnutls_certificate_verify_peers2.3
 man/man3/gnutls_check_version.3
 man/man3/gnutls_cipher_decrypt.3
+man/man3/gnutls_cipher_decrypt2.3
 man/man3/gnutls_cipher_deinit.3
 man/man3/gnutls_cipher_encrypt.3
+man/man3/gnutls_cipher_encrypt2.3
 man/man3/gnutls_cipher_get.3
 man/man3/gnutls_cipher_get_block_size.3
 man/man3/gnutls_cipher_get_id.3
@@ -166,6 +174,7 @@ man/man3/gnutls_global_init_extra.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
+man/man3/gnutls_global_set_mutex.3
 man/man3/gnutls_handshake.3
 man/man3/gnutls_handshake_get_last_in.3
 man/man3/gnutls_handshake_get_last_out.3
@@ -280,21 +289,50 @@ man/man3/gnutls_openpgp_privkey_get_subkey_pk_algorithm.3
 man/man3/gnutls_openpgp_privkey_get_subkey_revoked_status.3
 man/man3/gnutls_openpgp_privkey_import.3
 man/man3/gnutls_openpgp_privkey_init.3
+man/man3/gnutls_openpgp_privkey_sec_param.3
 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_oprfi_enable_client.3
-man/man3/gnutls_oprfi_enable_server.3
 man/man3/gnutls_pem_base64_decode.3
 man/man3/gnutls_pem_base64_decode_alloc.3
 man/man3/gnutls_pem_base64_encode.3
 man/man3/gnutls_pem_base64_encode_alloc.3
 man/man3/gnutls_perror.3
 man/man3/gnutls_pk_algorithm_get_name.3
+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_pkcs11_add_provider.3
+man/man3/gnutls_pkcs11_copy_secret_key.3
+man/man3/gnutls_pkcs11_copy_x509_crt.3
+man/man3/gnutls_pkcs11_copy_x509_privkey.3
+man/man3/gnutls_pkcs11_deinit.3
+man/man3/gnutls_pkcs11_delete_url.3
+man/man3/gnutls_pkcs11_init.3
+man/man3/gnutls_pkcs11_obj_deinit.3
+man/man3/gnutls_pkcs11_obj_export.3
+man/man3/gnutls_pkcs11_obj_export_url.3
+man/man3/gnutls_pkcs11_obj_get_info.3
+man/man3/gnutls_pkcs11_obj_get_type.3
+man/man3/gnutls_pkcs11_obj_import_url.3
+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_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_set_pin_function.3
+man/man3/gnutls_pkcs11_set_token_function.3
+man/man3/gnutls_pkcs11_token_get_flags.3
+man/man3/gnutls_pkcs11_token_get_info.3
+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_pkcs12_bag_decrypt.3
 man/man3/gnutls_pkcs12_bag_deinit.3
 man/man3/gnutls_pkcs12_bag_encrypt.3
@@ -337,6 +375,16 @@ man/man3/gnutls_priority_deinit.3
 man/man3/gnutls_priority_init.3
 man/man3/gnutls_priority_set.3
 man/man3/gnutls_priority_set_direct.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_openpgp.3
+man/man3/gnutls_privkey_import_pkcs11.3
+man/man3/gnutls_privkey_import_x509.3
+man/man3/gnutls_privkey_init.3
+man/man3/gnutls_privkey_sign_data.3
+man/man3/gnutls_privkey_sign_hash.3
 man/man3/gnutls_protocol_get_id.3
 man/man3/gnutls_protocol_get_name.3
 man/man3/gnutls_protocol_get_version.3
@@ -357,6 +405,27 @@ man/man3/gnutls_psk_set_server_credentials_function.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_params_function.3
+man/man3/gnutls_pubkey_deinit.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_pk_algorithm.3
+man/man3/gnutls_pubkey_get_pk_dsa_raw.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_openpgp.3
+man/man3/gnutls_pubkey_import_pkcs11.3
+man/man3/gnutls_pubkey_import_pkcs11_url.3
+man/man3/gnutls_pubkey_import_privkey.3
+man/man3/gnutls_pubkey_import_rsa_raw.3
+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_hash.3
 man/man3/gnutls_record_check_pending.3
 man/man3/gnutls_record_disable_padding.3
 man/man3/gnutls_record_get_direction.3
@@ -366,6 +435,7 @@ 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
 man/man3/gnutls_rsa_export_get_pubkey.3
 man/man3/gnutls_rsa_params_cpy.3
@@ -377,19 +447,18 @@ man/man3/gnutls_rsa_params_import_pkcs1.3
 man/man3/gnutls_rsa_params_import_raw.3
 man/man3/gnutls_rsa_params_init.3
 man/man3/gnutls_safe_renegotiation_status.3
+man/man3/gnutls_sec_param_get_name.3
+man/man3/gnutls_sec_param_to_pk_bits.3
 man/man3/gnutls_server_name_get.3
 man/man3/gnutls_server_name_set.3
+man/man3/gnutls_session_channel_binding.3
 man/man3/gnutls_session_enable_compatibility_mode.3
-man/man3/gnutls_session_get_client_random.3
 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_master_secret.3
 man/man3/gnutls_session_get_ptr.3
-man/man3/gnutls_session_get_server_random.3
 man/man3/gnutls_session_is_resumed.3
 man/man3/gnutls_session_set_data.3
-man/man3/gnutls_session_set_finished_function.3
 man/man3/gnutls_session_set_ptr.3
 man/man3/gnutls_session_ticket_enable_client.3
 man/man3/gnutls_session_ticket_enable_server.3
@@ -424,12 +493,14 @@ man/man3/gnutls_supplemental_get_name.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_push_function.3
+man/man3/gnutls_transport_set_vec_push_function.3
 man/man3/gnutls_x509_crl_check_issuer.3
 man/man3/gnutls_x509_crl_deinit.3
 man/man3/gnutls_x509_crl_export.3
@@ -444,6 +515,7 @@ man/man3/gnutls_x509_crl_get_issuer_dn.3
 man/man3/gnutls_x509_crl_get_issuer_dn_by_oid.3
 man/man3/gnutls_x509_crl_get_next_update.3
 man/man3/gnutls_x509_crl_get_number.3
+man/man3/gnutls_x509_crl_get_raw_issuer_dn.3
 man/man3/gnutls_x509_crl_get_signature.3
 man/man3/gnutls_x509_crl_get_signature_algorithm.3
 man/man3/gnutls_x509_crl_get_this_update.3
@@ -451,6 +523,7 @@ 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_print.3
+man/man3/gnutls_x509_crl_privkey_sign.3
 man/man3/gnutls_x509_crl_set_authority_key_id.3
 man/man3/gnutls_x509_crl_set_crt.3
 man/man3/gnutls_x509_crl_set_crt_serial.3
@@ -485,6 +558,7 @@ man/man3/gnutls_x509_crq_get_version.3
 man/man3/gnutls_x509_crq_import.3
 man/man3/gnutls_x509_crq_init.3
 man/man3/gnutls_x509_crq_print.3
+man/man3/gnutls_x509_crq_privkey_sign.3
 man/man3/gnutls_x509_crq_set_attribute_by_oid.3
 man/man3/gnutls_x509_crq_set_basic_constraints.3
 man/man3/gnutls_x509_crq_set_challenge_password.3
@@ -493,6 +567,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_pubkey.3
 man/man3/gnutls_x509_crq_set_subject_alt_name.3
 man/man3/gnutls_x509_crq_set_version.3
 man/man3/gnutls_x509_crq_sign.3
@@ -524,12 +599,14 @@ man/man3/gnutls_x509_crt_get_issuer_alt_othername_oid.3
 man/man3/gnutls_x509_crt_get_issuer_dn.3
 man/man3/gnutls_x509_crt_get_issuer_dn_by_oid.3
 man/man3/gnutls_x509_crt_get_issuer_dn_oid.3
+man/man3/gnutls_x509_crt_get_issuer_unique_id.3
 man/man3/gnutls_x509_crt_get_key_id.3
 man/man3/gnutls_x509_crt_get_key_purpose_oid.3
 man/man3/gnutls_x509_crt_get_key_usage.3
 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_proxy.3
 man/man3/gnutls_x509_crt_get_raw_dn.3
 man/man3/gnutls_x509_crt_get_raw_issuer_dn.3
@@ -541,13 +618,18 @@ man/man3/gnutls_x509_crt_get_subject_alt_name.3
 man/man3/gnutls_x509_crt_get_subject_alt_name2.3
 man/man3/gnutls_x509_crt_get_subject_alt_othername_oid.3
 man/man3/gnutls_x509_crt_get_subject_key_id.3
+man/man3/gnutls_x509_crt_get_subject_unique_id.3
 man/man3/gnutls_x509_crt_get_verify_algorithm.3
 man/man3/gnutls_x509_crt_get_version.3
 man/man3/gnutls_x509_crt_import.3
+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_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_key_id.3
 man/man3/gnutls_x509_crt_set_basic_constraints.3
@@ -565,6 +647,7 @@ 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_proxy.3
 man/man3/gnutls_x509_crt_set_proxy_dn.3
+man/man3/gnutls_x509_crt_set_pubkey.3
 man/man3/gnutls_x509_crt_set_serial.3
 man/man3/gnutls_x509_crt_set_subject_alt_name.3
 man/man3/gnutls_x509_crt_set_subject_alternative_name.3
@@ -587,6 +670,7 @@ man/man3/gnutls_x509_privkey_export.3
 man/man3/gnutls_x509_privkey_export_dsa_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
 man/man3/gnutls_x509_privkey_fix.3
 man/man3/gnutls_x509_privkey_generate.3
 man/man3/gnutls_x509_privkey_get_key_id.3
@@ -595,7 +679,9 @@ man/man3/gnutls_x509_privkey_import.3
 man/man3/gnutls_x509_privkey_import_dsa_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
 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
@@ -605,18 +691,17 @@ man/man3/gnutls_x509_rdn_get_oid.3
 share/doc/gnutls/TODO
 share/doc/gnutls/gnutls.ps
 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-psk.c
 share/examples/gnutls/ex-client-resume.c
 share/examples/gnutls/ex-client-srp.c
-share/examples/gnutls/ex-client-tlsia.c
 share/examples/gnutls/ex-client1.c
 share/examples/gnutls/ex-client2.c
 share/examples/gnutls/ex-crq.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-export.c
 share/examples/gnutls/ex-serv-pgp.c
 share/examples/gnutls/ex-serv-psk.c
 share/examples/gnutls/ex-serv-srp.c
diff --git a/security/gnutls/buildlink3.mk b/security/gnutls/buildlink3.mk
index f03361434f1..b49748d0ecc 100644
--- a/security/gnutls/buildlink3.mk
+++ b/security/gnutls/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.24 2011/04/22 13:42:00 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2011/04/26 10:35:29 adam Exp $
 
 BUILDLINK_TREE+=	gnutls
 
 .if !defined(GNUTLS_BUILDLINK3_MK)
 GNUTLS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnutls+=	gnutls>=1.2.6
-BUILDLINK_ABI_DEPENDS.gnutls+=	gnutls>=2.10.5nb2
+BUILDLINK_API_DEPENDS.gnutls+=	gnutls>=2.12.3
+BUILDLINK_ABI_DEPENDS.gnutls+=	gnutls>=2.12.3
 BUILDLINK_PKGSRCDIR.gnutls?=	../../security/gnutls
 
 .include "../../archivers/lzo/buildlink3.mk"
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index d83833c27a1..b1b98c1458d 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.70 2011/03/09 10:52:25 drochner Exp $
+$NetBSD: distinfo,v 1.71 2011/04/26 10:35:29 adam Exp $
 
-SHA1 (gnutls-2.10.5.tar.bz2) = 4530657082a0e754356de89a5529d1ad7a18e777
-RMD160 (gnutls-2.10.5.tar.bz2) = 4bc886ced90742a488e00c1884e6124b37047382
-Size (gnutls-2.10.5.tar.bz2) = 7287913 bytes
-SHA1 (patch-aa) = 45052cfc70becf7ab1e4aa880bea4fb904ddf16f
-SHA1 (patch-ab) = 43d53ae8f51491a0d300463df1ccd3445581e8b5
-SHA1 (patch-ae) = f505476ce0477dc547e8698d205d6ba26fe85f48
-SHA1 (patch-af) = bd4701640dfef5bfdce87d620befd93098b0dff3
+SHA1 (gnutls-2.12.3.tar.bz2) = 1799bdea6b373e312b055fa7caf06effecb9c033
+RMD160 (gnutls-2.12.3.tar.bz2) = f405a971df1e3773f26b854028b11727b28162b6
+Size (gnutls-2.12.3.tar.bz2) = 7021290 bytes
+SHA1 (patch-ab) = 49de2419935972f958acacdffec32388986f1ea0
+SHA1 (patch-ae) = cadc476a6a120390c3c2792b52dd02d27a3884e6
+SHA1 (patch-af) = 321c3488dd383a09dd95f6a15f50b9f54f6aa5fc
 SHA1 (patch-ai) = 2c5c181ec6de9622cac66c2d5fe2cc8f3f89fbe8
-SHA1 (patch-aj) = 46fc301de8fec82b5296f0c708bd7cf734b69e72
diff --git a/security/gnutls/patches/patch-aa b/security/gnutls/patches/patch-aa
deleted file mode 100644
index 30a1f651e4b..00000000000
--- a/security/gnutls/patches/patch-aa
+++ /dev/null
@@ -1,137 +0,0 @@
-$NetBSD: patch-aa,v 1.15 2010/12/13 16:03:21 tron Exp $
-
-Fix build problem under Mac OS X where snprintf() is a macro.
-
---- src/serv.c.orig	2010-12-06 13:04:44.000000000 +0000
-+++ src/serv.c	2010-12-13 15:32:42.000000000 +0000
-@@ -438,7 +438,6 @@
- 
- /* Creates html with the current session information.
-  */
--#define tmp2 &http_buffer[strlen(http_buffer)], len-strlen(http_buffer)
- static char *
- peer_print_info (gnutls_session_t session, int *ret_length,
- 		 const char *header)
-@@ -512,11 +511,11 @@
- 
-   /* print session_id */
-   gnutls_session_get_id (session, sesid, &sesid_size);
--  snprintf (tmp2, "\n<p>Session ID: <i>");
-+  snprintf (&http_buffer[strlen(http_buffer)], len-strlen(http_buffer), "\n<p>Session ID: <i>");
-   for (i = 0; i < sesid_size; i++)
--    snprintf (tmp2, "%.2X", sesid[i]);
--  snprintf (tmp2, "</i></p>\n");
--  snprintf (tmp2,
-+    snprintf (&http_buffer[strlen(http_buffer)], len-strlen(http_buffer), "%.2X", sesid[i]);
-+  snprintf (&http_buffer[strlen(http_buffer)], len-strlen(http_buffer), "</i></p>\n");
-+  snprintf (&http_buffer[strlen(http_buffer)], len-strlen(http_buffer),
- 	   "<h5>If your browser supports session resuming, then you should see the "
- 	   "same session ID, when you press the <b>reload</b> button.</h5>\n");
- 
-@@ -530,7 +529,7 @@
- 
-     if (gnutls_server_name_get (session, dns, &dns_size, &type, 0) == 0)
-       {
--	snprintf (tmp2, "\n<p>Server Name: %s</p>\n", dns);
-+	snprintf (&http_buffer[strlen(http_buffer)], len-strlen(http_buffer), "\n<p>Server Name: %s</p>\n", dns);
-       }
- 
-   }
-@@ -541,7 +540,7 @@
- #ifdef ENABLE_SRP
-   if (kx_alg == GNUTLS_KX_SRP)
-     {
--      snprintf (tmp2, "<p>Connected as user '%s'.</p>\n",
-+      snprintf (&http_buffer[strlen(http_buffer)], len-strlen(http_buffer), "<p>Connected as user '%s'.</p>\n",
- 	       gnutls_srp_server_get_username (session));
-     }
- #endif
-@@ -549,7 +548,7 @@
- #ifdef ENABLE_PSK
-   if (kx_alg == GNUTLS_KX_PSK)
-     {
--      snprintf (tmp2, "<p>Connected as user '%s'.</p>\n",
-+      snprintf (&http_buffer[strlen(http_buffer)], len-strlen(http_buffer), "<p>Connected as user '%s'.</p>\n",
- 	       gnutls_psk_server_get_username (session));
-     }
- #endif
-@@ -557,7 +556,7 @@
- #ifdef ENABLE_ANON
-   if (kx_alg == GNUTLS_KX_ANON_DH)
-     {
--      snprintf (tmp2,
-+      snprintf (&http_buffer[strlen(http_buffer)], len-strlen(http_buffer),
- 	       "<p> Connect using anonymous DH (prime of %d bits)</p>\n",
- 	       gnutls_dh_get_prime_bits (session));
-     }
-@@ -565,7 +564,7 @@
- 
-   if (kx_alg == GNUTLS_KX_DHE_RSA || kx_alg == GNUTLS_KX_DHE_DSS)
-     {
--      snprintf (tmp2,
-+      snprintf (&http_buffer[strlen(http_buffer)], len-strlen(http_buffer),
- 	       "Ephemeral DH using prime of <b>%d</b> bits.<br>\n",
- 	       gnutls_dh_get_prime_bits (session));
-     }
-@@ -576,7 +575,7 @@
-   tmp = gnutls_protocol_get_name (gnutls_protocol_get_version (session));
-   if (tmp == NULL)
-     tmp = str_unknown;
--  snprintf (tmp2,
-+  snprintf (&http_buffer[strlen(http_buffer)], len-strlen(http_buffer),
- 	   "<TABLE border=1><TR><TD>Protocol version:</TD><TD>%s</TD></TR>\n",
- 	   tmp);
- 
-@@ -587,44 +586,44 @@
- 					  (session));
-       if (tmp == NULL)
- 	tmp = str_unknown;
--      snprintf (tmp2, "<TR><TD>Certificate Type:</TD><TD>%s</TD></TR>\n", tmp);
-+      snprintf (&http_buffer[strlen(http_buffer)], len-strlen(http_buffer), "<TR><TD>Certificate Type:</TD><TD>%s</TD></TR>\n", tmp);
-     }
- 
-   tmp = gnutls_kx_get_name (kx_alg);
-   if (tmp == NULL)
-     tmp = str_unknown;
--  snprintf (tmp2, "<TR><TD>Key Exchange:</TD><TD>%s</TD></TR>\n", tmp);
-+  snprintf (&http_buffer[strlen(http_buffer)], len-strlen(http_buffer), "<TR><TD>Key Exchange:</TD><TD>%s</TD></TR>\n", tmp);
- 
-   tmp = gnutls_compression_get_name (gnutls_compression_get (session));
-   if (tmp == NULL)
-     tmp = str_unknown;
--  snprintf (tmp2, "<TR><TD>Compression</TD><TD>%s</TD></TR>\n", tmp);
-+  snprintf (&http_buffer[strlen(http_buffer)], len-strlen(http_buffer), "<TR><TD>Compression</TD><TD>%s</TD></TR>\n", tmp);
- 
-   tmp = gnutls_cipher_get_name (gnutls_cipher_get (session));
-   if (tmp == NULL)
-     tmp = str_unknown;
--  snprintf (tmp2, "<TR><TD>Cipher</TD><TD>%s</TD></TR>\n", tmp);
-+  snprintf (&http_buffer[strlen(http_buffer)], len-strlen(http_buffer), "<TR><TD>Cipher</TD><TD>%s</TD></TR>\n", tmp);
- 
-   tmp = gnutls_mac_get_name (gnutls_mac_get (session));
-   if (tmp == NULL)
-     tmp = str_unknown;
--  snprintf (tmp2, "<TR><TD>MAC</TD><TD>%s</TD></TR>\n", tmp);
-+  snprintf (&http_buffer[strlen(http_buffer)], len-strlen(http_buffer), "<TR><TD>MAC</TD><TD>%s</TD></TR>\n", tmp);
- 
-   tmp = gnutls_cipher_suite_get_name (kx_alg,
- 				      gnutls_cipher_get (session),
- 				      gnutls_mac_get (session));
-   if (tmp == NULL)
-     tmp = str_unknown;
--  snprintf (tmp2, "<TR><TD>Ciphersuite</TD><TD>%s</TD></TR></p></TABLE>\n",
-+  snprintf (&http_buffer[strlen(http_buffer)], len-strlen(http_buffer), "<TR><TD>Ciphersuite</TD><TD>%s</TD></TR></p></TABLE>\n",
- 	   tmp);
- 
-   if (crtinfo)
-     {
--      snprintf(tmp2, "<hr><PRE>%s\n</PRE>\n", crtinfo);
-+      snprintf(&http_buffer[strlen(http_buffer)], len-strlen(http_buffer), "<hr><PRE>%s\n</PRE>\n", crtinfo);
-       free (crtinfo);
-     }
- 
--  snprintf(tmp2, "<hr><P>Your HTTP header was:<PRE>%s</PRE></P>\n" HTTP_END, header);
-+  snprintf(&http_buffer[strlen(http_buffer)], len-strlen(http_buffer), "<hr><P>Your HTTP header was:<PRE>%s</PRE></P>\n" HTTP_END, header);
- 
-   *ret_length = strlen (http_buffer);
- 
diff --git a/security/gnutls/patches/patch-ab b/security/gnutls/patches/patch-ab
index cfc6eed6cdc..4dfacdd7034 100644
--- a/security/gnutls/patches/patch-ab
+++ b/security/gnutls/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.12 2010/09/01 16:32:17 drochner Exp $
+$NetBSD: patch-ab,v 1.13 2011/04/26 10:35:30 adam Exp $
 
---- doc/Makefile.in.orig	2010-07-25 09:34:19.000000000 +0000
+--- doc/Makefile.in.orig	2011-04-22 11:41:08.000000000 +0000
 +++ doc/Makefile.in
-@@ -922,7 +922,7 @@ top_srcdir = @top_srcdir@
- EXTRA_DIST = TODO README.gaa certtool.cfg gnutls.ps gnutls.pdf \
- 	gnutls.html doxygen/Doxyfile.in doxygen/Doxyfile.orig \
- 	texinfo.css $(guile_texi) extract-guile-c-doc.scm
+@@ -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.
-@@ -1139,7 +1139,7 @@ gnutls.dvi: gnutls.texi $(srcdir)/versio
+@@ -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
diff --git a/security/gnutls/patches/patch-ae b/security/gnutls/patches/patch-ae
index ea24ce1b041..381dcda027d 100644
--- a/security/gnutls/patches/patch-ae
+++ b/security/gnutls/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2007/10/23 11:43:57 wiz Exp $
+$NetBSD: patch-ae,v 1.3 2011/04/26 10:35:30 adam Exp $
 
 --- guile/src/core.c.orig	2007-09-27 11:17:17.000000000 +0000
 +++ guile/src/core.c
-@@ -22,7 +22,7 @@
+@@ -27,7 +27,7 @@
  #include <gnutls/gnutls.h>
  #include <libguile.h>
  
diff --git a/security/gnutls/patches/patch-af b/security/gnutls/patches/patch-af
index f66750f5d1b..3e90eceb60d 100644
--- a/security/gnutls/patches/patch-af
+++ b/security/gnutls/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2007/09/05 21:51:22 drochner Exp $
+$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
-@@ -27,7 +27,7 @@
+@@ -30,7 +30,7 @@
  #include <gnutls/openpgp.h>
  #include <libguile.h>
  
diff --git a/security/gnutls/patches/patch-aj b/security/gnutls/patches/patch-aj
deleted file mode 100644
index cc8d6bb959f..00000000000
--- a/security/gnutls/patches/patch-aj
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2011/03/09 10:52:26 drochner Exp $
-
-don't refer to zlib in installed pkgconfig files - fails with system libz
-
---- lib/configure.orig	2011-02-28 08:38:47.000000000 +0000
-+++ lib/configure
-@@ -16642,13 +16642,6 @@ else
- $as_echo "no" >&6; }
- fi
- 
--if test x$ac_zlib != xno; then
--  if test "$GNUTLS_REQUIRES_PRIVATE" = ""; then
--    GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
--  else
--    GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE , zlib"
--  fi
--fi
- 
- 
-