Update to 0.10.12 with the usual number of security fixes, new features, and

improved dissector support.  See http://www.ethereal.com/news/item_20050726_01.html for the list of changes.

Security:	See http://www.ethereal.com/news/item_20050726_01.html for
		the list of security fixes in this release

4 files changed, 117 insertions, 5 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 94c45c2a0929..e747068fbf77 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ethereal
-PORTVERSION=	0.10.11
-PORTREVISION=	1
+PORTVERSION=	0.10.12
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.ethereal.com/pub/ethereal/all-versions/ \
 		ftp://gd.tuwien.ac.at/infosys/security/ethereal/all-versions/ \
@@ -37,6 +36,15 @@ MAN1+=			$x.1
 .endif
 .endfor
 
+.for x in dftest randpkt
+.if defined(LITE)
+PLIST_SUB+=	${x:U}="@comment $x not installed"
+CONFIGURE_ARGS+=	--enable-$x=no
+.else
+PLIST_SUB+=	${x:U}=bin/$x
+.endif
+.endfor
+
 .if !defined(WITHOUT_X11)
 USE_X_PREFIX=	yes
 .endif
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index 876207425ec5..8c86d3c78784 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,2 +1,2 @@
-MD5 (ethereal-0.10.11.tar.bz2) = 03aa7fe2cbef9aa0654637cdc60e0458
-SIZE (ethereal-0.10.11.tar.bz2) = 5964016
+MD5 (ethereal-0.10.12.tar.bz2) = 372b60e6eca14b7e1cf3e789207027f7
+SIZE (ethereal-0.10.12.tar.bz2) = 7749174
diff --git a/net/wireshark/files/patch-epan_radius_dict.l b/net/wireshark/files/patch-epan_radius_dict.l
new file mode 100644
index 000000000000..73a6919f632b
--- /dev/null
+++ b/net/wireshark/files/patch-epan_radius_dict.l
@@ -0,0 +1,36 @@
+--- epan/radius_dict.l.orig	Wed Jul 27 14:45:25 2005
++++ epan/radius_dict.l	Wed Jul 27 14:46:35 2005
+@@ -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 rad_encrypt = 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); rad_encrypt = 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>rad_encrypt=1[,]?			{ rad_encrypt=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,rad_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 ,rad_encrypt,has_tag); linenums[include_stack_ptr]++;  BEGIN OUT; }
++<ATTR_W_VENDOR>\n					{ add_attribute(attr_name,attr_id,attr_type,attr_vendor,rad_encrypt,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/wireshark/pkg-plist b/net/wireshark/pkg-plist
index 1b49378f1fe3..98cd564f9c95 100644
--- a/net/wireshark/pkg-plist
+++ b/net/wireshark/pkg-plist
@@ -1,9 +1,10 @@
 %%CAPINFOS%%
-bin/dftest
+%%DFTEST%%
 %%EDITCAP%%
 %%ETHEREAL%%
 %%IDL2ETH%%
 %%MERGECAP%%
+%%RANDPKT%%
 bin/tethereal
 %%TEXT2PCAP%%
 lib/ethereal/plugins/%%PORTVERSION%%/acn.so
@@ -22,6 +23,7 @@ lib/ethereal/plugins/%%PORTVERSION%%/mate.so
 lib/ethereal/plugins/%%PORTVERSION%%/megaco.so
 lib/ethereal/plugins/%%PORTVERSION%%/mgcp.so
 lib/ethereal/plugins/%%PORTVERSION%%/opsi.so
+lib/ethereal/plugins/%%PORTVERSION%%/parlay.so
 lib/ethereal/plugins/%%PORTVERSION%%/pcli.so
 lib/ethereal/plugins/%%PORTVERSION%%/profinet.so
 lib/ethereal/plugins/%%PORTVERSION%%/rdm.so
@@ -29,6 +31,7 @@ lib/ethereal/plugins/%%PORTVERSION%%/rlm.so
 lib/ethereal/plugins/%%PORTVERSION%%/rtnet.so
 lib/ethereal/plugins/%%PORTVERSION%%/rudp.so
 lib/ethereal/plugins/%%PORTVERSION%%/stats_tree.so
+lib/ethereal/plugins/%%PORTVERSION%%/tango.so
 lib/ethereal/plugins/%%PORTVERSION%%/v5ua.so
 lib/ethereal/plugins/%%PORTVERSION%%/xml.so
 lib/libethereal.a
@@ -39,6 +42,9 @@ lib/libwiretap.so
 lib/libwiretap.so.0
 %%DATADIR%%/AUTHORS-SHORT
 %%DATADIR%%/capinfos.html
+%%DATADIR%%/cfilters
+%%DATADIR%%/colorfilters
+%%DATADIR%%/dfilters
 %%DATADIR%%/diameter/dictionary.dtd
 %%DATADIR%%/diameter/dictionary.xml
 %%DATADIR%%/diameter/imscxdx.xml
@@ -58,11 +64,73 @@ lib/libwiretap.so.0
 %%DATADIR%%/idl2eth.html
 %%DATADIR%%/manuf
 %%DATADIR%%/mergecap.html
+%%DATADIR%%/radius/dictionary
+%%DATADIR%%/radius/dictionary.3com
+%%DATADIR%%/radius/dictionary.3gpp
+%%DATADIR%%/radius/dictionary.3gpp2
+%%DATADIR%%/radius/dictionary.acc
+%%DATADIR%%/radius/dictionary.alcatel
+%%DATADIR%%/radius/dictionary.alteon
+%%DATADIR%%/radius/dictionary.altiga
+%%DATADIR%%/radius/dictionary.aptis
+%%DATADIR%%/radius/dictionary.ascend
+%%DATADIR%%/radius/dictionary.bay
+%%DATADIR%%/radius/dictionary.bintec
+%%DATADIR%%/radius/dictionary.bristol
+%%DATADIR%%/radius/dictionary.cablelabs
+%%DATADIR%%/radius/dictionary.cabletron
+%%DATADIR%%/radius/dictionary.cisco
+%%DATADIR%%/radius/dictionary.cisco.bbsm
+%%DATADIR%%/radius/dictionary.cisco.vpn3000
+%%DATADIR%%/radius/dictionary.cisco.vpn5000
+%%DATADIR%%/radius/dictionary.colubris
+%%DATADIR%%/radius/dictionary.columbia_university
+%%DATADIR%%/radius/dictionary.compat
+%%DATADIR%%/radius/dictionary.cosine
+%%DATADIR%%/radius/dictionary.erx
+%%DATADIR%%/radius/dictionary.extreme
+%%DATADIR%%/radius/dictionary.foundry
+%%DATADIR%%/radius/dictionary.freeradius
+%%DATADIR%%/radius/dictionary.gandalf
+%%DATADIR%%/radius/dictionary.garderos
+%%DATADIR%%/radius/dictionary.gemtek
+%%DATADIR%%/radius/dictionary.itk
+%%DATADIR%%/radius/dictionary.juniper
+%%DATADIR%%/radius/dictionary.karlnet
+%%DATADIR%%/radius/dictionary.livingston
+%%DATADIR%%/radius/dictionary.localweb
+%%DATADIR%%/radius/dictionary.merit
+%%DATADIR%%/radius/dictionary.microsoft
+%%DATADIR%%/radius/dictionary.mikrotik
+%%DATADIR%%/radius/dictionary.navini
+%%DATADIR%%/radius/dictionary.netscreen
+%%DATADIR%%/radius/dictionary.nokia
+%%DATADIR%%/radius/dictionary.nomadix
+%%DATADIR%%/radius/dictionary.propel
+%%DATADIR%%/radius/dictionary.quintum
+%%DATADIR%%/radius/dictionary.redback
+%%DATADIR%%/radius/dictionary.redcreek
+%%DATADIR%%/radius/dictionary.shasta
+%%DATADIR%%/radius/dictionary.shiva
+%%DATADIR%%/radius/dictionary.sonicwall
+%%DATADIR%%/radius/dictionary.springtide
+%%DATADIR%%/radius/dictionary.t_systems_nova
+%%DATADIR%%/radius/dictionary.telebit
+%%DATADIR%%/radius/dictionary.trapeze
+%%DATADIR%%/radius/dictionary.tunnel
+%%DATADIR%%/radius/dictionary.unisphere
+%%DATADIR%%/radius/dictionary.unix
+%%DATADIR%%/radius/dictionary.usr
+%%DATADIR%%/radius/dictionary.valemount
+%%DATADIR%%/radius/dictionary.versanet
+%%DATADIR%%/radius/dictionary.wispr
+%%DATADIR%%/radius/dictionary.xedia
 %%DATADIR%%/tethereal.html
 %%DATADIR%%/text2pcap.html
 @dirrm lib/ethereal/plugins/%%PORTVERSION%%
 @dirrm lib/ethereal/plugins
 @dirrm lib/ethereal
+@dirrm %%DATADIR%%/radius
 @dirrm %%DATADIR%%/diameter
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%