[pkgsrc/trunk]: pkgsrc/security/gnutls Update to 2.0.2:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/786c1a67e286
branches:  trunk
changeset: 534474:786c1a67e286
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Oct 23 11:43:56 2007 +0000

description:
Update to 2.0.2:

* Version 2.0.2 (released 2007-10-17)

** TLS authorization support removed.
This technique may be patented in the future, and it is not of crucial
importance for the Internet community.  After deliberation we have
concluded that the best thing we can do in this situation is to
encourage society not to adopt this technique.  We have decided to
lead the way with our own actions.

** certtool: Fixed data corruption when using --outder.

** Fix configure-time Guile detection.

** API and ABI modifications:
GNUTLS_SUPPLEMENTAL_USER_MAPPING_DATA: ADDED.  To avoid that the
    gnutls_supplemental_data_format_type_t enum type becomes empty.

* Version 2.0.1 (released 2007-09-20)

** New directory doc/credentials/ with test credentials.
This collects the test credentials from the web page and from src/.
The script gnutls-http-serv has also been moved to that directory.

** Update SRP extension type and cipher suite with official IANA values.
This breaks backwards compatibility with SRP in older versions of
GnuTLS, but this is intentional to speed up the adoption of the
official values.  The old values we used were incorrect.

** Guile: Fix `x509-certificate-dn-oid'

** API and ABI modifications:
No changes since last version.

diffstat:

 security/gnutls/Makefile         |   4 ++--
 security/gnutls/PLIST            |   9 +--------
 security/gnutls/distinfo         |  15 +++++++--------
 security/gnutls/patches/patch-ab |   6 +++---
 security/gnutls/patches/patch-ac |  23 -----------------------
 security/gnutls/patches/patch-ad |   6 +++---
 security/gnutls/patches/patch-ae |  14 ++------------
 7 files changed, 18 insertions(+), 59 deletions(-)

diffs (153 lines):

diff -r 011bdb959828 -r 786c1a67e286 security/gnutls/Makefile
--- a/security/gnutls/Makefile  Tue Oct 23 11:29:30 2007 +0000
+++ b/security/gnutls/Makefile  Tue Oct 23 11:43:56 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.64 2007/09/06 01:12:33 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2007/10/23 11:43:56 wiz Exp $
 
-DISTNAME=      gnutls-2.0.0
+DISTNAME=      gnutls-2.0.2
 CATEGORIES=    security devel
 MASTER_SITES=  http://josefsson.org/gnutls/releases/ \
                ftp://ftp.gnutls.org/pub/gnutls/ \
diff -r 011bdb959828 -r 786c1a67e286 security/gnutls/PLIST
--- a/security/gnutls/PLIST     Tue Oct 23 11:29:30 2007 +0000
+++ b/security/gnutls/PLIST     Tue Oct 23 11:43:56 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2007/09/05 21:51:21 drochner Exp $
+@comment $NetBSD: PLIST,v 1.29 2007/10/23 11:43:56 wiz Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
@@ -54,11 +54,6 @@
 man/man3/gnutls_auth_client_get_type.3
 man/man3/gnutls_auth_get_type.3
 man/man3/gnutls_auth_server_get_type.3
-man/man3/gnutls_authz_enable.3
-man/man3/gnutls_authz_send_saml_assertion.3
-man/man3/gnutls_authz_send_saml_assertion_url.3
-man/man3/gnutls_authz_send_x509_attr_cert.3
-man/man3/gnutls_authz_send_x509_attr_cert_url.3
 man/man3/gnutls_bye.3
 man/man3/gnutls_certificate_activation_time_peers.3
 man/man3/gnutls_certificate_allocate_credentials.3
@@ -478,7 +473,6 @@
 share/doc/gnutls/gnutls.ps
 share/examples/gnutls/ex-alert.c
 share/examples/gnutls/ex-cert-select.c
-share/examples/gnutls/ex-client-authz.c
 share/examples/gnutls/ex-client-resume.c
 share/examples/gnutls/ex-client-srp.c
 share/examples/gnutls/ex-client-tlsia.c
@@ -488,7 +482,6 @@
 share/examples/gnutls/ex-pkcs12.c
 share/examples/gnutls/ex-rfc2818.c
 share/examples/gnutls/ex-serv-anon.c
-share/examples/gnutls/ex-serv-authz.c
 share/examples/gnutls/ex-serv-export.c
 share/examples/gnutls/ex-serv-pgp.c
 share/examples/gnutls/ex-serv-srp.c
diff -r 011bdb959828 -r 786c1a67e286 security/gnutls/distinfo
--- a/security/gnutls/distinfo  Tue Oct 23 11:29:30 2007 +0000
+++ b/security/gnutls/distinfo  Tue Oct 23 11:43:56 2007 +0000
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.38 2007/09/14 12:03:37 joerg Exp $
+$NetBSD: distinfo,v 1.39 2007/10/23 11:43:56 wiz Exp $
 
-SHA1 (gnutls-2.0.0.tar.bz2) = 985d86cb942b9d79abb5c8966439f23141ad803a
-RMD160 (gnutls-2.0.0.tar.bz2) = 4f0fac158749ac9df9d0f1c0dd0264ef26230b93
-Size (gnutls-2.0.0.tar.bz2) = 4764031 bytes
+SHA1 (gnutls-2.0.2.tar.bz2) = 1e67565e1dbdfdbcf67a7467f7507f849e582730
+RMD160 (gnutls-2.0.2.tar.bz2) = 1b449d8c025324988e04722f10c1980652c221fe
+Size (gnutls-2.0.2.tar.bz2) = 4831867 bytes
 SHA1 (patch-aa) = 1d4ee449fd02fce00fdab055857281b69b17c1ae
-SHA1 (patch-ab) = d1e28c1e8bf1af4f65f38571840d92c88b222d8f
-SHA1 (patch-ac) = 2c31d26f4187f37bfbba08bedcb25ecb51225d4f
-SHA1 (patch-ad) = 24d7eb4fc75b90b97697a05267de8966313e8899
-SHA1 (patch-ae) = 3b74520c79a129a29dbeee6c6b66d5aa42b9aa47
+SHA1 (patch-ab) = 1bdf8bb767dc0de591346a98f1a6b3453de116dc
+SHA1 (patch-ad) = 585a6b64cc52403d83804ef22726110c4aae6169
+SHA1 (patch-ae) = f505476ce0477dc547e8698d205d6ba26fe85f48
 SHA1 (patch-af) = bd4701640dfef5bfdce87d620befd93098b0dff3
diff -r 011bdb959828 -r 786c1a67e286 security/gnutls/patches/patch-ab
--- a/security/gnutls/patches/patch-ab  Tue Oct 23 11:29:30 2007 +0000
+++ b/security/gnutls/patches/patch-ab  Tue Oct 23 11:43:56 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2007/09/05 21:51:22 drochner Exp $
+$NetBSD: patch-ab,v 1.8 2007/10/23 11:43:57 wiz Exp $
 
---- doc/Makefile.in.orig       2007-05-26 17:45:35.000000000 +0200
+--- doc/Makefile.in.orig       2007-10-17 14:02:39.000000000 +0000
 +++ doc/Makefile.in
-@@ -603,7 +603,7 @@ gnutls.dvi: gnutls.texi $(srcdir)/versio
+@@ -675,7 +675,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 -r 011bdb959828 -r 786c1a67e286 security/gnutls/patches/patch-ac
--- a/security/gnutls/patches/patch-ac  Tue Oct 23 11:29:30 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2007/09/14 12:03:38 joerg 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.
-
---- gl/stdio_.h.orig   2007-09-14 11:29:05.000000000 +0000
-+++ gl/stdio_.h
-@@ -35,6 +35,14 @@
- #include <stdarg.h>
- #include <stddef.h>
- 
-+#ifdef __DragonFly__
-+#include <machine/stdint.h>
-+#ifndef _SSIZE_T_DECLARED
-+#define _SSIZE_T_DECLARED
-+typedef __ssize_t     ssize_t;
-+#endif
-+#endif
-+
- #if (@GNULIB_FSEEKO@ && @REPLACE_FSEEKO@) \
-   || (@GNULIB_FTELLO@ && @REPLACE_FTELLO@) \
-   || (@GNULIB_GETDELIM@ && !@HAVE_DECL_GETDELIM@) \
diff -r 011bdb959828 -r 786c1a67e286 security/gnutls/patches/patch-ad
--- a/security/gnutls/patches/patch-ad  Tue Oct 23 11:29:30 2007 +0000
+++ b/security/gnutls/patches/patch-ad  Tue Oct 23 11:43:56 2007 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2007/09/05 21:51:22 drochner Exp $
+$NetBSD: patch-ad,v 1.2 2007/10/23 11:43:57 wiz Exp $
 
---- ./lib/x509/output.c.orig   2007-08-21 23:48:45.000000000 +0200
-+++ ./lib/x509/output.c
+--- lib/x509/output.c.orig     2007-09-27 11:17:18.000000000 +0000
++++ lib/x509/output.c
 @@ -84,7 +84,7 @@ asciiprint (gnutls_string * str, const c
    size_t j;
  
diff -r 011bdb959828 -r 786c1a67e286 security/gnutls/patches/patch-ae
--- a/security/gnutls/patches/patch-ae  Tue Oct 23 11:29:30 2007 +0000
+++ b/security/gnutls/patches/patch-ae  Tue Oct 23 11:43:56 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2007/09/05 21:51:22 drochner Exp $
+$NetBSD: patch-ae,v 1.2 2007/10/23 11:43:57 wiz Exp $
 
---- guile/src/core.c.orig      2007-09-04 18:11:37.000000000 +0200
+--- guile/src/core.c.orig      2007-09-27 11:17:17.000000000 +0000
 +++ guile/src/core.c
 @@ -22,7 +22,7 @@
  #include <gnutls/gnutls.h>
@@ -11,13 +11,3 @@
  
  #include "enums.h"
  #include "smobs.h"
-@@ -2380,7 +2380,8 @@ SCM_DEFINE (scm_gnutls_x509_certificate_
-       if (c_oid_actual_len < c_oid_len)                                       \
-       c_oid = scm_realloc (c_oid, c_oid_actual_len);                  \
-                                                                       \
--      result = scm_take_locale_string (c_oid);                                \
-+      result = scm_take_locale_stringn (c_oid,                                \
-+                                      c_oid_actual_len);              \
-     }                                                                 \
-                                                                       \
-   return result;