kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update "wireshark" package to version 0.99.3. Changes since 0.99.3:

Browse source 
The following vulnerabilities have been fixed:
  o The SCSI dissector could crash. Versions affected: 0.99.2.
  o If Wireshark was compiled with ESP decryption support, the
    IPsec ESP preference parser was susceptible to off-by-one
    errors. Versions affected: 0.99.2.
  o If the SSCOP dissector has a port range configured and the
    SSCOP payload protocol is Q.2931, a malformed packet could
    make the Q.2931 dissector use up available memory. No port
    range is configured by default. Versions affected: 0.7.9 -
    0.99.2.
The following bugs have been fixed:
  o The VOIP call analysis feature could cause an assertion.
  o The RTP analysis feature could freeze for an extended period.
  o Selecting "Apply as Filter" wouldn't work for some tree items.
  New and Updated Features
The following features are new (or have been significantly
updated) since the last release:
  o The packet list context menu now includes a conversation
    filter.
  o Wireshark can now generate ACL rules for several popular
    firewall products.
New Protocol Support
 Daytime, JPEG (RTP payload), Pegasus Lightweight Stream Control,
 Pro-MPEG FEC, UMTS RRC, Veritas Low Latency Transport
Updated Protocol Support
 All ASN.1 dissectors, 3G A11, 802.11, AIM SST, AJP13, ANSI 637,
 AVS WLAN, BACapp, BFD, CDP, Cisco WIDS, DCERPC (DCERPC, CONV, DFS,
 EPM, FLDB, NETLOGON, NT, PN-IO, RS_PGO), DCOM, DHCP, DIAMETER,
 DTLS, EAPOL, ESP, H.225, H.245, H.450, HTTP, IPv6, ISAKMP,
 Juniper, Kerberos, L2TP, LDAP, MSRP, NTLMSSP, PN-CBA, PN-RT,
 Prism, RSVP, RTCP, RUDP, SCSI, SCTP, SDP, SIP, SIPFRAG, Skinny,
 SMB, SSL, TCP, text/media, Time, XML
New and Updated Capture File Support
 Catapult DCT2000, nettl
This commit is contained in:
tron 2006-08-24 10:48:59 +00:00
parent 17c3199036
commit 0204611103
10 changed files with 971 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/wireshark/Makefile
View file

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.2 2006/07/23 17:31:08 drochner Exp $
# $NetBSD: Makefile,v 1.3 2006/08/24 10:48:59 tron Exp $
DISTNAME= wireshark-0.99.2
PKGREVISION= 1
DISTNAME= wireshark-0.99.3
CATEGORIES= net
MASTER_SITES= http://www.wireshark.org/download/src/ \
${MASTER_SITE_SOURCEFORGE:=wireshark/}
@ -38,6 +37,11 @@ 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

3
net/wireshark/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.2 2006/07/21 14:53:00 salo Exp $
@comment $NetBSD: PLIST,v 1.3 2006/08/24 10:48:59 tron Exp $
bin/capinfos
bin/dftest
bin/dumpcap
@ -69,6 +69,7 @@ share/wireshark/dtds/reginfo.dtd
share/wireshark/dtds/rss.dtd
share/wireshark/dtds/smil.dtd
share/wireshark/dtds/watcherinfo.dtd
share/wireshark/dtds/xcap-caps.dtd
share/wireshark/dumpcap.html
share/wireshark/editcap.html
share/wireshark/help/capture_filters.txt

11
net/wireshark/distinfo
View file

@ -1,7 +1,6 @@
$NetBSD: distinfo,v 1.2 2006/07/23 17:31:08 drochner Exp $
$NetBSD: distinfo,v 1.3 2006/08/24 10:48:59 tron Exp $
SHA1 (wireshark-0.99.2.tar.bz2) = f3f4f78b5ddbd45f9d805d1a9b50250d323bb57f
RMD160 (wireshark-0.99.2.tar.bz2) = 3188b41839a9b1579a2e181cbfd22295ade46649
Size (wireshark-0.99.2.tar.bz2) = 9748955 bytes
SHA1 (patch-aa) = 72b8e94efb8be106832e53e01288744cbfef6be7
SHA1 (patch-ab) = 0dc3317d3529d641281ea01592ef0ca39eafc873
SHA1 (wireshark-0.99.3.tar.bz2) = e037c64ef95153fe06c0439ee5d0f54de4d12d78
RMD160 (wireshark-0.99.3.tar.bz2) = 60a094b6b2c8d3d289cb7cbc1c01b84d378f9443
Size (wireshark-0.99.3.tar.bz2) = 10036646 bytes
SHA1 (patch-aa) = 358b0b7615b72da15452a51f90d3886a2ce1b0b5

