diff options
author | tron <tron@pkgsrc.org> | 2011-07-20 18:42:44 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2011-07-20 18:42:44 +0000 |
commit | 23ca4e20fcbe3026d3893cd3c87fd8b6b9efc496 (patch) | |
tree | fd4c7c54115ed15d1766474a99e65d72aad106d8 /net | |
parent | de4303cc1e10986249cf09bd615e669a38ee24d0 (diff) | |
download | pkgsrc-23ca4e20fcbe3026d3893cd3c87fd8b6b9efc496.tar.gz |
Update "wireshark" package to version 1.6.1.
The major changes since version 1.4.* are:
- Wireshark is now distributed as an installation package rather
than a drag-installer on OS X. The installer adds a startup
item that should make it easier to capture packets.
- Large file (greater than 2 GB) support has been improved.
- Wireshark and TShark can import text dumps, similar to
text2pcap.
- You can now view Wireshark's dissector tables (for example the
TCP port to dissector mappings) from the main window.
- Wireshark can export SSL session keys via File→Export→SSL
Session Keys...
- TShark can show a specific occurrence of a field when using
'-T fields'.
- Custom columns can show a specific occurrence of a field.
- You can hide columns in the packet list.
- Wireshark can now export SMB objects.
- dftest and randpkt now have manual pages.
- TShark can now display iSCSI, ICMP and ICMPv6 service response
times.
- Dumpcap can now save files with a user-specified group id.
- Syntax checking is done for capture filters.
- You can display the compiled BPF code for capture filters in
the Capture Options dialog.
- You can now navigate backwards and forwards through TCP and
UDP sessions using Ctrl+, and Ctrl+. .
- Packet length is (finally) a default column.
- TCP window size is now avaiable both scaled and unscaled. A
TCP window scaling graph is available in the GUI.
- 802.1q VLAN tags are now shown in the Ethernet II protocol
tree instead of a separate tree.
- Various dissectors now display some UTF-16 strings as proper
Unicode including the DCE/RPC and SMB dissectors.
- The RTP player now has an option to show the time of day in
the graph in addition to the seconds since beginning of
capture.
- The RTP player now shows why media interruptions occur.
- Graphs now save as PNG images by default.
- TShark can read and write host name information from and to
pcapng-formatted files. Wireshark can read it. TShark can dump
host name information via
[-z hosts]
.
- TShark's -z option now uses the
[-z <proto>,srt]
syntax instead of
[-z <proto>,rtt]
for all protocols that support service response time
statistics. This matches Wireshark's syntax for this option.
- Wireshark and TShark can now read compressed Windows Sniffer
files.
- New Protocol Support
ADwin, ADwin-Config, Apache Etch, Aruba PAPI, Babel Routing
Protocol, Broadcast/Multicast Control, Constrained Application
Protocol (COAP), Digium TDMoE, Erlang Distribution Protocol,
Ether-S-I/O, FastCGI, Fibre Channel over InfiniBand (FCoIB),
Gopher, Gigamon GMHDR, IDMP, Infiniband Socket Direct Protocol
(SDP), JSON, LISP Control, LISP Data, LISP, MikroTik MAC-Telnet,
MRP Multiple Mac Registration Protocol (MMRP) Mongo Wire Protocol,
MUX27010, Network Monitor 802.11 radio header, OPC UA
ExtensionObjects, openSAFETY, PPI-GEOLOCATION-GPS, ReLOAD, ReLOAD
Framing, RObust Header Compression (ROHC), RSIP, SAMETIME, SCoP,
SGSAP, Tektronix Teklink, USB/AT Commands, uTorrent Transport
Protocol, WAI authentication, Wi-Fi P2P (Wi-Fi Direct)
- New and Updated Capture File Support
Apple PacketLogger, Catapult DCT2000, Daintree SNA, Endace ERF, HP
OpenVMS TCPTrace, IPFIX (the file format, not the protocol),
Lucent/Ascend debug, Microsoft Network Monitor, Network
Instruments, TamoSoft CommView
Diffstat (limited to 'net')
-rw-r--r-- | net/wireshark/Makefile | 4 | ||||
-rw-r--r-- | net/wireshark/PLIST | 6 | ||||
-rw-r--r-- | net/wireshark/distinfo | 13 | ||||
-rw-r--r-- | net/wireshark/patches/patch-ad | 22 | ||||
-rw-r--r-- | net/wireshark/patches/patch-ba | 10 | ||||
-rw-r--r-- | net/wireshark/patches/patch-bb | 30 |
6 files changed, 33 insertions, 52 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 1c1b9fd08fe..babf61d4b8c 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.66 2011/07/19 21:29:53 tron Exp $ +# $NetBSD: Makefile,v 1.67 2011/07/20 18:42:44 tron Exp $ -DISTNAME= wireshark-1.4.8 +DISTNAME= wireshark-1.6.1 CATEGORIES= net MASTER_SITES= http://www.wireshark.org/download/src/ \ ${MASTER_SITE_SOURCEFORGE:=wireshark/} diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST index 4d704cbbf92..5b2f5d63d03 100644 --- a/net/wireshark/PLIST +++ b/net/wireshark/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2010/09/25 11:19:10 tron Exp $ +@comment $NetBSD: PLIST,v 1.20 2011/07/20 18:42:44 tron Exp $ bin/capinfos bin/dftest bin/dumpcap @@ -52,10 +52,12 @@ share/wireshark/colorfilters ${PLIST.lua}share/wireshark/console.lua share/wireshark/dfilters share/wireshark/dftest.html +share/wireshark/diameter/Cisco.xml share/wireshark/diameter/Ericsson.xml share/wireshark/diameter/TGPPGmb.xml share/wireshark/diameter/TGPPRx.xml share/wireshark/diameter/TGPPSh.xml +share/wireshark/diameter/Vodafone.xml share/wireshark/diameter/chargecontrol.xml share/wireshark/diameter/dictionary.dtd share/wireshark/diameter/dictionary.xml @@ -95,6 +97,7 @@ ${PLIST.lua}share/wireshark/init.lua share/wireshark/ipmap.html share/wireshark/manuf share/wireshark/mergecap.html +share/wireshark/pdml2html.xsl share/wireshark/radius/README.radius_dictionary share/wireshark/radius/dictionary share/wireshark/radius/dictionary.3com @@ -130,6 +133,7 @@ share/wireshark/radius/dictionary.compat share/wireshark/radius/dictionary.cosine share/wireshark/radius/dictionary.dhcp share/wireshark/radius/dictionary.digium +share/wireshark/radius/dictionary.eltex share/wireshark/radius/dictionary.epygi share/wireshark/radius/dictionary.ericsson share/wireshark/radius/dictionary.erx diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index cbb02a87a99..2524a8810fb 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,13 +1,12 @@ -$NetBSD: distinfo,v 1.46 2011/07/19 21:29:53 tron Exp $ +$NetBSD: distinfo,v 1.47 2011/07/20 18:42:44 tron Exp $ -SHA1 (wireshark-1.4.8.tar.bz2) = 8f9d0a920d00ac22ae0b2fa5844adbadc7e2de1e -RMD160 (wireshark-1.4.8.tar.bz2) = 970ada8ccbbca17695038faf4c0bca83d126d9a4 -Size (wireshark-1.4.8.tar.bz2) = 20505798 bytes +SHA1 (wireshark-1.6.1.tar.bz2) = e4ff6150f25be96a0b1d7e33da51001d453e7828 +RMD160 (wireshark-1.6.1.tar.bz2) = ef1f76f2b1abe7db253f80e36546aa2d828268b3 +Size (wireshark-1.6.1.tar.bz2) = 21305013 bytes SHA1 (patch-aa) = d0744f069ac2d3a8a43b810e1f958360d99200a9 SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840 -SHA1 (patch-ad) = a09b5ac9e836ef01fbd6ba103de00d08c0af2800 SHA1 (patch-ae) = 7af195e797f8636a9636d30cdea4ee464fd853df -SHA1 (patch-ba) = 49825d82605a665f54a5cdb6ccb364e55c0e0ffa -SHA1 (patch-bb) = 1e16337d1894f196f61b233423d729246dea33b5 +SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9 +SHA1 (patch-bb) = 0758ca0be8054b8b95bb56a304605e6fea0a8f72 SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e diff --git a/net/wireshark/patches/patch-ad b/net/wireshark/patches/patch-ad deleted file mode 100644 index 79e9065ddfa..00000000000 --- a/net/wireshark/patches/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ad,v 1.6 2010/09/25 11:19:10 tron Exp $ - ---- configure.orig 2010-08-29 23:20:30.000000000 +0100 -+++ configure 2010-09-25 11:47:16.000000000 +0100 -@@ -19604,7 +19604,7 @@ - fi - - -- if test x$have_ige_mac == x -+ if test x$have_ige_mac = x - then - # - # Not found - check for the old integration functions in -@@ -19660,7 +19660,7 @@ - - fi - -- if test x$have_ige_mac == x -+ if test x$have_ige_mac = x - then - # - # Not found - check for the old integration functions in diff --git a/net/wireshark/patches/patch-ba b/net/wireshark/patches/patch-ba index 1471f0ca5f3..78b40ed384f 100644 --- a/net/wireshark/patches/patch-ba +++ b/net/wireshark/patches/patch-ba @@ -1,15 +1,15 @@ -$NetBSD: patch-ba,v 1.1 2010/09/26 23:15:18 tron Exp $ +$NetBSD: patch-ba,v 1.2 2011/07/20 18:42:45 tron Exp $ Avoid conflict with NetBSD's popcount(3). ---- epan/dissectors/packet-x11.c.orig 2010-08-29 23:17:16.000000000 +0100 -+++ epan/dissectors/packet-x11.c 2010-09-26 23:55:27.000000000 +0100 +--- epan/dissectors/packet-x11.c.orig 2011-07-18 21:18:26.000000000 +0100 ++++ epan/dissectors/packet-x11.c 2011-07-20 19:03:27.000000000 +0100 @@ -3044,7 +3044,7 @@ - g_hash_table_insert(reply_table, (gpointer)name, (gpointer)reply_info); + g_hash_table_insert(reply_table, (gpointer)name, (gpointer)reply_info); } -static int popcount(unsigned int mask) +static int my_popcount(unsigned int mask) { #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) - /* GCC 3.4 or newer */ + /* GCC 3.4 or newer */ diff --git a/net/wireshark/patches/patch-bb b/net/wireshark/patches/patch-bb index 6ff63150ab1..6ae41e19531 100644 --- a/net/wireshark/patches/patch-bb +++ b/net/wireshark/patches/patch-bb @@ -1,10 +1,10 @@ -$NetBSD: patch-bb,v 1.1 2010/09/26 23:15:18 tron Exp $ +$NetBSD: patch-bb,v 1.2 2011/07/20 18:42:45 tron Exp $ Avoid conflict with NetBSD's popcount(3). ---- epan/dissectors/x11-extension-implementation.h.orig 2010-08-29 23:17:00.000000000 +0100 -+++ epan/dissectors/x11-extension-implementation.h 2010-09-26 23:55:27.000000000 +0100 -@@ -20648,8 +20648,8 @@ +--- epan/dissectors/x11-extension-implementation.h.orig 2011-07-18 21:17:51.000000000 +0100 ++++ epan/dissectors/x11-extension-implementation.h 2011-07-20 19:08:11.000000000 +0100 +@@ -20760,8 +20760,8 @@ int f_namesPresent; f_namesPresent = VALUE32(tvb, *offsetp + size + 4); f_mapsPresent = VALUE32(tvb, *offsetp + size + 8); @@ -15,7 +15,7 @@ Avoid conflict with NetBSD's popcount(3). return size + 20; } -@@ -20682,8 +20682,8 @@ +@@ -20794,8 +20794,8 @@ f_state = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_struct_DeviceLedInfo_state, tvb, *offsetp, 4, little_endian); *offsetp += 4; @@ -26,7 +26,7 @@ Avoid conflict with NetBSD's popcount(3). } } -@@ -22981,7 +22981,7 @@ +@@ -23093,7 +23093,7 @@ *offsetp += 2; UNUSED(16); listOfByte(tvb, offsetp, t, hf_x11_xkb_GetCompatMap_reply_si_rtrn, (16 * f_nSIRtrn), little_endian); @@ -35,7 +35,7 @@ Avoid conflict with NetBSD's popcount(3). } static void xkbSetCompatMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_) -@@ -23021,8 +23021,8 @@ +@@ -23133,8 +23133,8 @@ UNUSED(2); listOfByte(tvb, offsetp, t, hf_x11_xkb_SetCompatMap_si, (16 * f_nSI), little_endian); length -= (16 * f_nSI) * 1; @@ -46,7 +46,7 @@ Avoid conflict with NetBSD's popcount(3). } static void xkbGetIndicatorState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_) -@@ -23117,8 +23117,8 @@ +@@ -23229,8 +23229,8 @@ f_which = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xkb_SetIndicatorMap_which, tvb, *offsetp, 4, little_endian); *offsetp += 4; @@ -57,7 +57,7 @@ Avoid conflict with NetBSD's popcount(3). } static void xkbGetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_) -@@ -23615,13 +23615,13 @@ +@@ -23727,13 +23727,13 @@ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames_item, (length - 56) / 4, little_endian); } if ((f_which & (1 << 8)) != 0) { @@ -74,7 +74,7 @@ Avoid conflict with NetBSD's popcount(3). } if ((f_which & (1 << 9)) != 0) { struct_KeyName(tvb, offsetp, t, little_endian, f_nKeys); -@@ -23783,16 +23783,16 @@ +@@ -23895,16 +23895,16 @@ length -= (length - 52) / 4 * 4; } if ((f_which & (1 << 8)) != 0) { @@ -97,7 +97,7 @@ Avoid conflict with NetBSD's popcount(3). } if ((f_which & (1 << 9)) != 0) { struct_KeyName(tvb, offsetp, t, little_endian, f_nKeys); -@@ -24569,7 +24569,7 @@ +@@ -24693,7 +24693,7 @@ *offsetp += 2; UNUSED(16); listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_CompatMap_si_rtrn, (16 * f_nSIRtrn), little_endian); @@ -106,8 +106,8 @@ Avoid conflict with NetBSD's popcount(3). } if ((f_reported & (1 << 2)) != 0) { int f_clientDeviceID; -@@ -25032,13 +25032,13 @@ - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames_item, (length - 230) / 4, little_endian); +@@ -25156,13 +25156,13 @@ + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames_item, (length - 237) / 4, little_endian); } if ((f_which & (1 << 8)) != 0) { - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), little_endian); @@ -123,8 +123,8 @@ Avoid conflict with NetBSD's popcount(3). } if ((f_which & (1 << 9)) != 0) { struct_KeyName(tvb, offsetp, t, little_endian, f_nKeys); -@@ -25191,13 +25191,13 @@ - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames_item, (length - 279) / 4, little_endian); +@@ -25315,13 +25315,13 @@ + listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames_item, (length - 286) / 4, little_endian); } if ((f_which & (1 << 8)) != 0) { - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), little_endian); |