Changes 2.6.0:

* libgnutls: Correct printing and parsing of IPv6 addresses.
* libgnutls-openssl: fix out of bounds access.
* certtool: Use inet_pton for parsing IPv6 addresses.
* Added API to replace and update the crypto backend.
* certtool: can add several subject alternative names via template file.
* opencdk: Parse (but not decrypt) encrypted secret keys.
* more...

7 files changed, 39 insertions, 56 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 826655832d6..8407d8e6c96 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.72 2008/09/27 23:11:36 tonnerre Exp $
+# $NetBSD: Makefile,v 1.73 2008/10/18 11:55:11 adam Exp $
 
-DISTNAME=	gnutls-2.4.1
-PKGREVISION=	1
+DISTNAME=	gnutls-2.6.0
 CATEGORIES=	security devel
 MASTER_SITES=	http://josefsson.org/gnutls/releases/ \
 		ftp://ftp.gnutls.org/pub/gnutls/ \
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index 03af878c121..a073aa56004 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2008/07/30 17:17:21 kefren Exp $
+@comment $NetBSD: PLIST,v 1.33 2008/10/18 11:55:11 adam Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
@@ -119,10 +119,15 @@ 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_cipher_register.3
-man/man3/gnutls_crypto_digest_register.3
-man/man3/gnutls_crypto_mac_register.3
-man/man3/gnutls_crypto_rnd_register.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
@@ -148,6 +153,7 @@ man/man3/gnutls_dh_params_init.3
 man/man3/gnutls_dh_set_prime_bits.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
@@ -271,6 +277,9 @@ 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_get_id.3
+man/man3/gnutls_pk_get_name.3
+man/man3/gnutls_pk_list.3
 man/man3/gnutls_pkcs12_bag_decrypt.3
 man/man3/gnutls_pkcs12_bag_deinit.3
 man/man3/gnutls_pkcs12_bag_encrypt.3
@@ -340,6 +349,7 @@ man/man3/gnutls_record_get_max_size.3
 man/man3/gnutls_record_recv.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_rsa_export_get_modulus_bits.3
 man/man3/gnutls_rsa_export_get_pubkey.3
@@ -363,12 +373,16 @@ 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_set_default_export_priority.3
 man/man3/gnutls_set_default_priority.3
 man/man3/gnutls_sign_algorithm_get_name.3
 man/man3/gnutls_sign_callback_get.3
 man/man3/gnutls_sign_callback_set.3
+man/man3/gnutls_sign_get_id.3
+man/man3/gnutls_sign_get_name.3
+man/man3/gnutls_sign_list.3
 man/man3/gnutls_srp_allocate_client_credentials.3
 man/man3/gnutls_srp_allocate_server_credentials.3
 man/man3/gnutls_srp_base64_decode.3
@@ -380,10 +394,12 @@ man/man3/gnutls_srp_free_server_credentials.3
 man/man3/gnutls_srp_server_get_username.3
 man/man3/gnutls_srp_set_client_credentials.3
 man/man3/gnutls_srp_set_client_credentials_function.3
+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_strerror.3
+man/man3/gnutls_strerror_name.3
 man/man3/gnutls_transport_get_ptr.3
 man/man3/gnutls_transport_get_ptr2.3
 man/man3/gnutls_transport_set_errno.3
@@ -432,6 +448,7 @@ man/man3/gnutls_x509_crq_set_attribute_by_oid.3
 man/man3/gnutls_x509_crq_set_challenge_password.3
 man/man3/gnutls_x509_crq_set_dn_by_oid.3
 man/man3/gnutls_x509_crq_set_key.3
+man/man3/gnutls_x509_crq_set_key_rsa_raw.3
 man/man3/gnutls_x509_crq_set_version.3
 man/man3/gnutls_x509_crq_sign.3
 man/man3/gnutls_x509_crq_sign2.3
@@ -487,6 +504,7 @@ 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
 man/man3/gnutls_x509_crt_set_crl_dist_points.3
+man/man3/gnutls_x509_crt_set_crl_dist_points2.3
 man/man3/gnutls_x509_crt_set_crq.3
 man/man3/gnutls_x509_crt_set_dn_by_oid.3
 man/man3/gnutls_x509_crt_set_expiration_time.3
@@ -498,6 +516,7 @@ 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_serial.3
+man/man3/gnutls_x509_crt_set_subject_alt_name.3
 man/man3/gnutls_x509_crt_set_subject_alternative_name.3
 man/man3/gnutls_x509_crt_set_subject_key_id.3
 man/man3/gnutls_x509_crt_set_version.3
@@ -560,6 +579,7 @@ share/examples/gnutls/tcp.c
 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/fr/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
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 3d3a28f078d..91c6e239470 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.46 2008/09/27 23:11:37 tonnerre Exp $
+$NetBSD: distinfo,v 1.47 2008/10/18 11:55:11 adam Exp $
 
