update to ethereal-0.10.13

This fixes a number of memory leaks, crashes and buffer overflows
in protocol dissectors, see
http://www.ethereal.com/appnotes/enpa-sa-00021.html
for details.
other changes:
-nanosecond timestamp resolution possible
-memory managment has been greatly improved
-can now save gzip-compressed capture files

5 files changed, 13 insertions, 72 deletions

diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 952861adeb0..eb4a05d4bdb 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.115 2005/08/12 17:38:40 drochner Exp $
+# $NetBSD: Makefile,v 1.116 2005/10/20 17:19:19 drochner Exp $
 
-DISTNAME=		ethereal-0.10.12
-PKGREVISION=		1
+DISTNAME=		ethereal-0.10.13
 CATEGORIES=		net
 MASTER_SITES=		http://www.ethereal.com/distribution/ \
 			http://ethereal.planetmirror.com/distribution/ \
@@ -16,7 +15,6 @@ MASTER_SITES=		http://www.ethereal.com/distribution/ \
 			http://ftp.sunet.se/pub/network/monitoring/ethereal/ \
 			http://ethereal.netarc.jp/distribution/ \
 			ftp://ftp.ethereal.com/pub/ethereal/old-versions/
-EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		frueauf@NetBSD.org
 HOMEPAGE=		http://www.ethereal.com/
diff --git a/net/ethereal/PLIST b/net/ethereal/PLIST
index 9a2725a503c..b931e3a4f72 100644
--- a/net/ethereal/PLIST
+++ b/net/ethereal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2005/07/27 16:44:43 drochner Exp $
+@comment $NetBSD: PLIST,v 1.23 2005/10/20 17:19:19 drochner Exp $
 bin/capinfos
 bin/dftest
 bin/editcap
@@ -34,7 +34,6 @@ lib/ethereal/plugins/${PKGVERSION}/rudp.la
 lib/ethereal/plugins/${PKGVERSION}/stats_tree.la
 lib/ethereal/plugins/${PKGVERSION}/tango.la
 lib/ethereal/plugins/${PKGVERSION}/v5ua.la
-lib/ethereal/plugins/${PKGVERSION}/xml.la
 lib/libethereal.la
 lib/libwiretap.la
 man/man1/capinfos.1
@@ -56,6 +55,10 @@ share/ethereal/diameter/imscxdx.xml
 share/ethereal/diameter/mobileipv4.xml
 share/ethereal/diameter/nasreq.xml
 share/ethereal/diameter/sunping.xml
+share/ethereal/dtds/dc.dtd
+share/ethereal/dtds/itunes.dtd
+share/ethereal/dtds/rss.dtd
+share/ethereal/dtds/smil.dtd
 share/ethereal/editcap.html
 share/ethereal/ethereal-filter.html
 share/ethereal/ethereal.html
@@ -92,6 +95,7 @@ share/ethereal/radius/dictionary.colubris
 share/ethereal/radius/dictionary.columbia_university
 share/ethereal/radius/dictionary.compat
 share/ethereal/radius/dictionary.cosine
+share/ethereal/radius/dictionary.ericsson
 share/ethereal/radius/dictionary.erx
 share/ethereal/radius/dictionary.extreme
 share/ethereal/radius/dictionary.foundry
@@ -134,6 +138,7 @@ share/ethereal/tethereal.html
 share/ethereal/text2pcap.html
 @dirrm share/ethereal/radius
 @dirrm share/ethereal/help
+@dirrm share/ethereal/dtds
 @dirrm share/ethereal/diameter
 @dirrm share/ethereal
 @dirrm lib/ethereal/plugins/${PKGVERSION}
diff --git a/net/ethereal/distinfo b/net/ethereal/distinfo
index 75e1c77433b..c8a68c58d89 100644
--- a/net/ethereal/distinfo
+++ b/net/ethereal/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.42 2005/08/15 10:29:22 drochner Exp $
+$NetBSD: distinfo,v 1.43 2005/10/20 17:19:19 drochner Exp $
 
-SHA1 (ethereal-0.10.12.tar.bz2) = d08ddf9135fd56ac0a2c0dc17436c4e0736590fe
-RMD160 (ethereal-0.10.12.tar.bz2) = 4d974b372a040fb70fdcc264d84f84e77e58247f
-Size (ethereal-0.10.12.tar.bz2) = 7749174 bytes
+SHA1 (ethereal-0.10.13.tar.gz) = eb7309c3774c23bdc4be08fcdb0ef2bd31634667
+RMD160 (ethereal-0.10.13.tar.gz) = 69d94b74157b6d2c86a3c25ac5220b3934de2108
+Size (ethereal-0.10.13.tar.gz) = 10115596 bytes
 SHA1 (patch-aa) = 0513b971c0af032fc64fc181fbd64d78aef0d044
