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

3 files changed, 20 insertions, 42 deletions

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);