Pullup ticket 2015 - requested by tron

security update for wireshark

Revisions pulled up:
- pkgsrc/net/wireshark/Makefile				1.6
- pkgsrc/net/wireshark/PLIST				1.5
- pkgsrc/net/wireshark/distinfo				1.5, 1.6
- pkgsrc/net/wireshark/files/capture_airpcap_16.xpm	removed
- pkgsrc/net/wireshark/files/capture_capture_16.xpm	removed
- pkgsrc/net/wireshark/files/capture_details_16.xpm	removed
- pkgsrc/net/wireshark/files/capture_ethernet_16.xpm	removed
- pkgsrc/net/wireshark/files/capture_prepare_16.xpm	removed
- pkgsrc/net/wireshark/patches/patch-aa			1.6

   Module Name:		pkgsrc
   Committed By:	tron
   Date:		Sat Feb  3 18:06:37 UTC 2007

   Modified Files:
   	pkgsrc/net/wireshark: Makefile PLIST distinfo
   Removed Files:
   	pkgsrc/net/wireshark/files: capture_airpcap_16.xpm
   	    capture_capture_16.xpm capture_details_16.xpm
   	    capture_ethernet_16.xpm capture_prepare_16.xpm
   	pkgsrc/net/wireshark/patches: patch-aa

   Log Message:
   Update "wireshark" package to version 0.99.5.
   Changes since version 0.99.4:
   - Bug Fixes
      o The TCP dissector could hang or crash while reassembling HTTP
        packets.
        Versions affected: 0.99.2 to 0.99.4
        CVE-2007-0459
      o The HTTP dissector could crash.
        Versions affected: 0.99.3 to 0.99.4
        CVE-2007-0458
      o On some systems, the IEEE 802.11 dissector could crash.
        Versions affected: 0.10.14 to 0.99.4
        CVE-2007-0457
      o On some systems, the LLT dissector could crash.
        Versions affected: 0.99.3 to 0.99.4
        CVE-2007-0456
      The following bugs have been fixed:
      o The end of HTTP chunked encoding wasn't being displayed.
      o The Follow TCP Stream window could omit characters.
      o Opening a flow graph could crash Wireshark.
      o Follow TCP Stream would sometimes get the direction wrong.
      o The foreground text in the coloring rules editor was always
        black.
      o The CSV export format was incorrect.
      o On some Windows systems Wireshark could take a long time to
        start up.
      o Malformed UDLD packets could cause an exception.
      o The ISUP statistics report could overflow a buffer and crash
        when displaying IPv6 addresses.
   -  New and Updated Features
      o Decryption support for WPA/WPA2 and SNMPv3 has been added. The
        TDS / MS SQL dissector now de-obfuscates passwords.
      o 64-bit file handling has been improved.
      o The Find function now selects the corresponding packet detail
        item. Find functionality has been added to the TCP and SSL
        stream dialogs.
      o Main window keyboard navigation has been improved.
      o ASN.1 BER-encoded files can now be dissected according to a
        user-specified syntax.
   - New Protocol Support
     DMP, Homeplug (INT51X1), NBD, OMAPI, PKCS#12, RGMP, Roofnet, STUN
     v2
   - Updated Protocol Support
     2dparityfec, ACN, AIM, AMR, ANSI 637, ANSI A, ANSI MAP, ARP, ASN.1
     BER, ASN.1 PER, BACapp, BPDU, CAMEL, DCERPC (DCERPC, EFS,
     EVENTLOG, NSPI, PN-IO, WINREG), DCOM CBA, DCP, DHCP, DHCPv6, DMP,
     DNS, E.164, EAP, EPL, ETSI DCP, FCP, GIOP, GSM A, H.245, H.248,
     HPSW, HTTP, ICMP, ICMPv6, IEEE 802.11, IMAP, INAP, IPMI, IPsec,
     IRC, ISAKMP, iSCSI, ISIS LSP, IuUP, K12, Kerberos, LDAP, LLDP,
     MEGACO, MGCP, MIME Multipart, MMS, MMSE, MSRP, MySQL, NetFlow,
     NFS, NTLMSSP, NTP, OSPF, PN-PTCP, PPPoE, Q.931, Radiotap, RADIUS,
     RPC, RSVP, RTCP, S4406, SCCP, SCSI, SDP, SES, sFlow, SIGCOMP, SIP,
     SIR, Skinny, SMB (SMB, NETLOGON), SMTP, SNMP, SPNEGO, SSL, T.38,
     TCP, TDS, text/media, TIPC, UDLD, UDP Lite, UDP, UMA, UMTS FP,
     USB, VNC, WBXML, WLCCP, WSP, X.411, X.420, XML, XOT, YMSG
   - New and Updated Capture File Support
     Catapult DCT2000, Netttl, Windows Sniffer / NetXray
---
   Module Name:		pkgsrc
   Committed By:	tron
   Date:		Wed Feb  7 15:18:23 UTC 2007

   Modified Files:
   	pkgsrc/net/wireshark: Makefile distinfo
   Added Files:
   	pkgsrc/net/wireshark/patches: patch-aa

   Log Message:
   Stop the bundled LALR(1) parser generator "lemon" for writing bogus
   line numbers into generated ".c" files. The GCC 3.3.3 distributed with
   NetBSD-i386 3.3.1 can now build this package without problems.

9 files changed, 27 insertions, 1004 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 201c59ceb8e..4d1d1451f20 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2006/11/01 12:59:42 tron Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2007/02/07 16:05:21 salo Exp $
 
-DISTNAME=		wireshark-0.99.4
+DISTNAME=		wireshark-0.99.5
 CATEGORIES=		net
 MASTER_SITES=		http://www.wireshark.org/download/src/ \
 			${MASTER_SITE_SOURCEFORGE:=wireshark/}
