Changes 1.0.13:

- Some complilation fixes.
- Added the --xml parameter to the certtool utility.

Changes 1.0.12:
- Corrected bug in OpenPGP key loading using a callback.
- Renamed gnutls-srpcrypt to srptool
- Allow handshake requests by the client.
* Things backported from the development branch:
- Added support for authority key identifier and the extended key usage
  X.509 extension fields. The certtoool was updated to support them.
- Added batch support to certtool. Now it can use templates.
- The RC2 cipher is no more included. The one in libgcrypt is now used.

Changes 1.0.11:
- Added gnutls_sign_algorithm_get_name() and gnutls_pk_algorithm_get_name()
- Corrected bug in TLS renegotiation.

Changes 1.0.10:
- Corrected bug in RSA parameters handling which could cause
  unexpected crashes.
- Corrected bug in SSL 3.0 authentication.

4 files changed, 34 insertions, 18 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 2cb3a8a2773..0333089a394 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2004/04/29 10:31:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/05/22 10:09:53 adam Exp $
 
-DISTNAME=	gnutls-1.0.8
+DISTNAME=	gnutls-1.0.13
 CATEGORIES=	security devel
-MASTER_SITES=	ftp://ftp.gnutls.org/pub/gnutls/
+MASTER_SITES=	ftp://ftp.gnutls.org/pub/gnutls/ \
+		ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/ \
+		http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \
+		ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnutls.org/
@@ -10,9 +13,9 @@ COMMENT=	GNU Transport Layer Security library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	YES
-USE_LIBTOOL=	YES
-GNU_CONFIGURE=	YES
+USE_BUILDLINK3=		YES
+USE_LIBTOOL=		YES
+GNU_CONFIGURE=		YES
 
 DOCDIR=		${PREFIX}/share/doc/gnutls
 EGDIR=		${PREFIX}/share/examples/gnutls
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index 6634cb81c58..33d090a16fb 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/03/01 15:14:45 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/05/22 10:09:53 adam Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
@@ -6,6 +6,7 @@ bin/gnutls-serv
 bin/gnutls-srpcrypt
 bin/libgnutls-config
 bin/libgnutls-extra-config
+bin/srptool
 include/gnutls/compat4.h
 include/gnutls/compat8.h
 include/gnutls/extra.h
@@ -17,18 +18,18 @@ include/gnutls/x509.h
 lib/libgnutls-extra.a
 lib/libgnutls-extra.la
 lib/libgnutls-extra.so
-lib/libgnutls-extra.so.13
-lib/libgnutls-extra.so.13.8
+lib/libgnutls-extra.so.12
+lib/libgnutls-extra.so.12.13
 lib/libgnutls-openssl.a
 lib/libgnutls-openssl.la
 lib/libgnutls-openssl.so
-lib/libgnutls-openssl.so.13
-lib/libgnutls-openssl.so.13.8
+lib/libgnutls-openssl.so.12
+lib/libgnutls-openssl.so.12.13
 lib/libgnutls.a
 lib/libgnutls.la
 lib/libgnutls.so
-lib/libgnutls.so.13
-lib/libgnutls.so.13.8
+lib/libgnutls.so.12
+lib/libgnutls.so.12.13
 man/man1/certtool.1
 man/man1/gnutls-cli-debug.1
 man/man1/gnutls-cli.1
@@ -54,7 +55,6 @@ share/doc/gnutls/ex-client-resume.tex
 share/doc/gnutls/ex-client-srp.tex
 share/doc/gnutls/ex-client2.tex
 share/doc/gnutls/ex-crq.tex
-share/doc/gnutls/ex-pgp-keyserver.tex
 share/doc/gnutls/ex-pkcs12.tex
 share/doc/gnutls/ex-rfc2818.tex
 share/doc/gnutls/ex-serv-export.tex
@@ -99,7 +99,6 @@ share/examples/gnutls/ex-client-srp.c
 share/examples/gnutls/ex-client1.c
 share/examples/gnutls/ex-client2.c
 share/examples/gnutls/ex-crq.c
-share/examples/gnutls/ex-pgp-keyserver.c
 share/examples/gnutls/ex-pkcs12.c
 share/examples/gnutls/ex-rfc2818.c
 share/examples/gnutls/ex-serv-export.c
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index bf4eef8ce96..bb72b521c1f 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.7 2004/03/01 15:14:45 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2004/05/22 10:09:53 adam Exp $
 
-SHA1 (gnutls-1.0.8.tar.gz) = 567b1948b34ecc44d93e110036747a2718087e72
-Size (gnutls-1.0.8.tar.gz) = 1407598 bytes
+SHA1 (gnutls-1.0.13.tar.gz) = f2a3c319a9fecc8fc27230174cb194171112fe12
+Size (gnutls-1.0.13.tar.gz) = 1465802 bytes
+SHA1 (patch-aa) = c0731bf36ace47b5bb489c243cd557668d7d4955
diff --git a/security/gnutls/patches/patch-aa b/security/gnutls/patches/patch-aa
new file mode 100644
index 00000000000..5f11a13a597
--- /dev/null
+++ b/security/gnutls/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2004/05/22 10:09:53 adam Exp $
+
+--- configure.orig	2004-05-22 11:55:09.000000000 +0000
++++ configure
+@@ -3586,8 +3586,6 @@ if test $ac_cv_c_compiler_gnu != no; the
+ 
+ 	if test x$opt_developer_mode = xyes; then
+ 	  CFLAGS="${CFLAGS} -g -Wno-format-y2k -Wall -Wcast-align -W -Wpointer-arith -Wchar-subscripts -Wformat-security -Wmissing-braces -Winline -Wstrict-prototypes"
+-	else
+-	  CFLAGS="${CFLAGS} -O2 -finline-functions"
+ 	fi
+ 
+ 	if test x$opt_dmalloc_mode = xyes; then