Updated to 1.0.0, provided by Min Sik Kim PR pkg/23661.

Changes:

- Exported the static SRP group parameters.
- Some fixes in the certificate authenticated SRP ciphersuites.
- Improved the support for draft-ietf-tls-srp-05. The two-phase
  handshake is now fully supported without any interaction with
  the application layer (except for a callback).
- Some fixes in the openpgp authentication.
- Removed the Twofish cipher.
- The openssl compatibility layer was moved to gnutls-openssl
  library instead of being included in the gnutls-extra library.
- Added the RIPEMD ciphersuites defined in draft-ietf-tls-openpgp-keys-04.
- Building with openpgp support is now mandatory.
- gnutls4 compatibility header is no longer included by default in
  gnutls.h.
- gnutls8 function usage yelds a deprecation warning in gcc3.
- gnutls_x509_*_set_dn_by_oid() and gnutls_x509_*_get_*_dn_by_oid()
  functions have a raw_flag parameter added.
- The certtool utility can now generate PKCS #12 structures
  without specifying a certificate.
- Added capability to read CRLs to certtool.
- Corrected some functions which return GNUTLS_E_SHORT_MEMORY_BUFFER
  to properly set the required buffer size.
- Corrected a bug in libgcrypt detection.

And more...

4 files changed, 87 insertions, 19 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 3549e27af64..66e8147f4c6 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/10/18 08:10:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/12/06 00:52:21 xtraeme Exp $
 #
 
-DISTNAME=	gnutls-0.8.7
-PKGREVISION=	1
+DISTNAME=	gnutls-1.0.0
 CATEGORIES=	security devel
 MASTER_SITES=	ftp://ftp.gnutls.org/pub/gnutls/
 
@@ -14,10 +13,6 @@ USE_BUILDLINK2=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
-# The security/libtasn1 package provides a version that is too new to work
-# fine with this version of gnutls.
-CONFIGURE_ARGS+=	--with-included-libtasn
-
 LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
 
 DOCDIR=		${PREFIX}/share/doc/gnutls
@@ -32,6 +27,9 @@ post-install:
 
 .include "../../archivers/liblzo/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
+.include "../../security/libgcrypt/buildlink2.mk"
+.include "../../security/libtasn1/buildlink2.mk"
 .include "../../security/opencdk/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index 19b8f6b99c0..52970df47bf 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/05/14 03:46:44 salo Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/12/06 00:52:21 xtraeme Exp $
+bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
 bin/gnutls-serv
@@ -6,43 +7,108 @@ bin/gnutls-srpcrypt
 bin/libgnutls-config
 bin/libgnutls-extra-config
 include/gnutls/compat4.h
+include/gnutls/compat8.h
 include/gnutls/extra.h
 include/gnutls/gnutls.h
+include/gnutls/openpgp.h
 include/gnutls/openssl.h
+include/gnutls/pkcs12.h
+include/gnutls/x509.h
 lib/libgnutls-extra.a
 lib/libgnutls-extra.la
 lib/libgnutls-extra.so
-lib/libgnutls-extra.so.8
-lib/libgnutls-extra.so.8.7
+lib/libgnutls-extra.so.10
+lib/libgnutls-extra.so.10.0
+lib/libgnutls-openssl.a
+lib/libgnutls-openssl.la
+lib/libgnutls-openssl.so
+lib/libgnutls-openssl.so.10
+lib/libgnutls-openssl.so.10.0
 lib/libgnutls.a
 lib/libgnutls.la
 lib/libgnutls.so
-lib/libgnutls.so.8
-lib/libgnutls.so.8.7
+lib/libgnutls.so.10
+lib/libgnutls.so.10.0
+man/man1/certtool.1
+man/man1/gnutls-cli-debug.1
+man/man1/gnutls-cli.1
+man/man1/gnutls-serv.1
+man/man1/gnutls-srpcrypt.1
 share/aclocal/libgnutls-extra.m4
 share/aclocal/libgnutls.m4
 share/doc/gnutls/TODO
+share/doc/gnutls/alert.tex
+share/doc/gnutls/appendix.tex
+share/doc/gnutls/auth.tex
+share/doc/gnutls/callbacks.tex
+share/doc/gnutls/certificate.tex
+share/doc/gnutls/ciphers.tex
+share/doc/gnutls/ciphersuites.tex
+share/doc/gnutls/compression.tex
 share/doc/gnutls/cover.tex