@@ -13,7 +13,7 @@ COMMENT=		Network protocol analyzer
 CONFLICTS+=		ethereal-[0-9]*
 
 USE_LANGUAGES+=		c c++
-USE_TOOLS+=		perl pkg-config
+USE_TOOLS+=		gmake perl pkg-config
 
 USE_LIBTOOL=		YES
 SHLIBTOOL_OVERRIDE=	# empty
@@ -37,15 +37,6 @@ PTHREAD_OPTS+=		require
 USE_BUILTIN.libpcap=	no
 .endif
 
-# Work arround for files missing in the 0.99.3 release archive.
-# This and "${FILESDIR}/*.xpm" should be removed after the next update.
-post-extract:
-	${CP} ${FILESDIR}/*.xpm ${WRKSRC}/image/toolbar
-
-# XXX avoid rebuild after dissector patch
-pre-build:
-	${TOUCH} ${WRKSRC}/epan/dissectors/register.c
-
 SUBST_CLASSES+=		shell
 SUBST_STAGE.shell=	post-build
 SUBST_MESSAGE.shell=	Replacing @SHELL@ with a proper shell.
diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST
index 8ef09c511e4..434e15b1492 100644
--- a/net/wireshark/PLIST
+++ b/net/wireshark/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/11/01 12:59:42 tron Exp $
+@comment $NetBSD: PLIST,v 1.4.2.1 2007/02/07 16:05:21 salo Exp $
 bin/capinfos
 bin/dftest
 bin/dumpcap
@@ -11,7 +11,6 @@ bin/tshark
 bin/wireshark
 lib/libwireshark.la
 lib/libwiretap.la
-lib/wireshark/plugins/${PKGVERSION}/acn.la
 lib/wireshark/plugins/${PKGVERSION}/agentx.la
 lib/wireshark/plugins/${PKGVERSION}/artnet.la
 lib/wireshark/plugins/${PKGVERSION}/asn1.la
@@ -60,9 +59,11 @@ share/wireshark/diameter/dictionary.xml
 share/wireshark/diameter/imscxdx.xml
 share/wireshark/diameter/mobileipv4.xml
 share/wireshark/diameter/nasreq.xml
+share/wireshark/diameter/sip.xml
 share/wireshark/diameter/sunping.xml
 share/wireshark/dtds/dc.dtd
 share/wireshark/dtds/itunes.dtd
+share/wireshark/dtds/mscml.dtd
 share/wireshark/dtds/pocsettings.dtd
 share/wireshark/dtds/presence.dtd
 share/wireshark/dtds/reginfo.dtd
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index f2ab6699bb1..118d5348b9f 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2006/11/01 12:59:42 tron Exp $
+$NetBSD: distinfo,v 1.4.2.1 2007/02/07 16:05:21 salo Exp $
 
-SHA1 (wireshark-0.99.4.tar.bz2) = 696216d794b418da3cb0a1829281ef65bf3e64ff
-RMD160 (wireshark-0.99.4.tar.bz2) = 6bf940af951ddfcf66157a8cb299e6342dd3f955
-Size (wireshark-0.99.4.tar.bz2) = 10472441 bytes
-SHA1 (patch-aa) = b7fe7dac7bf4cf663f59cf0f5ae69bb8fdaf088f
+SHA1 (wireshark-0.99.5.tar.bz2) = ec9a07f13d5cda3d310d8c8900362f7cb96f4042
+RMD160 (wireshark-0.99.5.tar.bz2) = 1b3f7bb8e2c73a945fff86fb8ab2aa79481ba809
+Size (wireshark-0.99.5.tar.bz2) = 11007039 bytes
+SHA1 (patch-aa) = c05ecf25e24bc0c7a7c0a037364b416963736ff3
diff --git a/net/wireshark/files/capture_airpcap_16.xpm b/net/wireshark/files/capture_airpcap_16.xpm
deleted file mode 100644
index f55396cad46..00000000000
--- a/net/wireshark/files/capture_airpcap_16.xpm
+++ /dev/null
@@ -1,275 +0,0 @@
-/* XPM */
-static char * capture_airpcap_16_xpm[] = {
-"16 16 256 2",
-"  	c None",
-". 	c #800000",
-"+ 	c #008000",
-"@ 	c #808000",
-"# 	c #000080",
-"$ 	c #800080",
-"% 	c #008080",
-"& 	c #C0C0C0",
-"* 	c #C0DCC0",
-"= 	c #A6CAF0",
-"- 	c #040404",
-"; 	c #080808",
-"> 	c #0C0C0C",
-", 	c #111111",
-"' 	c #161616",
-") 	c #1C1C1C",
-"! 	c #222222",
-"~ 	c #292929",
-"{ 	c #555555",
-"] 	c #4D4D4D",
-"^ 	c #424242",
-"/ 	c #393939",
-"( 	c #FF7C80",
-"_ 	c #FF5050",
-": 	c #D60093",
-"< 	c #CCECFF",
-"[ 	c #EFD6C6",
-"} 	c #E7E7D6",
-"| 	c #ADA990",
-"1 	c #330000",
-"2 	c #660000",
-"3 	c #990000",
-"4 	c #CC0000",
-"5 	c #003300",
-"6 	c #333300",
-"7 	c #663300",
-"8 	c #993300",
-"9 	c #CC3300",
-"0 	c #FF3300",
-"a 	c #006600",
-"b 	c #336600",
-"c 	c #666600",
-"d 	c #996600",
-"e 	c #CC6600",
-"f 	c #FF6600",
-"g 	c #009900",
-"h 	c #339900",
-"i 	c #669900",
-"j 	c #999900",
-"k 	c #CC9900",
-"l 	c #FF9900",
-"m 	c #00CC00",
-"n 	c #33CC00",
-"o 	c #66CC00",
-"p 	c #99CC00",
-"q 	c #CCCC00",
-"r 	c #FFCC00",
-"s 	c #66FF00",
-"t 	c #99FF00",
-"u 	c #CCFF00",
-"v 	c #000033",
-"w 	c #330033",
-"x 	c #660033",
-"y 	c #990033",
-"z 	c #CC0033",
-"A 	c #FF0033",
-"B 	c #003333",
-"C 	c #333333",
-"D 	c #663333",
-"E 	c #993333",
-"F 	c #CC3333",
-"G 	c #FF3333",
-"H 	c #006633",
-"I 	c #336633",
-"J 	c #666633",
-"K 	c #996633",
-"L 	c #CC6633",
-"M 	c #FF6633",
-"N 	c #009933",
-"O 	c #339933",
-"P 	c #669933",
-"Q 	c #999933",
-"R 	c #CC9933",
-"S 	c #FF9933",
-"T 	c #00CC33",
-"U 	c #33CC33",
-"V 	c #66CC33",
-"W 	c #99CC33",
-"X 	c #CCCC33",
-"Y 	c #FFCC33",
-"Z 	c #33FF33",
-"` 	c #66FF33",
-" .	c #99FF33",
-"..	c #CCFF33",
-"+.	c #FFFF33",
-"@.	c #000066",
-"#.	c #330066",
-"$.	c #660066",
-"%.	c #990066",
-"&.	c #CC0066",
-"*.	c #FF0066",
-"=.	c #003366",
-"-.	c #333366",
-";.	c #663366",
-">.	c #993366",
-",.	c #CC3366",
-"'.	c #FF3366",
-").	c #006666",
-"!.	c #336666",
-"~.	c #666666",
-"{.	c #996666",
-"].	c #CC6666",
-"^.	c #009966",
-"/.	c #339966",
-"(.	c #669966",
-"_.	c #999966",
-":.	c #CC9966",
-"<.	c #FF9966",
-"[.	c #00CC66",
-"}.	c #33CC66",
-"|.	c #99CC66",
-"1.	c #CCCC66",
-"2.	c #FFCC66",
-"3.	c #00FF66",
-"4.	c #33FF66",
-"5.	c #99FF66",
-"6.	c #CCFF66",
-"7.	c #FF00CC",
-"8.	c #CC00FF",
-"9.	c #009999",
-"0.	c #993399",
-"a.	c #990099",
-"b.	c #CC0099",
-"c.	c #000099",
-"d.	c #333399",
-"e.	c #660099",
-"f.	c #CC3399",
-"g.	c #FF0099",
-"h.	c #006699",
-"i.	c #336699",
-"j.	c #663399",
-"k.	c #996699",
-"l.	c #CC6699",
-"m.	c #FF3399",
-"n.	c #339999",
-"o.	c #669999",
-"p.	c #999999",
-"q.	c #CC9999",
-"r.	c #FF9999",
-"s.	c #00CC99",
-"t.	c #33CC99",
-"u.	c #66CC66",
-"v.	c #99CC99",
-"w.	c #CCCC99",
-"x.	c #FFCC99",
-"y.	c #00FF99",
-"z.	c #33FF99",
-"A.	c #66CC99",
-"B.	c #99FF99",
-"C.	c #CCFF99",
-"D.	c #FFFF99",
-"E.	c #0000CC",
-"F.	c #330099",
-"G.	c #6600CC",
-"H.	c #9900CC",
-"I.	c #CC00CC",
-"J.	c #003399",
-"K.	c #3333CC",
-"L.	c #6633CC",
-"M.	c #9933CC",
-"N.	c #CC33CC",
-"O.	c #FF33CC",
-"P.	c #0066CC",
-"Q.	c #3366CC",
-"R.	c #666699",
-"S.	c #9966CC",
-"T.	c #CC66CC",
-"U.	c #FF6699",
-"V.	c #0099CC",
-"W.	c #3399CC",
-"X.	c #6699CC",
-"Y.	c #9999CC",
-"Z.	c #CC99CC",
-"`.	c #FF99CC",
-" +	c #00CCCC",
-".+	c #33CCCC",
-"++	c #66CCCC",
-"@+	c #99CCCC",
-"#+	c #CCCCCC",
-"$+	c #FFCCCC",
-"%+	c #00FFCC",
-"&+	c #33FFCC",
-"*+	c #66FF99",
-"=+	c #99FFCC",
-"-+	c #CCFFCC",
-";+	c #FFFFCC",
-">+	c #3300CC",
-",+	c #6600FF",
-"'+	c #9900FF",
-")+	c #0033CC",
-"!+	c #3333FF",
-"~+	c #6633FF",
-"{+	c #9933FF",
-"]+	c #CC33FF",
-"^+	c #FF33FF",
-"/+	c #0066FF",
-"(+	c #3366FF",
-"_+	c #6666CC",
-":+	c #9966FF",
-"<+	c #CC66FF",
-"[+	c #FF66CC",
-"}+	c #0099FF",
-"|+	c #3399FF",
-"1+	c #6699FF",
-"2+	c #9999FF",
-"3+	c #CC99FF",
-"4+	c #FF99FF",
-"5+	c #00CCFF",
-"6+	c #33CCFF",
-"7+	c #66CCFF",
-"8+	c #99CCFF",
-"9+	c #CCCCFF",
-"0+	c #FFCCFF",
-"a+	c #33FFFF",
-"b+	c #66FFCC",
-"c+	c #99FFFF",
-"d+	c #CCFFFF",
-"e+	c #FF6666",
-"f+	c #66FF66",
-"g+	c #FFFF66",
-"h+	c #6666FF",
-"i+	c #FF66FF",
-"j+	c #66FFFF",
-"k+	c #A50021",
-"l+	c #5F5F5F",
-"m+	c #777777",
-"n+	c #868686",
-"o+	c #969696",
-"p+	c #CBCBCB",
-"q+	c #B2B2B2",
-"r+	c #D7D7D7",
-"s+	c #DDDDDD",
-"t+	c #E3E3E3",
-"u+	c #EAEAEA",
-"v+	c #F1F1F1",
-"w+	c #F8F8F8",
-"x+	c #FFFBF0",
-"y+	c #A0A0A4",
-"z+	c #808080",
-"A+	c #FF0000",
-"B+	c #00FF00",
-"C+	c #FFFF00",
-"D+	c #0000FF",
-"E+	c #FF00FF",
-"F+	c #00FFFF",
-"G+	c #FFFFFF",
-"                                ",
-"      5.                5.      ",
-"5.    + 5.            5.+     5.",
-"+ 5.  a 5.    n+n+    5.a   5.+ ",
-"+ 5.  a 5.  n+& & n+  5.a   5.+ ",
-"+ 5.  a 5.  n+#+& n+  5.a   5.+ ",
-"+ 5.  a 5.    n+n+    5.a   5.+ ",
-"5.    + 5.    o+n+    5.+     5.",
-"      5.      & n+      5.      ",
-"              & n+              ",
-"              & n+              ",
-"              & n+              ",
-"              & n+              ",
-"              & n+              ",
-"              & n+              ",
-"                                "};
diff --git a/net/wireshark/files/capture_capture_16.xpm b/net/wireshark/files/capture_capture_16.xpm
deleted file mode 100644
index ef2a0f573f4..00000000000
--- a/net/wireshark/files/capture_capture_16.xpm
+++ /dev/null
@@ -1,170 +0,0 @@
-/* XPM */
-static char * capture_capture_16_xpm[] = {
-"16 16 151 2",
-"  	c None",
-". 	c #7F7F7F",
-"+ 	c #A9A9A9",
-"@ 	c #8E8E8E",
-"# 	c #373737",
-"$ 	c #545454",
-"% 	c #3D3D3D",
-"& 	c #F1F1F1",
-"* 	c #C2C2C2",
-"= 	c #A4A4A4",
-"- 	c #121212",
-"; 	c #212121",
-"> 	c #E9E9E9",
-", 	c #C7C7C7",
-"' 	c #505050",
-") 	c #979797",
-"! 	c #595958",
-"~ 	c #181818",
-"{ 	c #1F1F1F",
-"] 	c #A0A0A0",
-"^ 	c #323232",
-"/ 	c #5F5E5B",
-"( 	c #5D5C59",
-"_ 	c #1D1C1B",
-": 	c #7A7A7A",
-"< 	c #838383",
-"[ 	c #1E2018",
-"} 	c #7F847C",
-"| 	c #3B3C3B",
-"1 	c #000000",
-"2 	c #353535",
-"3 	c #696865",
-"4 	c #6D6B65",
-"5 	c #6B6964",
-"6 	c #54534D",
-"7 	c #282828",
-"8 	c #828282",
-"9 	c #3D4536",
-"0 	c #566147",
-"a 	c #535D44",
-"b 	c #5E6B57",
-"c 	c #30322F",
-"d 	c #313131",
-"e 	c #91908C",
-"f 	c #595854",
-"g 	c #737270",
-"h 	c #73726C",
-"i 	c #131211",
-"j 	c #808080",
-"k 	c #5E5F55",
-"l 	c #57624E",
-"m 	c #636958",
-"n 	c #5A6852",
-"o 	c #5A5D59",
-"p 	c #686868",
-"q 	c #5B5A56",
-"r 	c #7A7772",
-"s 	c #7F7D77",
-"t 	c #41403C",
-"u 	c #464646",
-"v 	c #7E7A6B",
-"w 	c #575E4B",
-"x 	c #7A7862",
-"y 	c #525D4A",
-"z 	c #686A66",
-"A 	c #B4B4B4",
-"B 	c #4D4D4D",
-"C 	c #0F0F0E",
-"D 	c #454545",
-"E 	c #7E7E7E",
-"F 	c #7B564E",
-"G 	c #534C3D",
-"H 	c #785042",
-"I 	c #4E5947",
-"J 	c #5B5D59",
-"K 	c #E6E6E6",
-"L 	c #E5E5E5",
-"M 	c #989898",
-"N 	c #DCDCDC",
-"O 	c #E3E3E3",
-"P 	c #7D7D7D",
-"Q 	c #3C4338",
-"R 	c #3D4836",
-"S 	c #424A3C",
-"T 	c #3B3D39",
-"U 	c #080A07",
-"V 	c #5E605E",
-"W 	c #51524F",
-"X 	c #455137",
-"Y 	c #687355",
-"Z 	c #656B55",
-"` 	c #5F6759",
-" .	c #393B38",
-"..	c #242B21",
-"+.	c #6B725C",
-"@.	c #53503F",
-"#.	c #565546",
-"$.	c #555445",
-"%.	c #474533",
-"&.	c #313B28",
-"*.	c #445036",
-"=.	c #5D6B49",
-"-.	c #6F7C64",
-";.	c #6A6C68",
-">.	c #6D6D6D",
-",.	c #615F5D",
-"'.	c #273024",
-").	c #73805E",
-"!.	c #4A4C36",
-"~.	c #434632",
-"{.	c #56583E",
-"].	c #4B4D36",
-"^.	c #484A35",
-"/.	c #5C6647",
-"(.	c #6A7652",
-"_.	c #60704C",
-":.	c #667359",
-"<.	c #4E514A",
-"[.	c #585957",
-"}.	c #525352",
-"|.	c #3F3F3F",
-"1.	c #313C2D",
-"2.	c #5A7051",
-"3.	c #6E7655",
-"4.	c #5C684A",
-"5.	c #6B7352",
-"6.	c #5A6547",
-"7.	c #68704F",
-"8.	c #616E4B",
-"9.	c #6E7954",
-"0.	c #66734E",
-"a.	c #37412C",
-"b.	c #1D2317",
-"c.	c #2C302A",
-"d.	c #242423",
-"e.	c #364430",
-"f.	c #B3AB7D",
-"g.	c #8B8E66",
-"h.	c #B3AA7C",
-"i.	c #898D64",
-"j.	c #B2A97B",
-"k.	c #898B63",
-"l.	c #B2A87B",
-"m.	c #868760",
-"n.	c #171D12",
-"o.	c #3B3829",
-"p.	c #2D2E21",
-"q.	c #2D2D20",
-"r.	c #3B3828",
-"s.	c #2C2C1F",
-"t.	c #2A2A2A",
-"                                ",
-"  . + + + + @ #           $ %   ",
-"  + & & & & * = -         ;     ",
-"  + > , ' ' ) ! ~         {     ",
-"  + ] ^ / ( _ : < [     } |     ",
-"1 + 2 3 4 5 6 7 8 9 0 a b c     ",
-"1 + d e f g h i j k l m n o     ",
-"1 + p q r s t u j v w x y z     ",
-"1 + A B C C D = E F G H I J     ",
-"1 + K L M M N O P Q R S I T     ",
-"U V E E P P P P W X Y Z `  .    ",
-"..+.@.@.#.$.%.&.*.=.-.;.>.,.@ . ",
-"'.).!.~.{.].^./.(._.:.<.[.}.p |.",
-"1.2.3.4.5.6.7.8.9.0.a.b.c.d.    ",
-"  e.f.g.h.i.j.k.l.m.n.    {     ",
-"    o.p.o.p.o.q.r.s.      t.    "};
diff --git a/net/wireshark/files/capture_details_16.xpm b/net/wireshark/files/capture_details_16.xpm
deleted file mode 100644
index 41d025fb295..00000000000
--- a/net/wireshark/files/capture_details_16.xpm
+++ /dev/null
@@ -1,150 +0,0 @@
-/* XPM */
-static char * capture_details_16_xpm[] = {
-"16 16 131 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #AAAAAA",
-"@ 	c #8E8E8E",
-"# 	c #373737",
-"$ 	c #FEFEFE",
-"% 	c #F4F4F4",
-"& 	c #F8F8F8",
-"* 	c #F5F5F5",
-"= 	c #FFFFFF",
-"- 	c #FBFBFB",
-"; 	c #F9F9F9",
-"> 	c #C2C2C2",
-", 	c #A4A4A4",
-"' 	c #121212",
-") 	c #FDFDFC",
-"! 	c #FBFBFA",
-"~ 	c #F8F8F7",
-"{ 	c #F6F6F5",
-"] 	c #B6B6B6",
-"^ 	c #616160",
-"/ 	c #181818",
-"( 	c #F0F0F0",
-"_ 	c #ECECEC",
-": 	c #F1F1F1",
-"< 	c #E4E4E4",
-"[ 	c #DCDCDC",
-"} 	c #EEEEED",
-"| 	c #E8E8E7",
-"1 	c #ECECEB",
-"2 	c #6A6A6A",
-"3 	c #DEDEDE",
-"4 	c #555555",
-"5 	c #BFBFBF",
-"6 	c #B9B9B8",
-"7 	c #535353",
-"8 	c #C3C3C2",
-"9 	c #E0E0DF",
-"0 	c #DEDEDD",
-"a 	c #DEDEDC",
-"b 	c #D9D9D8",
-"c 	c #E4E4E3",
-"d 	c #6D6D6D",
-"e 	c #545454",
-"f 	c #575757",
-"g 	c #9F9F9F",
-"h 	c #393938",
-"i 	c #D0D0CE",
-"j 	c #E3E3E2",
-"k 	c #DFDFDD",
-"l 	c #E2E2E0",
-"m 	c #E4E4E2",
-"n 	c #6C6C6C",
-"o 	c #FDFDFD",
-"p 	c #DFDFDF",
-"q 	c #C1C1C1",
-"r 	c #303030",
-"s 	c #C5C5C3",
-"t 	c #DFDFDE",
-"u 	c #DBDBD9",
-"v 	c #E1E1DE",
-"w 	c #D3D3D2",
-"x 	c #595959",
-"y 	c #454545",
-"z 	c #8B8B8A",
-"A 	c #C8C8C7",
-"B 	c #D1D1CF",
-"C 	c #D0D0CD",
-"D 	c #D6D6D4",
-"E 	c #6C6C6B",
-"F 	c #FAFAFA",
-"G 	c #EBEBEA",
-"H 	c #717170",
-"I 	c #969696",
-"J 	c #4E4E4E",
-"K 	c #BABAB8",
-"L 	c #DCDCDA",
-"M 	c #C9C9C7",
-"N 	c #C8C8C6",
-"O 	c #CBCBC9",
-"P 	c #D6D6D3",
-"Q 	c #F9F9F8",
-"R 	c #E7E7E5",
-"S 	c #8C8C8C",
-"T 	c #545453",
-"U 	c #C0C0BE",
-"V 	c #D1D1CE",
-"W 	c #CECECB",
-"X 	c #D2D2CE",
-"Y 	c #D4D4D0",
-"Z 	c #5D5D5D",
-"` 	c #B7B7B7",
-" .	c #414141",
-"..	c #868684",
-"+.	c #C4C4C1",
-"@.	c #CDCDCA",
-"#.	c #CACAC7",
-"$.	c #6B6B6A",
-"%.	c #4C4C4B",
-"&.	c #282827",
-"*.	c #9A9A97",
-"=.	c #C0C0BD",
-"-.	c #CECECA",
-";.	c #CCCCC8",
-">.	c #F5F5F4",
-",.	c #4B4B4A",
-"'.	c #2F2F2E",
-").	c #333332",
-"!.	c #252525",
-"~.	c #92928F",
-"{.	c #CFCFCB",
-"].	c #CDCDC9",
-"^.	c #CCCCC7",
-"/.	c #B1B1AF",
-"(.	c #2E2E2E",
-"_.	c #595958",
-":.	c #787876",
-"<.	c #6B6B69",
-"[.	c #9D9D9A",
-"}.	c #B6B6B2",
-"|.	c #B5B5B1",
-"1.	c #B4B4B0",
-"2.	c #5C5C5B",
-"3.	c #424242",
-"4.	c #3C3C3B",
-"5.	c #323231",
-"6.	c #222221",
-"7.	c #2C2C2C",
-"8.	c #2D2D2D",
-"9.	c #2C2C2B",
-"0.	c #1B1B1A",
-"                                ",
-"  . + + + + + + + + + + @ #     ",
-"  . $ % & * = = = $ - ; > , '   ",
-"  . $ % & * = = ) ! ~ { ] ^ /   ",
-"  . = ( _ _ ( : < [ } | } 1 2   ",
-"  . = 3 4 5 6 7 8 9 0 a b c d   ",
-"  . $ e + f d g h i j k l m n   ",
-"  . o 7 p g g q r s t u a v n   ",
-"  . - w x [ q y z A a B C D E   ",
-"  . F G H + I J K L M N O P E   ",
-"  . Q R S + S T U P V W X Y E   ",
-"  . ~ N Z [ `  ...+.@.#.W C $.  ",
-"  . { %.p g g q &.*.=.#.-.;.E   ",
-"  . >.,.+ '.).g !.~.{.].^.^.$.  ",
-"  . c /.(._.:.'.<.[.}.}.|.1.2.  ",
-"  . 3.4.(.&.5.'.6.7.(.(.8.9.0.  "};
diff --git a/net/wireshark/files/capture_ethernet_16.xpm b/net/wireshark/files/capture_ethernet_16.xpm
deleted file mode 100644
index 260b9ea03f6..00000000000
--- a/net/wireshark/files/capture_ethernet_16.xpm
+++ /dev/null
@@ -1,163 +0,0 @@
-/* XPM */
-static char * capture_ethernet_16_xpm[] = {
-"16 16 144 2",
-"  	c None",
-". 	c #6A6A6A",
-"+ 	c #3F3F3F",
-"@ 	c #565656",
-"# 	c #535353",
-"$ 	c #4B5A45",
-"% 	c #7C9773",
-"& 	c #7B906D",
-"* 	c #80916D",
-"= 	c #748766",
-"- 	c #7D8E6A",
-"; 	c #708362",
-"> 	c #6D7B5B",
-", 	c #75815E",
-"' 	c #718060",
-") 	c #697756",
-"! 	c #6F7B5C",
-"~ 	c #5C6E52",
-"{ 	c #4B523F",
-"] 	c #576B50",
-"^ 	c #959D92",
-"/ 	c #AAAEA9",
-"( 	c #8F968B",
-"_ 	c #A3A7A1",
-": 	c #8B9388",
-"< 	c #676E64",
-"[ 	c #525D42",
-"} 	c #727B6D",
-"| 	c #47543F",
-"1 	c #6F746D",
-"2 	c #4C5C42",
-"3 	c #6C6C6C",
-"4 	c #444D3B",
-"5 	c #909A8D",
-"6 	c #A5A5A5",
-"7 	c #BDBDBD",
-"8 	c #ABABAB",
-"9 	c #9A9A9A",
-"0 	c #666765",
-"a 	c #575E4C",
-"b 	c #98987A",
-"c 	c #3F4831",
-"d 	c #979076",
-"e 	c #425039",
-"f 	c #777777",
-"g 	c #444E3C",
-"h 	c #6D7B68",
-"i 	c #888888",
-"j 	c #868686",
-"k 	c #737373",
-"l 	c #6D6D6D",
-"m 	c #636363",
-"n 	c #464845",
-"o 	c #3F4836",
-"p 	c #957665",
-"q 	c #3B3A28",
-"r 	c #94655A",
-"s 	c #3F4C36",
-"t 	c #6F6F6F",
-"u 	c #44523F",
-"v 	c #506349",
-"w 	c #454D41",
-"x 	c #555A53",
-"y 	c #3A4138",
-"z 	c #515550",
-"A 	c #363C34",
-"B 	c #343932",
-"C 	c #464E37",
-"D 	c #4B5844",
-"E 	c #384430",
-"F 	c #434B3E",
-"G 	c #4F4F4F",
-"H 	c #475642",
-"I 	c #6B7F5E",
-"J 	c #566246",
-"K 	c #585F44",
-"L 	c #454E37",
-"M 	c #4B533B",
-"N 	c #495039",
-"O 	c #53593F",
-"P 	c #61694A",
-"Q 	c #5F6D4B",
-"R 	c #616C4A",
-"S 	c #6F755F",
-"T 	c #586151",
-"U 	c #4A4A4A",
-"V 	c #455440",
-"W 	c #848F71",
-"X 	c #606549",
-"Y 	c #79785F",
-"Z 	c #7E8065",
-"` 	c #5D614D",
-" .	c #616247",
-"..	c #4F5E40",
-"+.	c #566847",
-"@.	c #5E6E4B",
-"#.	c #76856C",
-"$.	c #616161",
-"%.	c #585858",
-"&.	c #787775",
-"*.	c #B3B3B3",
-"=.	c #666666",
-"-.	c #3F4C3A",
-";.	c #6F7B59",
-">.	c #3D402E",
-",.	c #484833",
-"'.	c #4F513A",
-").	c #494A34",
-"!.	c #41422F",
-"~.	c #5B6647",
-"{.	c #6B7752",
-"].	c #60704C",
-"^.	c #707C5D",
-"/.	c #4B4B4B",
-"(.	c #474747",
-"_.	c #646464",
-":.	c #6E6E6E",
-"<.	c #1F1F1F",
-"[.	c #5B7151",
-"}.	c #6B7654",
-"|.	c #687251",
-"1.	c #687250",
-"2.	c #66714F",
-"3.	c #66704F",
-"4.	c #6A7551",
-"5.	c #6C7853",
-"6.	c #65724D",
-"7.	c #2F3B26",
-"8.	c #1E2618",
-"9.	c #11150D",
-"0.	c #525252",
-"a.	c #33402D",
-"b.	c #A5A175",
-"c.	c #A4A074",
-"d.	c #A39F73",
-"e.	c #A39E72",
-"f.	c #A29E72",
-"g.	c #A09B6F",
-"h.	c #131910",
-"i.	c #3F402E",
-"j.	c #3E3F2D",
-"k.	c #3E3E2C",
-"l.	c #3D3C2B",
-"m.	c #3C3C3C",
-"                                ",
-"                          . +   ",
-"                          @     ",
-"                          #     ",
-"                          #     ",
-"$ % & * = - ; > , ' ) ! ~ #     ",
-"{ ] ^ / ( _ : < [ } | 1 2 3     ",
-"4 5 6 7 8 6 9 0 a b c d e f     ",
-"g h i j k l m n o p q r s t     ",
-"u v w x y z A B C D E F s G     ",
-"H I J K L M N O P Q R S T U     ",
-"V W X Y Z `  ...+.@.#.$.%.&.*.=.",
-"-.;.>.,.'.).!.~.{.].^./.(._.:.<.",
-"  [.}.|.1.2.3.4.5.6.7.8.9.0.    ",
-"  a.b.c.c.d.e.e.f.g.h.    #     ",
-"    i.j.j.j.k.k.k.l.      m.    "};
diff --git a/net/wireshark/files/capture_prepare_16.xpm b/net/wireshark/files/capture_prepare_16.xpm
deleted file mode 100644
index 084d4bb6d03..00000000000
--- a/net/wireshark/files/capture_prepare_16.xpm
+++ /dev/null
@@ -1,178 +0,0 @@
-/* XPM */
-static char * capture_prepare_16_xpm[] = {
-"16 16 159 2",
-"  	c None",
-". 	c #808080",
-"+ 	c #000000",
-"@ 	c #353535",
-"# 	c #444444",
-"$ 	c #545454",
-"% 	c #3D3D3D",
-"& 	c #AAAAAA",
-"* 	c #505050",
-"= 	c #4B4B4B",
-"- 	c #212121",
-"; 	c #494949",
-"> 	c #F6F6F6",
-", 	c #EFEFEF",
-"' 	c #A1A1A1",
-") 	c #272727",
-"! 	c #1F1F1F",
-"~ 	c #555555",
-"{ 	c #E1E1E1",
-"] 	c #0F100E",
-"^ 	c #7F847C",
-"/ 	c #3B3C3B",
-"( 	c #343E30",
-"_ 	c #697D61",
-": 	c #252821",
-"< 	c #626F56",
-"[ 	c #59674C",
-"} 	c #4F5C44",
-"| 	c #556147",
-"1 	c #5E6950",
-"2 	c #566147",
-"3 	c #535D44",
-"4 	c #5E6B57",
-"5 	c #30322F",
-"6 	c #292F24",
-"7 	c #576750",
-"8 	c #8C8C8C",
-"9 	c #E9E9E9",
-"0 	c #4B4D4B",
-"a 	c #828880",
-"b 	c #90968E",
-"c 	c #5E675B",
-"d 	c #7E836E",
-"e 	c #57624E",
-"f 	c #636958",
-"g 	c #5A6852",
-"h 	c #5A5D59",
-"i 	c #0E100D",
-"j 	c #7F817D",
-"k 	c #F3F3F3",
-"l 	c #E5E5E5",
-"m 	c #C1C1C1",
-"n 	c #4F4F4F",
-"o 	c #9E9E9E",
-"p 	c #656764",
-"q 	c #4B5542",
-"r 	c #9A9A81",
-"s 	c #575E4B",
-"t 	c #7A7862",
-"u 	c #525D4A",
-"v 	c #686A66",
-"w 	c #010101",
-"x 	c #0C0C0C",
-"y 	c #242423",
-"z 	c #6A6B6A",
-"A 	c #494D48",
-"B 	c #3D4836",
-"C 	c #927261",
-"D 	c #534C3D",
-"E 	c #785042",
-"F 	c #4E5947",
-"G 	c #5B5D59",
-"H 	c #1D221B",
-"I 	c #555A53",
-"J 	c #1D1E1C",
-"K 	c #4D514A",
-"L 	c #1B1B1B",
-"M 	c #323331",
-"N 	c #3B3E39",
-"O 	c #252A22",
-"P 	c #434C35",
-"Q 	c #535F4B",
-"R 	c #424A3C",
-"S 	c #3B3D39",
-"T 	c #2A3327",
-"U 	c #6D8261",
-"V 	c #596548",
-"W 	c #515A40",
-"X 	c #49513A",
-"Y 	c #484F38",
-"Z 	c #51563D",
-"` 	c #424C34",
-" .	c #5B6547",
-"..	c #596847",
-"+.	c #687355",
-"@.	c #656B55",
-"#.	c #5F6759",
-"$.	c #393B38",
-"%.	c #2A3226",
-"&.	c #8C9777",
-"*.	c #6B6D54",
-"=.	c #6D6E54",
-"-.	c #6A6E57",
-";.	c #6C7058",
-">.	c #68694C",
-",.	c #505D40",
-"'.	c #5F6E4B",
-").	c #61704C",
-"!.	c #6F7C64",
-"~.	c #6A6C68",
-"{.	c #6C6C6C",
-"].	c #615F5D",
-"^.	c #8E8E8E",
-"/.	c #7F7F7F",
-"(.	c #273024",
-"_.	c #73805E",
-":.	c #4A4C36",
-"<.	c #434632",
-"[.	c #56583E",
-"}.	c #4B4D36",
-"|.	c #484A35",
-"1.	c #5C6647",
-"2.	c #6A7652",
-"3.	c #60704C",
-"4.	c #667359",
-"5.	c #4E514A",
-"6.	c #585957",
-"7.	c #525352",
-"8.	c #686868",
-"9.	c #3F3F3F",
-"0.	c #313C2D",
-"a.	c #5A7051",
-"b.	c #6E7655",
-"c.	c #5C684A",
-"d.	c #6B7352",
-"e.	c #5A6547",
-"f.	c #68704F",
-"g.	c #616E4B",
-"h.	c #6E7954",
-"i.	c #66734E",
-"j.	c #37412C",
-"k.	c #1D2317",
-"l.	c #2C302A",
-"m.	c #364430",
-"n.	c #B3AB7D",
-"o.	c #8B8E66",
-"p.	c #B3AA7C",
-"q.	c #898D64",
-"r.	c #B2A97B",
-"s.	c #898B63",
-"t.	c #B2A87B",
-"u.	c #868760",
-"v.	c #171D12",
-"w.	c #3B3829",
-"x.	c #2D2E21",
-"y.	c #2D2D20",
-"z.	c #3B3828",
-"A.	c #2C2C1F",
-"B.	c #2A2A2A",
-"                                ",
-"  . +   @ #               $ %   ",
-"  & * * . =               -     ",
-"  ; > , ' )               !     ",
-"    ~ { ]               ^ /     ",
-"( _ ~ { : < [ } | 1 2 3 4 5     ",
-"6 7 8 9 0 a b c } d e f g h     ",
-"i j k l m n o p q r s t u v     ",
-"w & x y * * z A B C D E F G     ",
-"H I J K L M N O P Q B R F S     ",
-"T U V W X Y Z `  ...+.@.#.$.    ",
-"%.&.*.=.-.;.>.,.'.).!.~.{.].^./.",
-"(._.:.<.[.}.|.1.2.3.4.5.6.7.8.9.",
-"0.a.b.c.d.e.f.g.h.i.j.k.l.y     ",
-"  m.n.o.p.q.r.s.t.u.v.    !     ",
-"    w.x.w.x.w.y.z.A.      B.    "};
diff --git a/net/wireshark/patches/patch-aa b/net/wireshark/patches/patch-aa
index 535dba276c5..bf491029b4b 100644
--- a/net/wireshark/patches/patch-aa
+++ b/net/wireshark/patches/patch-aa
@@ -1,50 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2006/11/01 12:59:42 tron Exp $
+$NetBSD: patch-aa,v 1.4.2.1 2007/02/07 16:05:21 salo Exp $
 
