update to 2.10.1

many fixes and API extensions, but still binary compatible afaict

9 files changed, 58 insertions, 60 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index f0cfe014d58..776fb67e3ad 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.91 2010/04/13 16:31:27 drochner Exp $
+# $NetBSD: Makefile,v 1.92 2010/09/01 16:32:17 drochner Exp $
 
-DISTNAME=	gnutls-2.8.6
+DISTNAME=	gnutls-2.10.1
 CATEGORIES=	security devel
 MASTER_SITES=	ftp://ftp.gnutls.org/pub/gnutls/ \
 		ftp://ftp.gnupg.org/gcrypt/gnutls/ \
@@ -53,8 +53,6 @@ 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"
-BUILDLINK_API_DEPENDS.opencdk+=		opencdk>=0.6.5
-.include "../../security/opencdk/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 e0c9455b217..a29b73392c0 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2010/04/13 16:31:27 drochner Exp $
+@comment $NetBSD: PLIST,v 1.38 2010/09/01 16:32:17 drochner Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
@@ -81,6 +81,7 @@ man/man3/gnutls_certificate_set_openpgp_keyring_mem.3
 man/man3/gnutls_certificate_set_params_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
 man/man3/gnutls_certificate_set_verify_limits.3
 man/man3/gnutls_certificate_set_x509_crl.3
 man/man3/gnutls_certificate_set_x509_crl_file.3
@@ -101,10 +102,15 @@ 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_decrypt.3
+man/man3/gnutls_cipher_deinit.3
+man/man3/gnutls_cipher_encrypt.3
 man/man3/gnutls_cipher_get.3
+man/man3/gnutls_cipher_get_block_size.3
 man/man3/gnutls_cipher_get_id.3
 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_priority.3
 man/man3/gnutls_cipher_suite_get_name.3
@@ -166,9 +172,21 @@ man/man3/gnutls_handshake_get_last_out.3
 man/man3/gnutls_handshake_set_max_packet_length.3
 man/man3/gnutls_handshake_set_post_client_hello_function.3
 man/man3/gnutls_handshake_set_private_extensions.3
+man/man3/gnutls_hash.3
+man/man3/gnutls_hash_deinit.3
+man/man3/gnutls_hash_fast.3
+man/man3/gnutls_hash_get_len.3
+man/man3/gnutls_hash_init.3
+man/man3/gnutls_hash_output.3
 man/man3/gnutls_hex2bin.3
 man/man3/gnutls_hex_decode.3
 man/man3/gnutls_hex_encode.3
+man/man3/gnutls_hmac.3
+man/man3/gnutls_hmac_deinit.3
+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
@@ -358,6 +376,7 @@ man/man3/gnutls_rsa_params_generate2.3
 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_server_name_get.3
 man/man3/gnutls_server_name_set.3
 man/man3/gnutls_session_enable_compatibility_mode.3
@@ -372,9 +391,13 @@ 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
+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
 man/man3/gnutls_sign_get_id.3
@@ -397,6 +420,7 @@ 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_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
@@ -494,6 +518,9 @@ man/man3/gnutls_x509_crt_get_extension_info.3
 man/man3/gnutls_x509_crt_get_extension_oid.3
 man/man3/gnutls_x509_crt_get_fingerprint.3
 man/man3/gnutls_x509_crt_get_issuer.3
+man/man3/gnutls_x509_crt_get_issuer_alt_name.3
+man/man3/gnutls_x509_crt_get_issuer_alt_name2.3
+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
@@ -603,6 +630,7 @@ 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
diff --git a/security/gnutls/buildlink3.mk b/security/gnutls/buildlink3.mk
index c166c25043e..fc7900f8ffa 100644
--- a/security/gnutls/buildlink3.mk
+++ b/security/gnutls/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:17 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2010/09/01 16:32:17 drochner Exp $
 
 BUILDLINK_TREE+=	gnutls
 
@@ -15,7 +15,6 @@ BUILDLINK_PKGSRCDIR.gnutls?=	../../security/gnutls
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libtasn1/buildlink3.mk"
-.include "../../security/opencdk/buildlink3.mk"
 .endif # GNUTLS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnutls
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 6335839508c..4f093349bef 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.63 2010/04/13 16:31:27 drochner Exp $
+$NetBSD: distinfo,v 1.64 2010/09/01 16:32:17 drochner Exp $
 
-SHA1 (gnutls-2.8.6.tar.bz2) = bff911d4fd7389aa6698a644b3748eb2d23715bc
-RMD160 (gnutls-2.8.6.tar.bz2) = 1cfda29a60df3b032b8b611e4341c2e834bb26b2
-Size (gnutls-2.8.6.tar.bz2) = 6469369 bytes
-SHA1 (patch-ab) = 4b6801f6c8f00b8da8e78f7277450c6f53366fb4
+SHA1 (gnutls-2.10.1.tar.bz2) = 507ff8ad7c1e042f8ecaa4314f32777e74caf0d3
+RMD160 (gnutls-2.10.1.tar.bz2) = c7f9ca00f326f93331b139af34f3dd5d2db43626
+Size (gnutls-2.10.1.tar.bz2) = 7442084 bytes
+SHA1 (patch-ab) = 43d53ae8f51491a0d300463df1ccd3445581e8b5
 SHA1 (patch-ae) = f505476ce0477dc547e8698d205d6ba26fe85f48
 SHA1 (patch-af) = bd4701640dfef5bfdce87d620befd93098b0dff3
 SHA1 (patch-ai) = 2c5c181ec6de9622cac66c2d5fe2cc8f3f89fbe8