-SHA1 (gnutls-2.4.1.tar.bz2) = 7a439542e6344d5ccf11a29431a0600e7fe1c735
-RMD160 (gnutls-2.4.1.tar.bz2) = 4e21a82047add916b8ccce8aa82c36b2c9bcff90
-Size (gnutls-2.4.1.tar.bz2) = 4940118 bytes
-SHA1 (patch-aa) = b2024cb515196e64efcdbba227f05db9eb07c236
-SHA1 (patch-ab) = d30748128877d2ec5942d2b852f23a05d36102d0
-SHA1 (patch-ac) = 21f2ab373a888aadeb66d58b70e54bab4c3be7eb
-SHA1 (patch-ad) = 720d096d95a4d76aedaa13606ad4bee7872da5b0
+SHA1 (gnutls-2.6.0.tar.bz2) = bbd9e5f3a77bfcbef5a769c67d1576e7a6e4bda5
+RMD160 (gnutls-2.6.0.tar.bz2) = 1d92662edd64e93e658fc527f1dfbfc99ab3a1da
+Size (gnutls-2.6.0.tar.bz2) = 5112845 bytes
+SHA1 (patch-aa) = 8e9ea317342d584fb6f931f96458cc3d7d747ca0
+SHA1 (patch-ab) = 17605f0d3b1895c1c63c8dabc21bdebf95eb7785
 SHA1 (patch-ae) = f505476ce0477dc547e8698d205d6ba26fe85f48
 SHA1 (patch-af) = bd4701640dfef5bfdce87d620befd93098b0dff3
diff --git a/security/gnutls/patches/patch-aa b/security/gnutls/patches/patch-aa
index dfc12e1b816..c45e6832c80 100644
--- a/security/gnutls/patches/patch-aa
+++ b/security/gnutls/patches/patch-aa
@@ -1,12 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2008/03/06 14:52:13 wiz Exp $
+$NetBSD: patch-aa,v 1.13 2008/10/18 11:55:11 adam Exp $
 
-Hack around GNUlib idiosyncracy where the overwritten stdio.h includes
-sys/types.h which includes stdint.h (overwritten!) which includes wchar.h
-which includes stdio.h, BOOM.
-
---- lgl/stdio.in.h.orig	2007-09-14 11:29:05.000000000 +0000
+--- lgl/stdio.in.h.orig	2008-10-05 15:41:43.000000000 +0200
 +++ lgl/stdio.in.h
-@@ -35,6 +35,14 @@
+@@ -37,6 +37,14 @@
  #include <stdarg.h>
  #include <stddef.h>
  
diff --git a/security/gnutls/patches/patch-ab b/security/gnutls/patches/patch-ab
index 49cf32f8be5..3d00db3c7b9 100644
--- a/security/gnutls/patches/patch-ab
+++ b/security/gnutls/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2008/03/06 14:52:13 wiz Exp $
+$NetBSD: patch-ab,v 1.10 2008/10/18 11:55:11 adam Exp $
 
---- doc/Makefile.in.orig	2007-12-14 11:31:23.000000000 +0000
+--- doc/Makefile.in.orig	2008-10-06 09:14:35.000000000 +0200
 +++ doc/Makefile.in
-@@ -694,7 +694,7 @@ gnutls.dvi: gnutls.texi $(srcdir)/versio
+@@ -746,7 +746,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-ac b/security/gnutls/patches/patch-ac
deleted file mode 100644
index b72caebd8cd..00000000000
--- a/security/gnutls/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2008/09/27 23:11:37 tonnerre Exp $
-
---- lgl/strverscmp.c.orig	2008-06-19 12:00:10.000000000 +0200
-+++ lgl/strverscmp.c
-@@ -58,7 +58,7 @@
- */
- 
- int
--__strverscmp (const char *s1, const char *s2)
-+gnutls_strverscmp (const char *s1, const char *s2)
- {
-   const unsigned char *p1 = (const unsigned char *) s1;
-   const unsigned char *p2 = (const unsigned char *) s2;
diff --git a/security/gnutls/patches/patch-ad b/security/gnutls/patches/patch-ad
deleted file mode 100644
index 69fc367090f..00000000000
--- a/security/gnutls/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2008/09/27 23:11:37 tonnerre Exp $
-
---- lgl/strverscmp.h.orig	2008-06-19 12:00:10.000000000 +0200
-+++ lgl/strverscmp.h
-@@ -19,6 +19,12 @@
- #ifndef STRVERSCMP_H_
- # define STRVERSCMP_H_
- 
-+#ifdef HAVE_STRVERSCMP
- int strverscmp (const char *, const char *);
-+#else
-+int gnutls_strverscmp (const char *, const char *);
-+#define __strverscmp gnutls_strverscmp
-+#define strverscmp gnutls_strverscmp
-+#endif
- 
- #endif /* not STRVERSCMP_H_ */