update to 0.10.12

This fixes many security problems in protocol dissectors.
other changes:
-RADIUS dictionaries are now included.
-A lot of documentation was updated
-Some command line parameters have changed
-A "File/File Set" submenu was added to better handle multiple files
-Flow graphs can now be created for any protocol.
-Memory management has been greatly improved.
-JXTA has been added to the conversations menu.
-When compiled with MIT/Heimdal Kerberos AND if keytab files are provided
-TCP Sequence graphs should now work for all captures and all encapsulation types
-new and updated protocol support

4 files changed, 114 insertions, 8 deletions

diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index a11491e04fd..d40a3b5021d 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.112 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.113 2005/07/27 16:44:43 drochner Exp $
 
-DISTNAME=		ethereal-0.10.11
-PKGREVISION=		1
+DISTNAME=		ethereal-0.10.12
 CATEGORIES=		net
 MASTER_SITES=		http://www.ethereal.com/distribution/ \
 			http://ethereal.planetmirror.com/distribution/ \
diff --git a/net/ethereal/PLIST b/net/ethereal/PLIST
index fd11119b2cf..9a2725a503c 100644
--- a/net/ethereal/PLIST
+++ b/net/ethereal/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.21 2005/05/06 13:54:48 tron Exp $
+@comment $NetBSD: PLIST,v 1.22 2005/07/27 16:44:43 drochner Exp $
 bin/capinfos
 bin/dftest
 bin/editcap
 bin/ethereal
 bin/idl2eth
 bin/mergecap
+bin/randpkt
 bin/tethereal
 bin/text2pcap
 lib/ethereal/plugins/${PKGVERSION}/acn.la
@@ -23,6 +24,7 @@ lib/ethereal/plugins/${PKGVERSION}/mate.la
 lib/ethereal/plugins/${PKGVERSION}/megaco.la
 lib/ethereal/plugins/${PKGVERSION}/mgcp.la
 lib/ethereal/plugins/${PKGVERSION}/opsi.la
+lib/ethereal/plugins/${PKGVERSION}/parlay.la
 lib/ethereal/plugins/${PKGVERSION}/pcli.la
 lib/ethereal/plugins/${PKGVERSION}/profinet.la
 lib/ethereal/plugins/${PKGVERSION}/rdm.la
@@ -30,6 +32,7 @@ lib/ethereal/plugins/${PKGVERSION}/rlm.la
 lib/ethereal/plugins/${PKGVERSION}/rtnet.la
 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
@@ -44,6 +47,9 @@ man/man1/text2pcap.1
 man/man4/ethereal-filter.4
 share/ethereal/AUTHORS-SHORT
 share/ethereal/capinfos.html
+share/ethereal/cfilters
+share/ethereal/colorfilters
+share/ethereal/dfilters
 share/ethereal/diameter/dictionary.dtd
 share/ethereal/diameter/dictionary.xml
 share/ethereal/diameter/imscxdx.xml
@@ -63,8 +69,70 @@ share/ethereal/help/toc
 share/ethereal/idl2eth.html
 share/ethereal/manuf
 share/ethereal/mergecap.html
+share/ethereal/radius/dictionary
+share/ethereal/radius/dictionary.3com
+share/ethereal/radius/dictionary.3gpp
+share/ethereal/radius/dictionary.3gpp2
+share/ethereal/radius/dictionary.acc
+share/ethereal/radius/dictionary.alcatel
+share/ethereal/radius/dictionary.alteon
+share/ethereal/radius/dictionary.altiga
+share/ethereal/radius/dictionary.aptis
+share/ethereal/radius/dictionary.ascend
+share/ethereal/radius/dictionary.bay
+share/ethereal/radius/dictionary.bintec
+share/ethereal/radius/dictionary.bristol
+share/ethereal/radius/dictionary.cablelabs
+share/ethereal/radius/dictionary.cabletron
+share/ethereal/radius/dictionary.cisco
+share/ethereal/radius/dictionary.cisco.bbsm
+share/ethereal/radius/dictionary.cisco.vpn3000
+share/ethereal/radius/dictionary.cisco.vpn5000
+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.erx
+share/ethereal/radius/dictionary.extreme
+share/ethereal/radius/dictionary.foundry
+share/ethereal/radius/dictionary.freeradius
+share/ethereal/radius/dictionary.gandalf
+share/ethereal/radius/dictionary.garderos
+share/ethereal/radius/dictionary.gemtek
+share/ethereal/radius/dictionary.itk
+share/ethereal/radius/dictionary.juniper
+share/ethereal/radius/dictionary.karlnet
+share/ethereal/radius/dictionary.livingston
+share/ethereal/radius/dictionary.localweb
+share/ethereal/radius/dictionary.merit
+share/ethereal/radius/dictionary.microsoft
+share/ethereal/radius/dictionary.mikrotik
+share/ethereal/radius/dictionary.navini
+share/ethereal/radius/dictionary.netscreen
+share/ethereal/radius/dictionary.nokia
+share/ethereal/radius/dictionary.nomadix
+share/ethereal/radius/dictionary.propel
+share/ethereal/radius/dictionary.quintum
+share/ethereal/radius/dictionary.redback
+share/ethereal/radius/dictionary.redcreek
+share/ethereal/radius/dictionary.shasta
+share/ethereal/radius/dictionary.shiva
+share/ethereal/radius/dictionary.sonicwall
+share/ethereal/radius/dictionary.springtide
+share/ethereal/radius/dictionary.t_systems_nova
+share/ethereal/radius/dictionary.telebit
+share/ethereal/radius/dictionary.trapeze
+share/ethereal/radius/dictionary.tunnel
+share/ethereal/radius/dictionary.unisphere
+share/ethereal/radius/dictionary.unix
+share/ethereal/radius/dictionary.usr
+share/ethereal/radius/dictionary.valemount
+share/ethereal/radius/dictionary.versanet
+share/ethereal/radius/dictionary.wispr
+share/ethereal/radius/dictionary.xedia
 share/ethereal/tethereal.html
 share/ethereal/text2pcap.html
+@dirrm share/ethereal/radius
 @dirrm share/ethereal/help
 @dirrm share/ethereal/diameter
 @dirrm share/ethereal
diff --git a/net/ethereal/distinfo b/net/ethereal/distinfo
index f3578b6b728..01ea297cd05 100644
--- a/net/ethereal/distinfo
+++ b/net/ethereal/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.39 2005/07/13 10:01:53 drochner Exp $
+$NetBSD: distinfo,v 1.40 2005/07/27 16:44:43 drochner Exp $
 
-SHA1 (ethereal-0.10.11.tar.bz2) = 8ce2f276cd71b6dae23b75496316f72285bab547
-RMD160 (ethereal-0.10.11.tar.bz2) = 3064136913a762f8cad1e4c925c70cce9895f05a
-Size (ethereal-0.10.11.tar.bz2) = 5964016 bytes
+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 (patch-aa) = 0513b971c0af032fc64fc181fbd64d78aef0d044
+SHA1 (patch-ab) = 7f7302cfaf5d78d5ca8c89be45fcd57e9475463a
diff --git a/net/ethereal/patches/patch-ab b/net/ethereal/patches/patch-ab
new file mode 100644
index 00000000000..bb54203a604
--- /dev/null
+++ b/net/ethereal/patches/patch-ab
@@ -0,0 +1,38 @@
+$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; }