Update to 3.2.2, with SunOS updates from Jörn Clausen.

* Version 3.2.2 (released 2013-07-14)

** libgnutls: Several optimizations in the related to packet processing
subsystems.

** libgnutls: DTLS replay detection can now be disabled (to be used
in certain transport layers like SCTP).

** libgnutls: Fixes in SRTP extension generation when MKI is being
used.

** libgnutls: Added ability to set hooks before or after sending or receiving
any handshake message with gnutls_handshake_set_hook_function().

** API and ABI modifications:
GNUTLS_NO_REPLAY_PROTECTION: Added
gnutls_certificate_set_trust_list: Added
gnutls_cipher_get_tag_size: Added
gnutls_record_overhead_size: Added
gnutls_est_record_overhead_size: Added
gnutls_handshake_set_hook_function: Added
gnutls_handshake_description_get_name: Added
gnutls_digest_list: Added
gnutls_digest_get_id: Added
gnutls_digest_get_name: Added

5 files changed, 29 insertions, 26 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 55cbf7626c9..c454b98eecc 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.129 2013/07/15 02:02:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.130 2013/07/15 08:19:15 wiz Exp $
 
-DISTNAME=	gnutls-3.2.1
+DISTNAME=	gnutls-3.2.2
 CATEGORIES=	security devel
 MASTER_SITES=	ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/
 EXTRACT_SUFX=	.tar.xz
@@ -21,7 +21,6 @@ CONFIGURE_ARGS+=	--without-p11-kit
 # this library duplicates (and conflicts with) openssl
 CONFIGURE_ARGS+=	--disable-openssl-compatibility
 CONFIGURE_ARGS+=	--disable-guile
-LDFLAGS.SunOS=		-lrt
 
 TEST_TARGET=		check
 INFO_FILES=		yes
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index a8558f5da05..8e4534ee441 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.44 2013/07/08 08:30:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.45 2013/07/15 08:19:15 wiz Exp $
 bin/certtool
 bin/danetool
 bin/gnutls-cli
@@ -94,6 +94,7 @@ man/man3/gnutls_certificate_set_pin_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_trust_list.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
@@ -132,6 +133,7 @@ man/man3/gnutls_cipher_get_id.3
 man/man3/gnutls_cipher_get_iv_size.3
 man/man3/gnutls_cipher_get_key_size.3
 man/man3/gnutls_cipher_get_name.3
+man/man3/gnutls_cipher_get_tag_size.3
 man/man3/gnutls_cipher_init.3
 man/man3/gnutls_cipher_list.3
 man/man3/gnutls_cipher_set_iv.3
@@ -171,6 +173,9 @@ 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_digest_get_id.3
+man/man3/gnutls_digest_get_name.3
+man/man3/gnutls_digest_list.3
 man/man3/gnutls_dtls_cookie_send.3
 man/man3/gnutls_dtls_cookie_verify.3
 man/man3/gnutls_dtls_get_data_mtu.3
@@ -186,6 +191,7 @@ 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_est_record_overhead_size.3
 man/man3/gnutls_fingerprint.3
 man/man3/gnutls_global_deinit.3
 man/man3/gnutls_global_init.3
@@ -196,8 +202,10 @@ man/man3/gnutls_global_set_mem_functions.3
 man/man3/gnutls_global_set_mutex.3
 man/man3/gnutls_global_set_time_function.3
 man/man3/gnutls_handshake.3
+man/man3/gnutls_handshake_description_get_name.3
 man/man3/gnutls_handshake_get_last_in.3
 man/man3/gnutls_handshake_get_last_out.3
+man/man3/gnutls_handshake_set_hook_function.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
@@ -536,6 +544,7 @@ 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_overhead_size.3
 man/man3/gnutls_record_recv.3
 man/man3/gnutls_record_recv_seq.3
 man/man3/gnutls_record_send.3
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 1766d88f917..066999f2407 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.94 2013/07/08 08:30:01 wiz Exp $
+$NetBSD: distinfo,v 1.95 2013/07/15 08:19:15 wiz Exp $
 
