summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/gnutls/Makefile7
-rw-r--r--security/gnutls/PLIST5
-rw-r--r--security/gnutls/distinfo9
-rw-r--r--security/gnutls/patches/patch-aa67
4 files changed, 11 insertions, 77 deletions
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 2d71c51d0a6..2986561e9e6 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2006/03/05 00:33:54 grant Exp $
+# $NetBSD: Makefile,v 1.46 2006/03/09 17:25:54 cube Exp $
-DISTNAME= gnutls-1.3.4
-PKGREVISION= 1
+DISTNAME= gnutls-1.3.5
CATEGORIES= security devel
MASTER_SITES= http://josefsson.org/gnutls/releases/ \
ftp://ftp.gnutls.org/pub/gnutls/ \
@@ -27,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.3.0
+BUILDLINK_DEPENDS.libtasn1+= libtasn1>=0.3.1
BUILDLINK_DEPENDS.libgcrypt+= libgcrypt>=1.2.2
MAKE_ENV+= RM=${RM:Q}
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index 3bfac7e44d3..0d5434f0d7a 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2006/01/20 21:14:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2006/03/09 17:25:54 cube Exp $
bin/certtool
bin/gnutls-cli
bin/gnutls-cli-debug
@@ -445,6 +445,9 @@ share/examples/gnutls/ex-session-info.c
share/examples/gnutls/ex-verify.c
share/examples/gnutls/ex-x509-info.c
share/examples/gnutls/tcp.c
+${PKGLOCALEDIR}/locale/en@boldquot/LC_MESSAGES/gnutls.mo
+${PKGLOCALEDIR}/locale/en@quot/LC_MESSAGES/gnutls.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnutls.mo
@dirrm share/examples/gnutls
@dirrm share/doc/gnutls
@dirrm include/gnutls
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo
index 4dd418282ac..4940df7fd6e 100644
--- a/security/gnutls/distinfo
+++ b/security/gnutls/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.26 2006/03/04 23:45:07 wiz Exp $
+$NetBSD: distinfo,v 1.27 2006/03/09 17:25:54 cube 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 (gnutls-1.3.5.tar.bz2) = 21fa619515cd9997c9d84bd3b0555e86a0a1d44f
+RMD160 (gnutls-1.3.5.tar.bz2) = 18c5e760336d162d23707997d773ccd2ba0e8e07
+Size (gnutls-1.3.5.tar.bz2) = 3256630 bytes
SHA1 (patch-ab) = 503bf7fa154341504db7ba3b5c6602627ff27dc5
diff --git a/security/gnutls/patches/patch-aa b/security/gnutls/patches/patch-aa
deleted file mode 100644
index 53a88d12822..00000000000
--- a/security/gnutls/patches/patch-aa
+++ /dev/null
@@ -1,67 +0,0 @@
-$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)
- {