Changes 1.3.3:

** New API to access the TLS master secret.
When possible, you should use the TLS PRF functions instead.

** Improved handling when multiple libraries use GnuTLS at the same time.
Now gnutls_global_init() can be called multiple times, and
gnutls_global_deinit() will only deallocate the structure when it has
been called as many times as gnutls_global_init() was called.

** Added a self test of TLS resume functionality.

** Fix crash in TLS resume code, caused by TLS/IA changes.

** Add 'const' keywords in various places, from Frediano ZIGLIO.

** The code was indented again, including the external header files.

** API and ABI modifications:
New functions to retrieve the master secret value:
  gnutls_session_get_master_secret

Add a 'const' keyword to existing API:
  gnutls_x509_crq_get_challenge_password

5 files changed, 15 insertions, 13 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 6f2718a4023..19a0335956e 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2005/12/31 00:02:58 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2006/01/20 21:14:04 adam Exp $
 
-DISTNAME=	gnutls-1.3.2
+DISTNAME=	gnutls-1.3.3
 CATEGORIES=	security devel
 MASTER_SITES=	http://josefsson.org/gnutls/releases/ \
 		ftp://ftp.gnutls.org/pub/gnutls/ \
@@ -46,6 +46,7 @@ post-install:
 	cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} *.c ${EGDIR}
 
 .include "../../archivers/lzo/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libcfg+/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index 5d3e6bec024..3bfac7e44d3 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2005/12/31 00:02:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.17 2006/01/20 21:14:04 adam Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
@@ -274,6 +274,7 @@ 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
diff --git a/security/gnutls/buildlink3.mk b/security/gnutls/buildlink3.mk
index 181d5a0cabc..b7c0cd88640 100644
--- a/security/gnutls/buildlink3.mk
+++ b/security/gnutls/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2005/12/31 11:20:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/01/20 21:14:04 adam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GNUTLS_BUILDLINK3_MK:=	${GNUTLS_BUILDLINK3_MK}+
@@ -24,4 +24,4 @@ BUILDLINK_PKGSRCDIR.gnutls?=	../../security/gnutls
 .include "../../security/libtasn1/buildlink3.mk"
 .include "../../security/opencdk/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index b49b73cd2b9..b417df5fff5 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.23 2005/12/31 00:02:58 wiz Exp $
+$NetBSD: distinfo,v 1.24 2006/01/20 21:14:04 adam Exp $
 
-SHA1 (gnutls-1.3.2.tar.bz2) = f0bc87bb29591b710d63699896cb26f539a47e6b
-RMD160 (gnutls-1.3.2.tar.bz2) = 0b482d2fd835fb48b223bf5c9ef0c7fdae4f0b4f
-Size (gnutls-1.3.2.tar.bz2) = 3173209 bytes
-SHA1 (patch-ab) = df9d588891ff88c41f297fa595d618c31dc8ef97
+SHA1 (gnutls-1.3.3.tar.bz2) = 65e255278632646afc48b284fbe03ddef996551b
+RMD160 (gnutls-1.3.3.tar.bz2) = 2e3f1bc8b9b19da1f428884ba15f84e7cb936f07
+Size (gnutls-1.3.3.tar.bz2) = 3180572 bytes
+SHA1 (patch-ab) = 503bf7fa154341504db7ba3b5c6602627ff27dc5
diff --git a/security/gnutls/patches/patch-ab b/security/gnutls/patches/patch-ab
index d481cd4e55f..cafe3ae344e 100644
--- a/security/gnutls/patches/patch-ab
+++ b/security/gnutls/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2005/10/20 00:43:32 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2006/01/20 21:14:04 adam Exp $
 
---- doc/Makefile.in.orig	2005-10-07 13:26:30.000000000 +0200
+--- doc/Makefile.in.orig	2006-01-12 18:13:50.000000000 +0100
 +++ doc/Makefile.in
-@@ -387,7 +387,7 @@ gnutls.dvi: gnutls.texi $(srcdir)/versio
+@@ -413,7 +413,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