-SHA1 (patch-ab) = 7f7302cfaf5d78d5ca8c89be45fcd57e9475463a
-SHA1 (patch-ac) = ef216d2b1a52ee4165bdbfea369d8fd93fe5595f
diff --git a/net/ethereal/patches/patch-ab b/net/ethereal/patches/patch-ab
deleted file mode 100644
index bb54203a604..00000000000
--- a/net/ethereal/patches/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2005/07/27 16:44:43 drochner Exp $
-
---- epan/radius_dict.l.orig	2005-07-26 21:26:46.000000000 +0200
-+++ epan/radius_dict.l
-@@ -65,7 +65,7 @@
- 	static gchar* attr_vendor = NULL;
- 	static gchar* vendor_name = NULL;
- 	static gchar* value_repr = NULL;
--	static gboolean encrypt = FALSE;
-+	static gboolean encryptflg = FALSE;
- 	static gboolean has_tag = FALSE;
- 	static gchar* current_vendor = NULL;
- 	
-@@ -97,7 +97,7 @@
- <VENDOR_W_NAME>[0-9]+   { add_vendor(vendor_name,strtol(yytext,NULL,10)); BEGIN OUT; }
- <VENDOR_W_NAME>0x[0-9a-f]+   { add_vendor(vendor_name,strtol(yytext,NULL,16)); BEGIN OUT; }
- 
--<ATTR>[0-9a-z_-]+					{ attr_name = g_strdup(yytext); encrypt = FALSE; has_tag = FALSE; BEGIN ATTR_W_NAME; }
-+<ATTR>[0-9a-z_-]+					{ attr_name = g_strdup(yytext); encryptflg = FALSE; has_tag = FALSE; BEGIN ATTR_W_NAME; }
- <ATTR_W_NAME>[0-9]+					{ attr_id = g_strdup(yytext);  BEGIN ATTR_W_ID;}
- <ATTR_W_NAME>0x[0-9a-f]+			{ attr_id = g_strdup_printf("%u",(int)strtoul(yytext,NULL,16)); BEGIN ATTR_W_ID;}
- <ATTR_W_ID>integer					{ attr_type = radius_integer;  BEGIN ATTR_W_TYPE; }
-@@ -109,11 +109,11 @@
- <ATTR_W_ID>ifid						{ attr_type = radius_ifid;  BEGIN ATTR_W_TYPE; }
- <ATTR_W_ID>[0-9a-z_-]+				{ attr_type = radius_octets;  BEGIN ATTR_W_TYPE; }
- <ATTR_W_TYPE>has_tag[,]?			{ has_tag = TRUE; attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
--<ATTR_W_TYPE>encrypt=1[,]?			{ encrypt=TRUE;  attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
-+<ATTR_W_TYPE>encrypt=1[,]?			{ encryptflg=TRUE;  attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
- <ATTR_W_TYPE>[,0-9a-z_-]+=([^\n]+)	{ /* ignore other parameters */  attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
--<ATTR_W_TYPE>[0-9a-z_-]+			{ attr_vendor = g_strdup(yytext);  add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypt,has_tag); attr_vendor = NULL;  BEGIN OUT; }
--<ATTR_W_TYPE>\n						{ add_attribute(attr_name,attr_id,attr_type,current_vendor ? g_strdup(current_vendor) : NULL ,encrypt,has_tag); linenums[include_stack_ptr]++;  BEGIN OUT; }
--<ATTR_W_VENDOR>\n					{ add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypt,has_tag); linenums[include_stack_ptr]++; BEGIN OUT; };
-+<ATTR_W_TYPE>[0-9a-z_-]+			{ attr_vendor = g_strdup(yytext);  add_attribute(attr_name,attr_id,attr_type,attr_vendor,encryptflg,has_tag); attr_vendor = NULL;  BEGIN OUT; }
-+<ATTR_W_TYPE>\n						{ add_attribute(attr_name,attr_id,attr_type,current_vendor ? g_strdup(current_vendor) : NULL ,encryptflg,has_tag); linenums[include_stack_ptr]++;  BEGIN OUT; }
-+<ATTR_W_VENDOR>\n					{ add_attribute(attr_name,attr_id,attr_type,attr_vendor,encryptflg,has_tag); linenums[include_stack_ptr]++; BEGIN OUT; };
- 
- <VALUE>[0-9a-z-]+					{ attr_name = g_strdup(yytext); BEGIN VALUE_W_ATTR; }
- <VALUE_W_ATTR>[^[:blank:]]+			{ value_repr = g_strdup(yytext); BEGIN VALUE_W_NAME; }
diff --git a/net/ethereal/patches/patch-ac b/net/ethereal/patches/patch-ac
deleted file mode 100644
index 61767cad993..00000000000
--- a/net/ethereal/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/08/12 17:38:40 drochner Exp $
-
---- epan/dissectors/packet-ldap.c.orig	2005-07-26 21:26:41.000000000 +0200
-+++ epan/dissectors/packet-ldap.c
-@@ -1283,16 +1283,10 @@ static void dissect_ldap_response_bind(A
-         a->offset += cred_length;
-       } else {
-         if (read_bytestring(a, tree, hf_ldap_message_bind_server_credentials,
--                            NULL, NULL, ASN1_UNI, ASN1_OTS) != ASN1_ERR_NOERROR)
-+                            NULL, NULL, ASN1_CTX, 7) != ASN1_ERR_NOERROR)
-           return;
-       }
-       break;
--
--    default:
--      if (read_bytestring(a, tree, hf_ldap_message_bind_server_credentials,
--                          NULL, NULL, ASN1_CTX, 7) != ASN1_ERR_NOERROR)
--        return;
--      break;
-     }
-   }
- }