-SHA1 (gnutls-3.2.1.tar.xz) = 477118eaffb8f16bd7fd511069c2c5d618f6e400
-RMD160 (gnutls-3.2.1.tar.xz) = 1a94b39f2209b9226035f4d90a88a16d3d17898b
-Size (gnutls-3.2.1.tar.xz) = 5127332 bytes
+SHA1 (gnutls-3.2.2.tar.xz) = ff3e1c25fade8e928700fa63f006265c7d9d1c08
+RMD160 (gnutls-3.2.2.tar.xz) = f91c1729982bea8f42444d5f381fa9045bdd24bf
+Size (gnutls-3.2.2.tar.xz) = 5164372 bytes
 SHA1 (patch-ae) = 71fbbeb43ac1689fca6fec7f8348d8534c1dc38a
 SHA1 (patch-gl_stdio.in.h) = b5802da2cccddd6fab73bd39c49f7d62bef58464
-SHA1 (patch-lib_Makefile.in) = e97a6229381c31be6486a6671a0b34a7b72af981
+SHA1 (patch-lib_Makefile.in) = 2121ed1e974cd71fe49c286f7e91135be12d915f
 SHA1 (patch-lib_nettle_egd.c) = b7e9769e8c620519c43ca7b7481a558e9d389c68
-SHA1 (patch-src_benchmark.h) = d1e6801b4b76cfb299be126185616bedf658660a
diff --git a/security/gnutls/patches/patch-lib_Makefile.in b/security/gnutls/patches/patch-lib_Makefile.in
index 3dd3b9bf5fb..01d26256a7a 100644
--- a/security/gnutls/patches/patch-lib_Makefile.in
+++ b/security/gnutls/patches/patch-lib_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_Makefile.in,v 1.1 2013/07/08 08:30:01 wiz Exp $
+$NetBSD: patch-lib_Makefile.in,v 1.2 2013/07/15 08:19:15 wiz Exp $
 
---- lib/Makefile.in.orig	2013-07-07 13:37:03.000000000 +0000
+--- lib/Makefile.in.orig	2013-07-13 09:54:21.000000000 +0000
 +++ lib/Makefile.in
-@@ -350,7 +350,7 @@ am_libgnutls_la_OBJECTS = $(am__objects_
+@@ -379,7 +379,7 @@ am_libgnutls_la_OBJECTS = $(am__objects_
  libgnutls_la_OBJECTS = $(am_libgnutls_la_OBJECTS)
  libgnutls_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -11,3 +11,12 @@ $NetBSD: patch-lib_Makefile.in,v 1.1 2013/07/08 08:30:01 wiz Exp $
  @ENABLE_CXX_TRUE@libgnutlsxx_la_DEPENDENCIES = libgnutls.la
  am__libgnutlsxx_la_SOURCES_DIST = gnutlsxx.cpp
  @ENABLE_CXX_TRUE@am_libgnutlsxx_la_OBJECTS =  \
+@@ -1845,7 +1845,7 @@ libgnutls_la_LIBADD = ../gl/libgnu.la x5
+ 	auth/libgnutls_auth.la algorithms/libgnutls_alg.la \
+ 	extras/libgnutls_extras.la $(am__append_8) $(am__append_11) \
+ 	$(am__append_14) $(thirdparty_libadd)
+-thirdparty_libadd = $(LTLIBZ) $(LTLIBINTL) $(LIBSOCKET) \
++thirdparty_libadd = $(LTLIBZ) $(LTLIBINTL) $(LIBSOCKET) $(LIBRT) \
+ 	$(LTLIBPTHREAD) $(LTLIBICONV) $(P11_KIT_LIBS) $(LIB_SELECT) \
+ 	$(TSS_LIBS) $(am__append_12) $(am__append_13) $(am__append_17)
+ @HAVE_LD_OUTPUT_DEF_TRUE@defexecdir = $(bindir)
diff --git a/security/gnutls/patches/patch-src_benchmark.h b/security/gnutls/patches/patch-src_benchmark.h
deleted file mode 100644
index 797626c22d8..00000000000
--- a/security/gnutls/patches/patch-src_benchmark.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_benchmark.h,v 1.1 2013/07/08 08:30:01 wiz Exp $
-
---- src/benchmark.h.orig	2013-05-25 11:06:37.000000000 +0000
-+++ src/benchmark.h
-@@ -24,7 +24,7 @@
- # include <windows.h>
- #endif
- 
--#if defined(HAVE_CLOCK_GETTIME)
-+#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_PROCESS_CPUTIME_ID)
- # undef gettime
- # define gettime(x) clock_gettime(CLOCK_PROCESS_CPUTIME_ID, x)
- #else