Changes 2.12.8:

* libgnutls: PKCS-11 back-end was replaced by p11-kit
* libgnutls: gcrypt: replaced occurences of gcry_sexp_nth_mpi (..., 0)
  with gcry_sexp_nth_mpi (..., GCRYMPI_FMT_USG) to fix errors with 1.5.0.
* libgnutls: Verify that a certificate liste specified using
  gnutls_certificate_set_x509_key*(), is sorted according to TLS specification
* libgnutls: Added GNUTLS_X509_CRT_LIST_FAIL_IF_UNSORTED flag for
  gnutls_x509_crt_list_import. It checks whether the list to be imported is
  properly sorted.
* libgnutls: writev_emu: stop on the first incomplete write.
* libgnutls: Fix zlib handling in gnutls.pc.
* certtool: bug fixes in certificate request generation.
* API and ABI modifications: GNUTLS_X509_CRT_LIST_FAIL_IF_UNSORTED:
  New element in gnutls_certificate_import_flags

4 files changed, 21 insertions, 22 deletions

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 00f8f1ae3cb..23091c24412 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.101 2011/07/11 16:10:29 drochner Exp $
+# $NetBSD: Makefile,v 1.102 2011/08/11 11:03:35 adam Exp $
 
-DISTNAME=	gnutls-2.12.7
+DISTNAME=	gnutls-2.12.8
 CATEGORIES=	security devel
 MASTER_SITES=	ftp://ftp.gnutls.org/pub/gnutls/ \
 		ftp://ftp.gnupg.org/gcrypt/gnutls/ \
@@ -18,17 +18,17 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--without-p11-kit
+# this library duplicates (and conflicts with) openssl
+CONFIGURE_ARGS+=	--disable-openssl-compatibility
+
 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
-
 PKGCONFIG_OVERRIDE=	lib/gnutls.pc.in
 PKGCONFIG_OVERRIDE+=	libextra/gnutls-extra.pc.in
 
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index 88b748e9afc..0d732829858 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.40 2011/07/11 16:10:29 drochner Exp $
+@comment $NetBSD: PLIST,v 1.41 2011/08/11 11:03:35 adam Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
 bin/gnutls-serv
-bin/p11tool
 bin/psktool
 bin/srptool
 include/gnutls/abstract.h
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 90f39eaacdd..c3ef21746d4 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.74 2011/07/11 16:10:29 drochner Exp $
+$NetBSD: distinfo,v 1.75 2011/08/11 11:03:35 adam Exp $
 
-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 (gnutls-2.12.8.tar.bz2) = b250d3ddf3fafe69916f248d7ba909ae92022a35
+RMD160 (gnutls-2.12.8.tar.bz2) = 0fc7abac111629fa3f3794ca2d5b1b72972dde00
+Size (gnutls-2.12.8.tar.bz2) = 7153363 bytes
 SHA1 (patch-ab) = 49de2419935972f958acacdffec32388986f1ea0
 SHA1 (patch-ae) = cadc476a6a120390c3c2792b52dd02d27a3884e6
 SHA1 (patch-af) = 321c3488dd383a09dd95f6a15f50b9f54f6aa5fc
 SHA1 (patch-ai) = 2c5c181ec6de9622cac66c2d5fe2cc8f3f89fbe8
-SHA1 (patch-lib_configure) = a3a64d0aed1929d3b4edf91d48f213da23269027
+SHA1 (patch-lib_configure) = 26b1f6c0cf6dd8af27fb1d27513c0d007f7b0da6
 SHA1 (patch-lib_nettle_egd.c) = b7e9769e8c620519c43ca7b7481a558e9d389c68
diff --git a/security/gnutls/patches/patch-lib_configure b/security/gnutls/patches/patch-lib_configure
index 89fb251d082..1d782673ba9 100644
--- a/security/gnutls/patches/patch-lib_configure
+++ b/security/gnutls/patches/patch-lib_configure
@@ -1,17 +1,17 @@
-$NetBSD: patch-lib_configure,v 1.1 2011/04/27 16:56:43 tnn Exp $
+$NetBSD: patch-lib_configure,v 1.2 2011/08/11 11:03:35 adam Exp $
 
---- lib/configure.orig	2011-04-22 11:40:04.000000000 +0000
+--- lib/configure.orig	2011-08-08 21:01:09.000000000 +0000
 +++ lib/configure
-@@ -17201,6 +17201,7 @@ else
- $as_echo "no" >&6; }
+@@ -17361,6 +17361,7 @@ else
+   ZLIB_HAS_PKGCONFIG=n
  fi
  
 +if false; then # there is no zlib.pc in pkgsrc
  if test x$ac_zlib != xno; then
-   if test x$GNUTLS_REQUIRES_PRIVATE = x; then
-     GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
-@@ -17208,6 +17209,7 @@ if test x$ac_zlib != xno; then
-     GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE , zlib"
+   if test "$ZLIB_HAS_PKGCONFIG" = "y" ; then
+     if test x$GNUTLS_REQUIRES_PRIVATE = x; then
+@@ -17372,6 +17373,7 @@ if test x$ac_zlib != xno; then
+     GNUTLS_ZLIB_LIBS_PRIVATE="$LTLIBZ"
    fi
  fi
 +fi