Update to 1.6.1:

* Version 1.6.1 (released 2006-12-28)

** Fix the list of trusted CAs that server's send to clients.
Before, the list contained issuer DN's instead of subject DN's of the
trusted CAs.  Reported by Max Kellermann

** Fix gnutls_certificate_set_x509_crl to initialize the CRL before using it.
Reported by Max Kellermann

** Encode UID fields in DN's as DirectoryString.
Before GnuTLS encoded and parsed UID fields as IA5String.  This was
incorrect, it should have used DirectoryString.  Now it will use
DirectoryString for the UID field, but for backwards compatibility it
will also accept IA5String UID's.  Reported by Max Kellermann

** Fix ./configure failure with non-GCC compilers.
This fixes the following error message:
configure: error: conditional "HAVE_LD_OUTPUT_DEF" was never defined.
Reported by "Michael C. Vergallen"

* Version 1.6.0 (released 2006-11-17)

** No changes since 1.5.5.
The major changes compared to the 1.4.x branch are:

*** A GnuTLS C++ library is part of the official distribution.
Currently there are no examples or documentation, but hopefully this
will change.  See gnutlsxx.h for the API.

*** Windows is a supported platform.
There are, however, two know bugs.  One is related to select() in
command line tools (not, nota bene, in the library), the other is a
problem with libgcrypt that causes delays.  Help is needed to resolve
those issues, so we feel we can't delay the release because of this.

*** New APIs for custom push/pull function error reporting.
The new APIs are gnutls_transport_set_errno and
gnutls_transport_set_global_errno.  See the release notes for version
1.5.4 for more information.

*** Self tests are run under valgrind, if available.  See --disable-valgrind.

3 files changed, 12 insertions, 7 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 9eb3474ec3b..3f53f87d16b 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2006/12/08 05:44:19 rillig Exp $
+# $NetBSD: Makefile,v 1.56 2007/01/20 17:38:06 wiz Exp $
 
-DISTNAME=	gnutls-1.4.5
+DISTNAME=	gnutls-1.6.1
 CATEGORIES=	security devel
 MASTER_SITES=	http://josefsson.org/gnutls/releases/ \
 		ftp://ftp.gnutls.org/pub/gnutls/ \
@@ -16,6 +16,7 @@ COMMENT=	GNU Transport Layer Security library
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index 17cbae464b3..a9ee2c750f6 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2006/07/17 17:02:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2007/01/20 17:38:06 wiz Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
@@ -10,6 +10,7 @@ bin/srptool
 include/gnutls/compat.h
 include/gnutls/extra.h
 include/gnutls/gnutls.h
+include/gnutls/gnutlsxx.h
 include/gnutls/openpgp.h
 include/gnutls/openssl.h
 include/gnutls/pkcs12.h
@@ -18,6 +19,7 @@ info/gnutls.info
 lib/libgnutls-extra.la
 lib/libgnutls-openssl.la
 lib/libgnutls.la
+lib/libgnutlsxx.la
 lib/pkgconfig/gnutls-extra.pc
 lib/pkgconfig/gnutls.pc
 man/man1/certtool.1
@@ -301,6 +303,8 @@ man/man3/gnutls_srp_verifier.3
 man/man3/gnutls_strerror.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_global_errno.3
 man/man3/gnutls_transport_set_lowat.3
 man/man3/gnutls_transport_set_ptr.3
 man/man3/gnutls_transport_set_ptr2.3
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 30d88061c5b..0ff68a7abc0 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.32 2006/11/13 18:15:14 drochner Exp $
+$NetBSD: distinfo,v 1.33 2007/01/20 17:38:06 wiz Exp $
 
-SHA1 (gnutls-1.4.5.tar.bz2) = 49a468de975ee6d10778ac43884ea4febb03d9dc
-RMD160 (gnutls-1.4.5.tar.bz2) = 74bb6f9fc4286b92f04edffa513ea0524f574099
-Size (gnutls-1.4.5.tar.bz2) = 4045874 bytes
+SHA1 (gnutls-1.6.1.tar.bz2) = e9517a6ad324245a5ebf8d86a16fc1486cd0b6ee
+RMD160 (gnutls-1.6.1.tar.bz2) = e1b780885dadc6cb355af53a4e69172f1037e06c
+Size (gnutls-1.6.1.tar.bz2) = 4226536 bytes
 SHA1 (patch-ab) = 503bf7fa154341504db7ba3b5c6602627ff27dc5