275
net/wireshark/files/capture_airpcap_16.xpm Normal file
View file

@ -0,0 +1,275 @@
/* 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+ ",
" "};

170
net/wireshark/files/capture_capture_16.xpm Normal file
View file

@ -0,0 +1,170 @@
/* 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. "};

150
net/wireshark/files/capture_details_16.xpm Normal file
View file

@ -0,0 +1,150 @@
/* 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. "};

163
net/wireshark/files/capture_ethernet_16.xpm Normal file
View file

@ -0,0 +1,163 @@
/* 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. "};

178
net/wireshark/files/capture_prepare_16.xpm Normal file
View file

@ -0,0 +1,178 @@
/* 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. "};

32
net/wireshark/patches/patch-aa
View file

@ -1,20 +1,22 @@
$NetBSD: patch-aa,v 1.2 2006/07/23 17:31:08 drochner Exp $
$NetBSD: patch-aa,v 1.3 2006/08/24 10:48:59 tron Exp $
--- epan/dissectors/packet-radiotap.c.orig 2006-07-17 21:59:28.000000000 +0200
+++ epan/dissectors/packet-radiotap.c
@@ -388,6 +388,11 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
--- epan/dissectors/packet-radiotap.c.orig 2006-08-23 23:26:24.000000000 +0100
+++ epan/dissectors/packet-radiotap.c 2006-08-24 10:19:28.000000000 +0100
@@ -397,7 +397,12 @@
guint8 db, rflags;
guint32 present, next_present;
int bit;
- gboolean has_fcs = FALSE;
+ gboolean has_fcs = FALSE;
+ gint8 align;
+#define RTALIGN(size) \
+ align = ((offset + ((size) - 1)) & ~((size) - 1)) - offset; \
+ offset += align; \
+ length_remaining -= align
+ 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");
@@ -559,6 +564,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
@@ -569,6 +574,7 @@
length_remaining--;
break;
case IEEE80211_RADIOTAP_CHANNEL:
@ -22,15 +24,15 @@ $NetBSD: patch-aa,v 1.2 2006/07/23 17:31:08 drochner Exp $
if (length_remaining < 4)
break;
if (tree) {
@@ -577,6 +583,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
case IEEE80211_RADIOTAP_LOCK_QUALITY:
@@ -586,6 +592,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
@@ -586,6 +593,9 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
@@ -595,6 +602,9 @@
length_remaining-=2;
break;
case IEEE80211_RADIOTAP_TSFT:
@ -40,3 +42,11 @@ $NetBSD: patch-aa,v 1.2 2006/07/23 17:31:08 drochner Exp $
if (length_remaining < 8)
break;
if (tree) {
@@ -605,6 +615,7 @@
length_remaining-=8;
break;
case IEEE80211_RADIOTAP_LOCK_QUALITY:
+ RTALIGN(2);
if (length_remaining < 2)
break;
if (tree) {

101
net/wireshark/patches/patch-ab
View file

@ -1,101 +0,0 @@
$NetBSD: patch-ab,v 1.1 2006/07/21 14:27:53 tron Exp $
--- configure.orig 2006-06-20 17:53:05.000000000 +0000
+++ configure
@@ -3774,13 +3774,13 @@ darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | kfreebsd*-gnu)
+freebsd* | kfreebsd*-gnu | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
# Not sure whether the presence of OpenBSD here was a mistake.
# Let's accept both of them until this is cleared up.
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
@@ -7227,7 +7227,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
@@ -7805,7 +7805,7 @@ kfreebsd*-gnu)
dynamic_linker='GNU ld.so'
;;
-freebsd*)
+freebsd* | dragonfly*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
case $version_type in
@@ -10206,7 +10206,7 @@ if test -z "$aix_libpath"; then aix_libp
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
@@ -10913,7 +10913,7 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -11524,7 +11524,7 @@ kfreebsd*-gnu)
dynamic_linker='GNU ld.so'
;;
-freebsd*)
+freebsd* | dragonfly*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
case $version_type in
@@ -14116,7 +14116,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
@@ -14694,7 +14694,7 @@ kfreebsd*-gnu)
dynamic_linker='GNU ld.so'
;;
-freebsd*)
+freebsd* | dragonfly*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
case $version_type in
@@ -16484,7 +16484,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
@@ -17062,7 +17062,7 @@ kfreebsd*-gnu)
dynamic_linker='GNU ld.so'
;;
-freebsd*)
+freebsd* | dragonfly*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
case $version_type in