diff options
| author | wiz <wiz@pkgsrc.org> | 2006-03-04 23:45:07 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2006-03-04 23:45:07 +0000 |
| commit | 498c5fa0fccbb9c0a11e3a7a84273808ca7e1e84 (patch) | |
| tree | 9e64d843c95d2a563680b197d48acd2ff1c84fec /security/gnutls | |
| parent | b4158075efff78407d1004555130feb15a008d94 (diff) | |
| download | pkgsrc-498c5fa0fccbb9c0a11e3a7a84273808ca7e1e84.tar.gz | |
Fix build with libtasn1-0.3.0, and depend on it.
Diffstat (limited to 'security/gnutls')
| -rw-r--r-- | security/gnutls/Makefile | 4 | ||||
| -rw-r--r-- | security/gnutls/distinfo | 3 | ||||
| -rw-r--r-- | security/gnutls/patches/patch-aa | 67 |
3 files changed, 71 insertions, 3 deletions
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index 68f06724069..1e579fde959 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -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= lib/gnutls.pc.in 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 --git a/security/gnutls/distinfo b/security/gnutls/distinfo index 7298b611383..4dd418282ac 100644 --- a/security/gnutls/distinfo +++ b/security/gnutls/distinfo @@ -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 --git a/security/gnutls/patches/patch-aa b/security/gnutls/patches/patch-aa new file mode 100644 index 00000000000..53a88d12822 --- /dev/null +++ b/security/gnutls/patches/patch-aa @@ -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) + { |