Changes 2.6.0:

* libgnutls: Correct printing and parsing of IPv6 addresses.
* libgnutls-openssl: fix out of bounds access.
* certtool: Use inet_pton for parsing IPv6 addresses.
* Added API to replace and update the crypto backend.
* certtool: can add several subject alternative names via template file.
* opencdk: Parse (but not decrypt) encrypted secret keys.
* more...

4 files changed, 6 insertions, 40 deletions

diff --git a/security/gnutls/patches/patch-aa b/security/gnutls/patches/patch-aa
index dfc12e1b816..c45e6832c80 100644
--- a/security/gnutls/patches/patch-aa
+++ b/security/gnutls/patches/patch-aa
@@ -1,12 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2008/03/06 14:52:13 wiz Exp $
+$NetBSD: patch-aa,v 1.13 2008/10/18 11:55:11 adam Exp $
 
-Hack around GNUlib idiosyncracy where the overwritten stdio.h includes
-sys/types.h which includes stdint.h (overwritten!) which includes wchar.h
-which includes stdio.h, BOOM.
-
---- lgl/stdio.in.h.orig	2007-09-14 11:29:05.000000000 +0000
+--- lgl/stdio.in.h.orig	2008-10-05 15:41:43.000000000 +0200
 +++ lgl/stdio.in.h
-@@ -35,6 +35,14 @@
+@@ -37,6 +37,14 @@
  #include <stdarg.h>
  #include <stddef.h>
  
diff --git a/security/gnutls/patches/patch-ab b/security/gnutls/patches/patch-ab
index 49cf32f8be5..3d00db3c7b9 100644
--- a/security/gnutls/patches/patch-ab
+++ b/security/gnutls/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2008/03/06 14:52:13 wiz Exp $
+$NetBSD: patch-ab,v 1.10 2008/10/18 11:55:11 adam Exp $
 
---- doc/Makefile.in.orig	2007-12-14 11:31:23.000000000 +0000
+--- doc/Makefile.in.orig	2008-10-06 09:14:35.000000000 +0200
 +++ doc/Makefile.in
-@@ -694,7 +694,7 @@ gnutls.dvi: gnutls.texi $(srcdir)/versio
+@@ -746,7 +746,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-ac b/security/gnutls/patches/patch-ac
deleted file mode 100644
index b72caebd8cd..00000000000
--- a/security/gnutls/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2008/09/27 23:11:37 tonnerre Exp $
-
---- lgl/strverscmp.c.orig	2008-06-19 12:00:10.000000000 +0200
-+++ lgl/strverscmp.c
-@@ -58,7 +58,7 @@
- */
- 
- int
--__strverscmp (const char *s1, const char *s2)
-+gnutls_strverscmp (const char *s1, const char *s2)
- {
-   const unsigned char *p1 = (const unsigned char *) s1;
-   const unsigned char *p2 = (const unsigned char *) s2;
diff --git a/security/gnutls/patches/patch-ad b/security/gnutls/patches/patch-ad
deleted file mode 100644
index 69fc367090f..00000000000
--- a/security/gnutls/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2008/09/27 23:11:37 tonnerre Exp $
-
---- lgl/strverscmp.h.orig	2008-06-19 12:00:10.000000000 +0200
-+++ lgl/strverscmp.h
-@@ -19,6 +19,12 @@
- #ifndef STRVERSCMP_H_
- # define STRVERSCMP_H_
- 
-+#ifdef HAVE_STRVERSCMP
- int strverscmp (const char *, const char *);
-+#else
-+int gnutls_strverscmp (const char *, const char *);
-+#define __strverscmp gnutls_strverscmp
-+#define strverscmp gnutls_strverscmp
-+#endif
- 
- #endif /* not STRVERSCMP_H_ */