update to 2.12.7

changes:
-bugfixes
-minor feature additions
pkgsrc change: since the pkg was changed to build against "nettle"
instead of libgcrypt (whether this was a good idea or not...), the
latter isn't needed anymore, so remove the stale dependency
This can cause build breakage -- in this case addition of a local
dependency should restore the old state. (This dependency is technically
unnecessary often, but the assumption that gnutls needs libgcrypt
is sometimes hardwired in configure scripts and/or code.)

4 files changed, 14 insertions, 12 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index eaa98e603e2..00f8f1ae3cb 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.100 2011/04/27 16:56:43 tnn Exp $
+# $NetBSD: Makefile,v 1.101 2011/07/11 16:10:29 drochner Exp $
 
-DISTNAME=	gnutls-2.12.3
-PKGREVISION=	1
+DISTNAME=	gnutls-2.12.7
 CATEGORIES=	security devel
 MASTER_SITES=	ftp://ftp.gnutls.org/pub/gnutls/ \
 		ftp://ftp.gnupg.org/gcrypt/gnutls/ \
@@ -24,6 +23,9 @@ GNU_CONFIGURE=		yes
 TEST_TARGET=		check
 INFO_FILES=		yes
 
+USE_TOOLS+=		perl
+REPLACE_PERL+=	doc/scripts/gdoc doc/scripts/sort2.pl
+
 # this library duplicates (and conflicts with) openssl
 CONFIGURE_ARGS+=	--disable-openssl-compatibility
 
@@ -50,8 +52,6 @@ post-install:
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libcfg+/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgcrypt+=	libgcrypt>=1.4
-.include "../../security/libgcrypt/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libtasn1+=	libtasn1>=0.3.4
 .include "../../security/libtasn1/buildlink3.mk"
 .include "../../security/nettle/buildlink3.mk"
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index 10e274367b8..88b748e9afc 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2011/04/26 10:35:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.40 2011/07/11 16:10:29 drochner Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
@@ -67,6 +67,7 @@ man/man3/gnutls_certificate_free_cas.3
 man/man3/gnutls_certificate_free_credentials.3
 man/man3/gnutls_certificate_free_crls.3
 man/man3/gnutls_certificate_free_keys.3
+man/man3/gnutls_certificate_get_issuer.3
 man/man3/gnutls_certificate_get_openpgp_keyring.3
 man/man3/gnutls_certificate_get_ours.3
 man/man3/gnutls_certificate_get_peers.3
@@ -175,6 +176,7 @@ man/man3/gnutls_global_set_log_function.3
 man/man3/gnutls_global_set_log_level.3
 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_get_last_in.3
 man/man3/gnutls_handshake_get_last_out.3
@@ -572,6 +574,7 @@ man/man3/gnutls_x509_crq_set_subject_alt_name.3
 man/man3/gnutls_x509_crq_set_version.3
 man/man3/gnutls_x509_crq_sign.3
 man/man3/gnutls_x509_crq_sign2.3
+man/man3/gnutls_x509_crq_verify.3
 man/man3/gnutls_x509_crt_check_hostname.3
 man/man3/gnutls_x509_crt_check_issuer.3
 man/man3/gnutls_x509_crt_check_revocation.3
diff --git a/security/gnutls/buildlink3.mk b/security/gnutls/buildlink3.mk
index f5ef2fb8954..b37026439b5 100644
--- a/security/gnutls/buildlink3.mk
+++ b/security/gnutls/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2011/04/27 07:19:06 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2011/07/11 16:10:29 drochner Exp $
 
 BUILDLINK_TREE+=	gnutls
 
@@ -13,7 +13,6 @@ BUILDLINK_PKGSRCDIR.gnutls?=	../../security/gnutls
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libcfg+/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libtasn1/buildlink3.mk"
 .include "../../security/nettle/buildlink3.mk"
 .endif # GNUTLS_BUILDLINK3_MK
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 29cf20437a6..90f39eaacdd 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.73 2011/05/02 09:27:43 obache Exp $
+$NetBSD: distinfo,v 1.74 2011/07/11 16:10:29 drochner Exp $
 
-SHA1 (gnutls-2.12.3.tar.bz2) = 1799bdea6b373e312b055fa7caf06effecb9c033
-RMD160 (gnutls-2.12.3.tar.bz2) = f405a971df1e3773f26b854028b11727b28162b6
-Size (gnutls-2.12.3.tar.bz2) = 7021290 bytes
+SHA1 (gnutls-2.12.7.tar.bz2) = 41943d8f8648072a8e6a40cb213c91acf0451937
+RMD160 (gnutls-2.12.7.tar.bz2) = dd1043938087add3ce5e48e6253b5c5cc8140468
+Size (gnutls-2.12.7.tar.bz2) = 7153031 bytes
 SHA1 (patch-ab) = 49de2419935972f958acacdffec32388986f1ea0
 SHA1 (patch-ae) = cadc476a6a120390c3c2792b52dd02d27a3884e6
 SHA1 (patch-af) = 321c3488dd383a09dd95f6a15f50b9f54f6aa5fc