+share/doc/gnutls/errors.tex
+share/doc/gnutls/ex-alert.tex
+share/doc/gnutls/ex-cert-select.tex
+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
+share/doc/gnutls/ex-serv-pgp.tex
+share/doc/gnutls/ex-serv-srp.tex
+share/doc/gnutls/ex-serv1.tex
+share/doc/gnutls/ex-session-info.tex
+share/doc/gnutls/ex-x509-info.tex
+share/doc/gnutls/examples.tex
 share/doc/gnutls/fdl.tex
+share/doc/gnutls/funcs.tex
 share/doc/gnutls/gnutls-logo.ps
 share/doc/gnutls/gnutls.ps
 share/doc/gnutls/gnutls.tex
+share/doc/gnutls/handshake.tex
+share/doc/gnutls/howto.tex
 share/doc/gnutls/internals.eps
 share/doc/gnutls/layers.eps
+share/doc/gnutls/layers.tex
+share/doc/gnutls/library.tex
+share/doc/gnutls/macros.tex
+share/doc/gnutls/memory.tex
+share/doc/gnutls/openpgp.tex
+share/doc/gnutls/openssl.tex
 share/doc/gnutls/pgp-fig1.eps
+share/doc/gnutls/pgpcert.xml.tex
+share/doc/gnutls/preface.tex
+share/doc/gnutls/preparation.tex
+share/doc/gnutls/programs.tex
+share/doc/gnutls/record.tex
+share/doc/gnutls/record_weaknesses.tex
+share/doc/gnutls/srp.tex
+share/doc/gnutls/supported_ciphersuites.tex
+share/doc/gnutls/tls_extensions.tex
+share/doc/gnutls/tlsintro.tex
+share/doc/gnutls/translayer.tex
 share/doc/gnutls/x509-1.eps
+share/doc/gnutls/x509.tex
+share/doc/gnutls/x509cert.xml.tex
 share/examples/gnutls/ex-alert.c
+share/examples/gnutls/ex-cert-select.c
 share/examples/gnutls/ex-client-resume.c
 share/examples/gnutls/ex-client-srp.c
 share/examples/gnutls/ex-client1.c
 share/examples/gnutls/ex-client2.c
-share/examples/gnutls/ex-info.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
 share/examples/gnutls/ex-serv-pgp.c
 share/examples/gnutls/ex-serv-srp.c
 share/examples/gnutls/ex-serv1.c
+share/examples/gnutls/ex-session-info.c
+share/examples/gnutls/ex-x509-info.c
 @dirrm share/examples/gnutls
 @dirrm share/doc/gnutls
 @dirrm include/gnutls
diff --git a/security/gnutls/buildlink2.mk b/security/gnutls/buildlink2.mk
index ba927c98a98..a22a682d474 100644
--- a/security/gnutls/buildlink2.mk
+++ b/security/gnutls/buildlink2.mk
@@ -1,26 +1,30 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/10/18 08:10:57 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/12/06 00:52:21 xtraeme Exp $
 #
 # This Makefile fragment is included by packages that use gnutls.
 #
-# This file was created automatically using createbuildlink 2.6.
+# This file was created automatically using createbuildlink 2.8.
 #
 
 .if !defined(GNUTLS_BUILDLINK2_MK)
 GNUTLS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnutls
-BUILDLINK_DEPENDS.gnutls?=		gnutls>=0.8.7nb1
+BUILDLINK_DEPENDS.gnutls?=		gnutls>=1.0.0
 BUILDLINK_PKGSRCDIR.gnutls?=		../../security/gnutls
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnutls=gnutls
 BUILDLINK_PREFIX.gnutls_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.gnutls+=	include/gnutls/*.h
 BUILDLINK_FILES.gnutls+=	lib/libgnutls-extra.*
+BUILDLINK_FILES.gnutls+=	lib/libgnutls-openssl.*
 BUILDLINK_FILES.gnutls+=	lib/libgnutls.*
 
 .include "../../archivers/liblzo/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
+.include "../../security/libgcrypt/buildlink2.mk"
+.include "../../security/libtasn1/buildlink2.mk"
 .include "../../security/opencdk/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	gnutls-buildlink
 
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index e206f48e501..834594f4708 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/05/14 03:46:44 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/12/06 00:52:21 xtraeme Exp $
 
-SHA1 (gnutls-0.8.7.tar.gz) = db3ec6a15a453778c8638de46109283fba7d53af
-Size (gnutls-0.8.7.tar.gz) = 998594 bytes
+SHA1 (gnutls-1.0.0.tar.gz) = 8ce5b31b264878489608347ab89426b6f98edb4f
+Size (gnutls-1.0.0.tar.gz) = 1360099 bytes