-SHA1 (patch-aj) = 55187c2a07d67f789678b1a404c6b119b311fc82
-SHA1 (patch-ak) = f2f4e6f1c6f937eca67235cb01aff1b32cbe4fd8
-SHA1 (patch-al) = f1c9def7d8150d93e14678b1acdbbc1534099452
+SHA1 (patch-am) = d5fbc2ef0ad39b55a723dc0873f6095820a92538
diff --git a/security/gnutls/patches/patch-ab b/security/gnutls/patches/patch-ab
index a5a76489d78..cfc6eed6cdc 100644
--- a/security/gnutls/patches/patch-ab
+++ b/security/gnutls/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.11 2009/06/18 10:19:46 drochner Exp $
+$NetBSD: patch-ab,v 1.12 2010/09/01 16:32:17 drochner Exp $
 
---- doc/Makefile.in.orig	2009-06-10 16:22:21.000000000 +0200
+--- doc/Makefile.in.orig	2010-07-25 09:34:19.000000000 +0000
 +++ doc/Makefile.in
-@@ -746,7 +746,7 @@ top_srcdir = @top_srcdir@
+@@ -922,7 +922,7 @@ top_srcdir = @top_srcdir@
  EXTRA_DIST = TODO README.gaa certtool.cfg gnutls.ps gnutls.pdf \
- 	gnutls.html extract-guile-c-doc.scm doxygen/Doxyfile.in \
- 	doxygen/Doxyfile.orig texinfo.css $(guile_texi)
+ 	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
  
- # Generated texinfos.
-@@ -957,7 +957,7 @@ gnutls.dvi: gnutls.texi $(srcdir)/versio
+ # Examples.
+@@ -1139,7 +1139,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-aj b/security/gnutls/patches/patch-aj
deleted file mode 100644
index 99df52995a2..00000000000
--- a/security/gnutls/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2009/06/17 17:54:46 drochner Exp $
-
---- gl/tests/Makefile.in.orig	2009-06-17 19:44:48.000000000 +0200
-+++ gl/tests/Makefile.in
-@@ -949,6 +949,7 @@ test_select_LDADD = $(LDADD) @LIBSOCKET@
- test_select_fd_LDADD = $(LDADD) @LIBSOCKET@
- test_select_stdin_LDADD = $(LDADD) @LIBSOCKET@
- test_sockets_LDADD = $(LDADD) @LIBSOCKET@
-+LINK_WARNING_H = $(top_srcdir)/build-aux/link-warning.h
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
diff --git a/security/gnutls/patches/patch-ak b/security/gnutls/patches/patch-ak
deleted file mode 100644
index 1892719002e..00000000000
--- a/security/gnutls/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2009/08/13 18:56:32 snj Exp $
-
---- configure.orig	2009-08-13 02:54:16.000000000 -0700
-+++ configure	2009-08-13 10:50:08.000000000 -0700
-@@ -8651,7 +8651,7 @@ done
- $as_echo_n "checking whether to disable OpenSSL compatibility layer... " >&6; }
-   # Check whether --enable-openssl-compatibility was given.
- if test "${enable_openssl_compatibility+set}" = set; then :
--  enableval=$enable_openssl_compatibility; enable_openssl=$withval
-+  enableval=$enable_openssl_compatibility; enable_openssl=$enableval
- else
-   enable_openssl=yes
- fi
diff --git a/security/gnutls/patches/patch-al b/security/gnutls/patches/patch-al
deleted file mode 100644
index ab1a35be6be..00000000000
--- a/security/gnutls/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.2 2009/08/13 18:56:32 snj Exp $
-
---- libextra/configure.orig	2009-08-13 02:54:00.000000000 -0700
-+++ libextra/configure	2009-08-13 10:51:47.000000000 -0700
-@@ -13170,7 +13170,7 @@ done
- $as_echo_n "checking whether to disable OpenSSL compatibility layer... " >&6; }
-   # Check whether --enable-openssl-compatibility was given.
- if test "${enable_openssl_compatibility+set}" = set; then :
--  enableval=$enable_openssl_compatibility; enable_openssl=$withval
-+  enableval=$enable_openssl_compatibility; enable_openssl=$enableval
- else
-   enable_openssl=yes
- fi
diff --git a/security/gnutls/patches/patch-am b/security/gnutls/patches/patch-am
new file mode 100644
index 00000000000..8820c236b3b
--- /dev/null
+++ b/security/gnutls/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2010/09/01 16:32:17 drochner Exp $
+
+--- tests/openpgp-certs/testselfsigs.orig	2010-06-07 14:32:23.000000000 +0000
++++ tests/openpgp-certs/testselfsigs
+@@ -25,7 +25,7 @@ set -e
+ srcdir="${srcdir:-.}"
+ CERTTOOL="${CERTTOOL:-../../src/certtool$EXEEXT}"
+ 
+-unset RETCODE
++unset RETCODE || true
+ 
+ fail() {
+    echo "Failure: $1" >&2