[pkgsrc/trunk]: pkgsrc/security/gnutls Fix build with libtasn1-0.3.0, and dep...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0971500b615a
branches:  trunk
changeset: 509175:0971500b615a
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Mar 04 23:45:07 2006 +0000

description:
Fix build with libtasn1-0.3.0, and depend on it.

diffstat:

 security/gnutls/Makefile         |   4 +-
 security/gnutls/distinfo         |   3 +-
 security/gnutls/patches/patch-aa |  67 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 3 deletions(-)

diffs (101 lines):

diff -r 654a5c3b079b -r 0971500b615a security/gnutls/Makefile
--- a/security/gnutls/Makefile  Sat Mar 04 22:20:04 2006 +0000
+++ b/security/gnutls/Makefile  Sat Mar 04 23:45:07 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/03/04 21:30:34 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2006/03/04 23:45:07 wiz Exp $
 
 DISTNAME=      gnutls-1.3.4
 CATEGORIES=    security devel
@@ -26,7 +26,7 @@
 PKGCONFIG_OVERRIDE+=   libextra/gnutls-extra.pc.in
 
 BUILDLINK_DEPENDS.opencdk+=    opencdk>=0.5.5
-BUILDLINK_DEPENDS.libtasn1+=   libtasn1>=0.2.18
+BUILDLINK_DEPENDS.libtasn1+=   libtasn1>=0.3.0
 BUILDLINK_DEPENDS.libgcrypt+=  libgcrypt>=1.2.2
 
 MAKE_ENV+=             RM=${RM:Q}
diff -r 654a5c3b079b -r 0971500b615a security/gnutls/distinfo
--- a/security/gnutls/distinfo  Sat Mar 04 22:20:04 2006 +0000
+++ b/security/gnutls/distinfo  Sat Mar 04 23:45:07 2006 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.25 2006/02/10 12:39:25 drochner Exp $
+$NetBSD: distinfo,v 1.26 2006/03/04 23:45:07 wiz Exp $
 
 SHA1 (gnutls-1.3.4.tar.bz2) = f412262ab6299f6e4603c3f524551ae0357ff983
 RMD160 (gnutls-1.3.4.tar.bz2) = 9f51b9a2eb54122d770cf4a6a48e620f271953cb
 Size (gnutls-1.3.4.tar.bz2) = 3199801 bytes
+SHA1 (patch-aa) = bc00be2f70c6cc2fa7358ebc3f3ac15d627305ca
 SHA1 (patch-ab) = 503bf7fa154341504db7ba3b5c6602627ff27dc5
diff -r 654a5c3b079b -r 0971500b615a security/gnutls/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/gnutls/patches/patch-aa  Sat Mar 04 23:45:07 2006 +0000
@@ -0,0 +1,67 @@
+$NetBSD: patch-aa,v 1.7 2006/03/04 23:45:07 wiz Exp $
+
+--- lib/x509/xml.c.orig        2006-02-08 16:56:21.000000000 +0000
++++ lib/x509/xml.c
+@@ -379,7 +379,7 @@ _gnutls_asn1_get_structure_xml (ASN1_TYP
+       if (p->type == TYPE_BIT_STRING)
+       {
+         len2 = -1;
+-        len = _asn1_get_length_der (p->value, p->value_len, &len2);
++        len = asn1_get_length_der (p->value, p->value_len, &len2);
+         snprintf (tmp, sizeof (tmp), " length=\"%i\"",
+                   (len - 1) * 8 - (p->value[len2]));
+         STR_APPEND (tmp);
+@@ -412,7 +412,7 @@ _gnutls_asn1_get_structure_xml (ASN1_TYP
+             if (value)
+               {
+                 len2 = -1;
+-                len = _asn1_get_length_der (value, p->value_len, &len2);
++                len = asn1_get_length_der (value, p->value_len, &len2);
+ 
+                 for (k = 0; k < len; k++)
+                   {
+@@ -426,7 +426,7 @@ _gnutls_asn1_get_structure_xml (ASN1_TYP
+             if (value)
+               {
+                 len2 = -1;
+-                len = _asn1_get_length_der (value, p->value_len, &len2);
++                len = asn1_get_length_der (value, p->value_len, &len2);
+ 
+                 for (k = 0; k < len; k++)
+                   {
+@@ -456,7 +456,7 @@ _gnutls_asn1_get_structure_xml (ASN1_TYP
+             if (value)
+               {
+                 len2 = -1;
+-                len = _asn1_get_length_der (value, p->value_len, &len2);
++                len = asn1_get_length_der (value, p->value_len, &len2);
+ 
+                 for (k = 1; k < len; k++)
+                   {
+@@ -469,7 +469,7 @@ _gnutls_asn1_get_structure_xml (ASN1_TYP
+             if (value)
+               {
+                 len2 = -1;
+-                len = _asn1_get_length_der (value, p->value_len, &len2);
++                len = asn1_get_length_der (value, p->value_len, &len2);
+                 for (k = 0; k < len; k++)
+                   {
+                     snprintf (tmp, sizeof (tmp), "%02X", (value)[k + len2]);
+@@ -487,7 +487,7 @@ _gnutls_asn1_get_structure_xml (ASN1_TYP
+                 if (value)
+                   {
+                     len3 = -1;
+-                    len2 = _asn1_get_length_der (value, p->value_len, &len3);
++                    len2 = asn1_get_length_der (value, p->value_len, &len3);
+                     for (k = 0; k < len2; k++)
+                       {
+                         snprintf (tmp, sizeof (tmp),
+@@ -507,7 +507,7 @@ _gnutls_asn1_get_structure_xml (ASN1_TYP
+                   type_field (up->left->type) == TYPE_OBJECT_ID)
+                 {
+ 
+-                  len2 = _asn1_get_length_der (up->value, up->value_len, &len3);
++                  len2 = asn1_get_length_der (up->value, up->value_len, &len3);
+ 
+                   if (len2 > 0 && strcmp (p->name, "type") == 0)
+                     {