---- epan/dissectors/packet-radiotap.c.orig	2006-10-31 17:59:09.000000000 +0000
-+++ epan/dissectors/packet-radiotap.c	2006-11-01 11:44:20.000000000 +0000
-@@ -531,6 +531,11 @@
-     guint8 db, rflags;
-     guint32 present, next_present;
-     int bit;
-+    gint8 align;
-+#define RTALIGN(size) \
-+	align = ((offset + ((size) - 1)) & ~((size) - 1)) - offset; \
-+	offset += align; \
-+	length_remaining -= align
- 
-     if(check_col(pinfo->cinfo, COL_PROTOCOL))
- 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "WLAN");
-@@ -745,6 +750,7 @@
- 	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_CHANNEL:
-+	    RTALIGN(2);
- 	    if (length_remaining < 4)
- 		break;
- 	    if (tree) {
-@@ -762,6 +768,7 @@
- 	case IEEE80211_RADIOTAP_FHSS:
- 	case IEEE80211_RADIOTAP_TX_ATTENUATION:
- 	case IEEE80211_RADIOTAP_DB_TX_ATTENUATION:
-+	    RTALIGN(2);
- 	    if (length_remaining < 2)
- 		break;
- #if 0
-@@ -771,6 +778,9 @@
- 	    length_remaining-=2;
- 	    break;
- 	case IEEE80211_RADIOTAP_TSFT:
-+#if 0 /* can't happen because always first */
-+	    RTALIGN(8);
-+#endif
- 	    if (length_remaining < 8)
- 		break;
- 	    if (tree) {
-@@ -781,6 +791,7 @@
- 	    length_remaining-=8;
- 	    break;
- 	case IEEE80211_RADIOTAP_LOCK_QUALITY:
-+	    RTALIGN(2);
- 	    if (length_remaining < 2)
- 		break;
- 	    if (tree) {
+Fix build with GCC 3.3.x, see:
+http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1357
+
+--- tools/lemon/lemon.c.orig	2007-02-01 22:53:43.000000000 +0000
++++ tools/lemon/lemon.c	2007-02-07 14:54:00.000000000 +0000
+@@ -3095,6 +3095,9 @@
+ /* Print a #line directive line to the output file. */
+ PRIVATE void tplt_linedir(FILE *out, int lineno, char *filename)
+ {
++  if (lineno > 65536)
++    return;
++
+   fprintf(out,"#line %d \"",lineno);
+   while( *filename ){
+     if( *filename == '\\' ) putc('\\',out);