update to 2.10.1

many fixes and API extensions, but still binary compatible afaict

5 files changed, 20 insertions, 45 deletions

diff --git a/security/gnutls/patches/patch-ab b/security/gnutls/patches/patch-ab
index a5a76489d78..cfc6eed6cdc 100644
--- a/security/gnutls/patches/patch-ab
+++ b/security/gnutls/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.11 2009/06/18 10:19:46 drochner Exp $
+$NetBSD: patch-ab,v 1.12 2010/09/01 16:32:17 drochner Exp $
 
---- doc/Makefile.in.orig	2009-06-10 16:22:21.000000000 +0200
+--- doc/Makefile.in.orig	2010-07-25 09:34:19.000000000 +0000
 +++ doc/Makefile.in
-@@ -746,7 +746,7 @@ top_srcdir = @top_srcdir@
+@@ -922,7 +922,7 @@ top_srcdir = @top_srcdir@
  EXTRA_DIST = TODO README.gaa certtool.cfg gnutls.ps gnutls.pdf \
- 	gnutls.html extract-guile-c-doc.scm doxygen/Doxyfile.in \
- 	doxygen/Doxyfile.orig texinfo.css $(guile_texi)
+ 	gnutls.html doxygen/Doxyfile.in doxygen/Doxyfile.orig \
+ 	texinfo.css $(guile_texi) extract-guile-c-doc.scm
 -SUBDIRS = examples cyclo scripts manpages credentials $(am__append_1)
 +SUBDIRS = cyclo scripts manpages credentials $(am__append_1)
  info_TEXINFOS = gnutls.texi
  
- # Generated texinfos.
-@@ -957,7 +957,7 @@ gnutls.dvi: gnutls.texi $(srcdir)/versio
+ # Examples.
+@@ -1139,7 +1139,7 @@ gnutls.dvi: gnutls.texi $(srcdir)/versio
  gnutls.pdf: gnutls.texi $(srcdir)/version.texi $(gnutls_TEXINFOS)
  gnutls.html: gnutls.texi $(srcdir)/version.texi $(gnutls_TEXINFOS)
  $(srcdir)/version.texi:  $(srcdir)/stamp-vti
diff --git a/security/gnutls/patches/patch-aj b/security/gnutls/patches/patch-aj
deleted file mode 100644
index 99df52995a2..00000000000
--- a/security/gnutls/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2009/06/17 17:54:46 drochner Exp $
-
---- gl/tests/Makefile.in.orig	2009-06-17 19:44:48.000000000 +0200
-+++ gl/tests/Makefile.in
-@@ -949,6 +949,7 @@ test_select_LDADD = $(LDADD) @LIBSOCKET@
- test_select_fd_LDADD = $(LDADD) @LIBSOCKET@
- test_select_stdin_LDADD = $(LDADD) @LIBSOCKET@
- test_sockets_LDADD = $(LDADD) @LIBSOCKET@
-+LINK_WARNING_H = $(top_srcdir)/build-aux/link-warning.h
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
diff --git a/security/gnutls/patches/patch-ak b/security/gnutls/patches/patch-ak
deleted file mode 100644
index 1892719002e..00000000000
--- a/security/gnutls/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2009/08/13 18:56:32 snj Exp $
-
---- configure.orig	2009-08-13 02:54:16.000000000 -0700
-+++ configure	2009-08-13 10:50:08.000000000 -0700
-@@ -8651,7 +8651,7 @@ done
- $as_echo_n "checking whether to disable OpenSSL compatibility layer... " >&6; }
-   # Check whether --enable-openssl-compatibility was given.
- if test "${enable_openssl_compatibility+set}" = set; then :
--  enableval=$enable_openssl_compatibility; enable_openssl=$withval
-+  enableval=$enable_openssl_compatibility; enable_openssl=$enableval
- else
-   enable_openssl=yes
- fi
diff --git a/security/gnutls/patches/patch-al b/security/gnutls/patches/patch-al
deleted file mode 100644
index ab1a35be6be..00000000000
--- a/security/gnutls/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.2 2009/08/13 18:56:32 snj Exp $
-
---- libextra/configure.orig	2009-08-13 02:54:00.000000000 -0700
-+++ libextra/configure	2009-08-13 10:51:47.000000000 -0700
-@@ -13170,7 +13170,7 @@ done
- $as_echo_n "checking whether to disable OpenSSL compatibility layer... " >&6; }
-   # Check whether --enable-openssl-compatibility was given.
- if test "${enable_openssl_compatibility+set}" = set; then :
--  enableval=$enable_openssl_compatibility; enable_openssl=$withval
-+  enableval=$enable_openssl_compatibility; enable_openssl=$enableval
- else
-   enable_openssl=yes
- fi
diff --git a/security/gnutls/patches/patch-am b/security/gnutls/patches/patch-am
new file mode 100644
index 00000000000..8820c236b3b
--- /dev/null
+++ b/security/gnutls/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2010/09/01 16:32:17 drochner Exp $
+
+--- tests/openpgp-certs/testselfsigs.orig	2010-06-07 14:32:23.000000000 +0000
++++ tests/openpgp-certs/testselfsigs
+@@ -25,7 +25,7 @@ set -e
+ srcdir="${srcdir:-.}"
+ CERTTOOL="${CERTTOOL:-../../src/certtool$EXEEXT}"
+ 
+-unset RETCODE
++unset RETCODE || true
+ 
+ fail() {
+    echo "Failure: $1" >&2