23195793 Upgrade Wireshark to version 2.0.3
23182108 problem in UTILITY/WIRESHARK
23182065 problem in UTILITY/WIRESHARK
--- a/components/wireshark/Makefile Sun May 29 22:43:56 2016 -0700
+++ b/components/wireshark/Makefile Wed May 25 05:30:40 2016 -0700
@@ -23,16 +23,16 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= wireshark
-COMPONENT_VERSION= 1.12.10
+COMPONENT_VERSION= 2.0.3
COMPONENT_PROJECT_URL= http://www.wireshark.org/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
COMPONENT_ARCHIVE_HASH= \
- sha256:82be53dc80da3ee25e0f30dd91f1f802f66da62a4356049efd305e3e0672148b
+ sha256:e196376e75fe21fdef41b4eaa27ce2e1b2b561e7f7b20328a8e96657cc4465fc
COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/wireshark
-TPNO= 27437
+TPNO= 28025
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
@@ -52,6 +52,7 @@
CONFIGURE_OPTIONS += --bindir=/usr/sbin
CONFIGURE_OPTIONS += --disable-usr-local
+CONFIGURE_OPTIONS += --disable-androiddump
CONFIGURE_OPTIONS += --disable-randpkt
CONFIGURE_OPTIONS += --disable-dftest
CONFIGURE_OPTIONS += --with-krb5
@@ -59,6 +60,8 @@
CONFIGURE_OPTIONS += --with-gtk2=yes
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
CONFIGURE_OPTIONS += PATH="/usr/perl5/bin:/usr/gnu/bin:$(PATH)"
+# Workaround for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12391
+CONFIGURE_OPTIONS += ac_cv_func_gethostbyname=yes
# Use the 64-bit versions of pkg-config files
CONFIGURE_ENV += PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)"
@@ -78,13 +81,12 @@
# During install libtool will relink libwireshark library so that it
# requires libwiretap version from system and not from proto area.
-# This shall be removed once CBE is updated to contain Wireshark 1.12
-# (see Bug 20627618).
+# This can be removed if SRU CBE is updated to contain Wireshark 2.0.
COMPONENT_POST_INSTALL_ACTION = \
- (/usr/bin/elfdump -d $(PROTO_DIR)/usr/lib/$(MACH64)/libwireshark.so.5.0.5 | \
- grep 'libwiretap.so.3' && /usr/bin/elfedit \
- -e 'dyn:value -s -with-valstr libwiretap.so.3 libwiretap.so.4' \
- $(PROTO_DIR)/usr/lib/$(MACH64)/libwireshark.so.5.0.5; true)
+ (/usr/bin/elfdump -d $(PROTO_DIR)/usr/lib/$(MACH64)/libwireshark.so.6.1.0 | \
+ grep 'libwiretap.so.4' && /usr/bin/elfedit \
+ -e 'dyn:value -s -with-valstr libwiretap.so.4 libwiretap.so.5' \
+ $(PROTO_DIR)/usr/lib/$(MACH64)/libwireshark.so.6.1.0; true)
configure: $(CONFIGURE_64)
--- a/components/wireshark/patches/DesktopEntry.patch Sun May 29 22:43:56 2016 -0700
+++ b/components/wireshark/patches/DesktopEntry.patch Wed May 25 05:30:40 2016 -0700
@@ -3,16 +3,16 @@
Starts Wireshark via pfexec to leverage any given privileges.
---- wireshark.desktop
-+++ wireshark.desktop
-@@ -69,8 +69,8 @@
- Comment[fr]=Analyseur de trafic réseau
- Comment[sv]=Nätverkstrafikanalysator
+--- wireshark-gtk.desktop
++++ wireshark-gtk.desktop
+@@ -102,8 +102,8 @@
+ Comment[vi]=Trình phân tích giao thông mạng
+ Comment[uk]=Аналізатор мережевого трафіку
Icon=wireshark
--TryExec=wireshark
--Exec=wireshark %f
+-TryExec=wireshark-gtk
+-Exec=wireshark-gtk %f
+TryExec=/usr/sbin/wireshark
+Exec=pfexec /usr/sbin/wireshark %f
Terminal=false
- MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;
+ MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;application/x-tektronix-rf5;
# Category entry according to:
--- a/components/wireshark/patches/evb.patch Sun May 29 22:43:56 2016 -0700
+++ b/components/wireshark/patches/evb.patch Wed May 25 05:30:40 2016 -0700
@@ -13,13 +13,13 @@
#define OUI_ATHEROS 0x00037F /* Atheros Communications */
+#define OUI_ORACLE 0x0003BA /* Oracle */
#define OUI_SONY_ERICSSON 0x000AD9 /* Sony Ericsson Mobile Communications AB */
+ #define OUI_ARUBA 0x000B86 /* Aruba Networks */
#define OUI_SONY_ERICSSON_2 0x000E07 /* Sony Ericsson Mobile Communications AB */
- #define OUI_PROFINET 0x000ECF /* PROFIBUS Nutzerorganisation e.V. */
Index: epan/etypes.h
===================================================================
--- epan/etypes.h (revision 41973)
+++ epan/etypes.h (working copy)
-@@ -526,6 +526,10 @@
+@@ -538,6 +538,10 @@
#define ETHERTYPE_HSR 0x892F /* High-availability Seamless Redundancy (IEC62439 Part 3) */
#endif
@@ -34,7 +34,7 @@
===================================================================
--- epan/dissectors/packet-ecp.c (revision 0)
+++ epan/dissectors/packet-ecp.c (revision 0)
-@@ -0,0 +1,619 @@
+@@ -0,0 +1,624 @@
+/* packet-ecp.c
+ * Routines for Solaris ECP/VDP dissection based on IEEE 802.1Qbg Draft 2.1
+ *
@@ -64,6 +64,7 @@
+#include <stdio.h>
+#include <epan/packet.h>
+#include <epan/etypes.h>
++#include <epan/to_str.h>
+#include <epan/oui.h>
+
+static int proto_ecp = -1;
@@ -78,9 +79,11 @@
+static int hf_vdp_tlv_len_invalid = -1;
+static int hf_vdp_tlv_assoc_reason = -1;
+static int hf_vdp_tlv_org_oui = -1;
++static int hf_vdp_vidstr = -1;
+static int hf_vdp_vsitypeid = -1;
+static int hf_vdp_vsiversion = -1;
+static int hf_vdp_vsiid_format = -1;
++static int hf_vdp_vsiid = -1;
+static int hf_vdp_filter_format = -1;
+
+static int hf_oui_oracle_subtype = -1;
@@ -227,7 +230,7 @@
+ vid = val & 0x0FFF;
+ if (tree) {
+ if (ti == NULL)
-+ proto_tree_add_text(tree, tvb, offset, 2,
++ proto_tree_add_bytes_format_value(tree, hf_vdp_vidstr, tvb, offset, 2, NULL,
+ "PS %u, PCP %u, VID %u", ps, pcp, vid);
+ else
+ proto_item_append_text(ti,
@@ -247,13 +250,11 @@
+
+ if (tree) {
+ if (tlvtype == VDP_TLV_ASSOC)
-+ ti = proto_tree_add_text(tree, tvb, offset, 2,
-+ "VDP Associate");
++ vdp_tlv_assoc_tree = proto_tree_add_subtree(tree, tvb, offset, 2,
++ ett_vdp_tlv_assoc, &ti, "VDP Associate");
+ else
-+ ti = proto_tree_add_text(tree, tvb, offset, 2,
-+ "VDP DeAssociate");
-+ vdp_tlv_assoc_tree = proto_item_add_subtree(ti,
-+ ett_vdp_tlv_assoc);
++ vdp_tlv_assoc_tree = proto_tree_add_subtree(tree, tvb, offset, 2,
++ ett_vdp_tlv_assoc, &ti, "VDP DeAssociate");
+ }
+
+ tlvhdr = tvb_get_ntohs(tvb, offset);
@@ -316,9 +317,9 @@
+ offset++;
+
+ /* VSIID */
-+ str = tvb_bytes_to_ep_str_punct(tvb, offset, 16, ':');
-+ proto_tree_add_text(vdp_tlv_assoc_tree, tvb, offset, 16,
-+ "VSIID: %s", str);
++ str = tvb_bytes_to_str_punct(wmem_packet_scope(), tvb, offset, 16, ':');
++ proto_tree_add_string(vdp_tlv_assoc_tree, hf_vdp_vsiid, tvb, offset, 16,
++ str);
+ offset += 16;
+
+ /* Filter Format */
@@ -334,8 +335,8 @@
+ break;
+ case VDP_FILTER_MACVID:
+ str = tvb_ether_to_str(tvb, offset);
-+ ti = proto_tree_add_text(vdp_tlv_assoc_tree, tvb,
-+ offset, 6, "MAC %s. ", str);
++ proto_tree_add_subtree_format(vdp_tlv_assoc_tree, tvb,
++ offset, 6, ett_vdp_tlv_assoc, &ti, "MAC %s. ", str);
+ offset += 6;
+ vdp_add_vidstr(tvb, vdp_tlv_assoc_tree, offset, ti);
+ offset += 2;
@@ -358,10 +359,8 @@
+ const char *str;
+
+ if (tree) {
-+ ti = proto_tree_add_text(tree, tvb, offset, 2,
-+ "%s", "VDP Manager ID");
-+ vdp_tlv_mgrid_tree = proto_item_add_subtree(ti,
-+ ett_vdp_tlv_mgrid);
++ vdp_tlv_mgrid_tree = proto_tree_add_subtree(tree, tvb, offset, 2,
++ ett_vdp_tlv_mgrid, &ti, "VDP Manager ID");
+ }
+
+ tlvhdr = tvb_get_ntohs(tvb, offset);
@@ -428,7 +427,7 @@
+ offset++;
+
+ if (tree) {
-+ proto_tree_add_text(tree, tvb, offset, 0, "%s - %s",
++ proto_tree_add_subtree_format(tree, tvb, offset, 0, ett_vdp_tlv_org, NULL, "%s - %s",
+ ouistr, subtypestr);
+ /* XXX create a org tlv tree if neccessary */
+ }
@@ -459,9 +458,8 @@
+ if (tlvtype == 0) /* XXX most likely it's padding */
+ break;
+ if (tree) {
-+ ti = proto_tree_add_text(tree, tvb, offset, tlvlen + 2,
-+ "VDP TLV");
-+ vdp_tlv_tree = proto_item_add_subtree(ti, ett_vdp_tlv);
++ vdp_tlv_tree = proto_tree_add_subtree(tree, tvb, offset,
++ tlvlen + 2, ett_vdp_tlv, &ti, "VDP TLV");
+ proto_tree_add_item(vdp_tlv_tree, hf_vdp_tlv_type, tvb,
+ offset, 2, ENC_BIG_ENDIAN);
+ proto_tree_add_item(vdp_tlv_tree, hf_vdp_tlv_len, tvb,
@@ -608,6 +606,13 @@
+ { "VDP Filter Format ", "vdp.filterformat", FT_UINT8,
+ BASE_HEX, VALS(vdp_filter_format_vals), 0x0,
+ NULL, HFILL}},
++ { &hf_vdp_vsiid,
++ { "VSIID", "vdp.VSIID", FT_STRING, BASE_NONE,
++ NULL, 0x0, NULL, HFILL }},
++ { &hf_vdp_vidstr,
++ { "VIDSTR", "vdp.vidstr", FT_BYTES, BASE_NONE,
++ NULL, 0x0, NULL, HFILL }},
++
+
+ };
+
@@ -658,11 +663,11 @@
===================================================================
--- epan/dissectors/Makefile.common (revision 41973)
+++ epan/dissectors/Makefile.common (working copy)
-@@ -118,6 +118,7 @@
+@@ -114,6 +114,7 @@
packet-dop.c \
packet-dsp.c \
packet-ess.c \
+ packet-ecp.c \
packet-ftam.c \
packet-goose.c \
- packet-HI2Operations.c \
+ packet-gsm_map.c \
--- a/components/wireshark/patches/man.patch Sun May 29 22:43:56 2016 -0700
+++ b/components/wireshark/patches/man.patch Wed May 25 05:30:40 2016 -0700
@@ -5,7 +5,7 @@
--- doc/tshark.pod
+++ doc/tshark.pod
-@@ -478,9 +478,9 @@
+@@ -488,9 +488,9 @@
Network interface names should match one of the names listed in
"B<tshark -D>" (described above); a number, as reported by
@@ -18,16 +18,16 @@
If no interface is specified, B<TShark> searches the list of
interfaces, choosing the first non-loopback interface if there are any
-@@ -1469,7 +1469,7 @@
+@@ -1551,7 +1551,7 @@
=head1 CAPTURE FILTER SYNTAX
-See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8),
+See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1),
- or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
+ or, if that doesn't exist, L<https://wiki.wireshark.org/CaptureFilters>.
=head1 READ FILTER SYNTAX
-@@ -1756,7 +1756,7 @@
+@@ -1812,7 +1812,7 @@
=head1 SEE ALSO
wireshark-filter(4), wireshark(1), editcap(1), pcap(3), dumpcap(1),
@@ -38,7 +38,7 @@
--- doc/wireshark.pod.template
+++ doc/wireshark.pod.template
-@@ -363,9 +363,9 @@
+@@ -366,9 +366,9 @@
Network interface names should match one of the names listed in
"B<wireshark -D>" (described above); a number, as reported by
@@ -51,16 +51,16 @@
If no interface is specified, B<Wireshark> searches the list of
interfaces, choosing the first non-loopback interface if there are any
-@@ -2476,7 +2476,7 @@
+@@ -2529,7 +2529,7 @@
=head1 CAPTURE FILTER SYNTAX
-See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8),
+See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1),
- or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
+ or, if that doesn't exist, L<https://wiki.wireshark.org/CaptureFilters>.
=head1 DISPLAY FILTER SYNTAX
-@@ -2874,7 +2874,7 @@
+@@ -2901,7 +2901,7 @@
=head1 SEE ALSO
wireshark-filter(4), tshark(1), editcap(1), pcap(3), dumpcap(1), mergecap(1),
@@ -71,7 +71,7 @@
--- doc/capinfos.pod
+++ doc/capinfos.pod
-@@ -332,7 +332,7 @@
+@@ -348,7 +348,7 @@
=head1 SEE ALSO
pcap(3), wireshark(1), mergecap(1), editcap(1), tshark(1),
@@ -88,7 +88,7 @@
-See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8),
+See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1),
- or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
+ or, if that doesn't exist, L<https://wiki.wireshark.org/CaptureFilters>.
=head1 SEE ALSO
@@ -100,7 +100,7 @@
--- doc/editcap.pod
+++ doc/editcap.pod
-@@ -380,7 +380,7 @@
+@@ -416,7 +416,7 @@
=head1 SEE ALSO
pcap(3), wireshark(1), tshark(1), mergecap(1), dumpcap(1), capinfos(1),
@@ -111,7 +111,7 @@
--- doc/mergecap.pod
+++ doc/mergecap.pod
-@@ -134,7 +134,7 @@
+@@ -145,7 +145,7 @@
=head1 SEE ALSO
pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), text2pcap(1),
@@ -122,7 +122,7 @@
--- doc/rawshark.pod
+++ doc/rawshark.pod
-@@ -546,7 +546,7 @@
+@@ -522,7 +522,7 @@
=head1 SEE ALSO
wireshark-filter(4), wireshark(1), tshark(1), editcap(1), pcap(3), dumpcap(1),
@@ -133,7 +133,7 @@
--- doc/text2pcap.pod
+++ doc/text2pcap.pod
-@@ -238,7 +238,7 @@
+@@ -244,7 +244,7 @@
=head1 SEE ALSO
od(1), pcap(3), wireshark(1), tshark(1), dumpcap(1), mergecap(1),
@@ -144,14 +144,11 @@
--- doc/wireshark-filter.pod
+++ doc/wireshark-filter.pod
-@@ -414,13 +414,13 @@
- See L<http://developer.gnome.org/glib/2.32/glib-regex-syntax.html/> or L<http://www.pcre.org/> for more information.
This manpage does not describe the capture filter syntax, which is
--different. See the manual page of pcap-filter(7) or, if that doesn't exist,
--tcpdump(8), or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>
-+different. See the manual page of pcap-filter(5) or, if that doesn't exist,
-+tcpdump(1), or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>
+ different. See the manual page of pcap-filter(7) or, if that doesn't exist,
+-tcpdump(8), or, if that doesn't exist, L<https://wiki.wireshark.org/CaptureFilters>
++tcpdump(1), or, if that doesn't exist, L<https://wiki.wireshark.org/CaptureFilters>
for a description of capture filters.
=head1 SEE ALSO
--- a/components/wireshark/wireshark-common.p5m Sun May 29 22:43:56 2016 -0700
+++ b/components/wireshark/wireshark-common.p5m Wed May 25 05:30:40 2016 -0700
@@ -37,24 +37,17 @@
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
file exec_attr.dumpcap \
path=etc/security/exec_attr.d/diagnostic:wireshark:wireshark-common
-link path=usr/lib/$(MACH64)/libfiletap.so \
- target=libfiletap.so.0.0.$(MICRO_VERSION)
-link path=usr/lib/$(MACH64)/libfiletap.so.0 \
- target=libfiletap.so.0.0.$(MICRO_VERSION)
-file path=usr/lib/$(MACH64)/libfiletap.so.0.0.$(MICRO_VERSION)
-link path=usr/lib/$(MACH64)/libwireshark.so \
- target=libwireshark.so.5.0.$(MICRO_VERSION)
-link path=usr/lib/$(MACH64)/libwireshark.so.5 \
- target=libwireshark.so.5.0.$(MICRO_VERSION)
-file path=usr/lib/$(MACH64)/libwireshark.so.5.0.$(MICRO_VERSION)
+link path=usr/lib/$(MACH64)/libwireshark.so target=libwireshark.so.6.1.0
+link path=usr/lib/$(MACH64)/libwireshark.so.6 target=libwireshark.so.6.1.0
+file path=usr/lib/$(MACH64)/libwireshark.so.6.1.0
link path=usr/lib/$(MACH64)/libwiretap.so \
- target=libwiretap.so.4.0.$(MICRO_VERSION)
-link path=usr/lib/$(MACH64)/libwiretap.so.4 \
- target=libwiretap.so.4.0.$(MICRO_VERSION)
-file path=usr/lib/$(MACH64)/libwiretap.so.4.0.$(MICRO_VERSION)
-link path=usr/lib/$(MACH64)/libwsutil.so target=libwsutil.so.4.1.0
-link path=usr/lib/$(MACH64)/libwsutil.so.4 target=libwsutil.so.4.1.0
-file path=usr/lib/$(MACH64)/libwsutil.so.4.1.0
+ target=libwiretap.so.5.0.$(MICRO_VERSION)
+link path=usr/lib/$(MACH64)/libwiretap.so.5 \
+ target=libwiretap.so.5.0.$(MICRO_VERSION)
+file path=usr/lib/$(MACH64)/libwiretap.so.5.0.$(MICRO_VERSION)
+link path=usr/lib/$(MACH64)/libwsutil.so target=libwsutil.so.6.0.0
+link path=usr/lib/$(MACH64)/libwsutil.so.6 target=libwsutil.so.6.0.0
+file path=usr/lib/$(MACH64)/libwsutil.so.6.0.0
file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/docsis.so
file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/ethercat.so
file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/gryphon.so
@@ -83,6 +76,7 @@
file path=usr/share/man/man4/wireshark-filter.4
file path=usr/share/wireshark/AUTHORS-SHORT
file path=usr/share/wireshark/COPYING
+file path=usr/share/wireshark/androiddump.html
file path=usr/share/wireshark/capinfos.html
file path=usr/share/wireshark/cfilters
file path=usr/share/wireshark/colorfilters
@@ -90,27 +84,22 @@
file path=usr/share/wireshark/dfilters
file path=usr/share/wireshark/dftest.html
file path=usr/share/wireshark/diameter/AlcatelLucent.xml
-file path=usr/share/wireshark/diameter/ChinaTelecom.xml
file path=usr/share/wireshark/diameter/Cisco.xml
file path=usr/share/wireshark/diameter/Custom.xml
file path=usr/share/wireshark/diameter/Ericsson.xml
+file path=usr/share/wireshark/diameter/HP.xml
file path=usr/share/wireshark/diameter/Nokia.xml
-file path=usr/share/wireshark/diameter/NokiaSiemensNetworks.xml
-file path=usr/share/wireshark/diameter/SKT.xml
+file path=usr/share/wireshark/diameter/NokiaSolutionsAndNetworks.xml
+file path=usr/share/wireshark/diameter/Oracle.xml
file path=usr/share/wireshark/diameter/Starent.xml
-file path=usr/share/wireshark/diameter/TGPPGmb.xml
-file path=usr/share/wireshark/diameter/TGPPRx.xml
-file path=usr/share/wireshark/diameter/TGPPS9.xml
-file path=usr/share/wireshark/diameter/TGPPSh.xml
-file path=usr/share/wireshark/diameter/VerizonWireless.xml
+file path=usr/share/wireshark/diameter/TGPP.xml
+file path=usr/share/wireshark/diameter/TGPP2.xml
file path=usr/share/wireshark/diameter/Vodafone.xml
file path=usr/share/wireshark/diameter/chargecontrol.xml
file path=usr/share/wireshark/diameter/dictionary.dtd
file path=usr/share/wireshark/diameter/dictionary.xml
file path=usr/share/wireshark/diameter/eap.xml
file path=usr/share/wireshark/diameter/etsie2e4.xml
-file path=usr/share/wireshark/diameter/gqpolicy.xml
-file path=usr/share/wireshark/diameter/imscxdx.xml
file path=usr/share/wireshark/diameter/mobileipv4.xml
file path=usr/share/wireshark/diameter/mobileipv6.xml
file path=usr/share/wireshark/diameter/nasreq.xml
@@ -153,17 +142,20 @@
file path=usr/share/wireshark/radius/dictionary.3gpp2
file path=usr/share/wireshark/radius/dictionary.acc
file path=usr/share/wireshark/radius/dictionary.acme
+file path=usr/share/wireshark/radius/dictionary.actelis
+file path=usr/share/wireshark/radius/dictionary.aerohive
file path=usr/share/wireshark/radius/dictionary.airespace
file path=usr/share/wireshark/radius/dictionary.alcatel
file path=usr/share/wireshark/radius/dictionary.alcatel-lucent.aaa
-file path=usr/share/wireshark/radius/dictionary.alcatel-lucent.xylan
file path=usr/share/wireshark/radius/dictionary.alcatel.esam
file path=usr/share/wireshark/radius/dictionary.alcatel.sr
file path=usr/share/wireshark/radius/dictionary.alteon
file path=usr/share/wireshark/radius/dictionary.altiga
file path=usr/share/wireshark/radius/dictionary.alvarion
+file path=usr/share/wireshark/radius/dictionary.alvarion.wimax.v2_2
file path=usr/share/wireshark/radius/dictionary.apc
file path=usr/share/wireshark/radius/dictionary.aptis
+file path=usr/share/wireshark/radius/dictionary.arbor
file path=usr/share/wireshark/radius/dictionary.aruba
file path=usr/share/wireshark/radius/dictionary.ascend
file path=usr/share/wireshark/radius/dictionary.asn
@@ -172,28 +164,47 @@
file path=usr/share/wireshark/radius/dictionary.azaire
file path=usr/share/wireshark/radius/dictionary.bay
file path=usr/share/wireshark/radius/dictionary.bintec
+file path=usr/share/wireshark/radius/dictionary.bluecoat
file path=usr/share/wireshark/radius/dictionary.bristol
+file path=usr/share/wireshark/radius/dictionary.broadsoft
+file path=usr/share/wireshark/radius/dictionary.brocade
+file path=usr/share/wireshark/radius/dictionary.bskyb
+file path=usr/share/wireshark/radius/dictionary.bt
file path=usr/share/wireshark/radius/dictionary.cablelabs
file path=usr/share/wireshark/radius/dictionary.cabletron
+file path=usr/share/wireshark/radius/dictionary.camiant
file path=usr/share/wireshark/radius/dictionary.chillispot
file path=usr/share/wireshark/radius/dictionary.cisco
+file path=usr/share/wireshark/radius/dictionary.cisco.asa
file path=usr/share/wireshark/radius/dictionary.cisco.bbsm
file path=usr/share/wireshark/radius/dictionary.cisco.vpn3000
file path=usr/share/wireshark/radius/dictionary.cisco.vpn5000
+file path=usr/share/wireshark/radius/dictionary.citrix
file path=usr/share/wireshark/radius/dictionary.clavister
file path=usr/share/wireshark/radius/dictionary.colubris
file path=usr/share/wireshark/radius/dictionary.columbia_university
file path=usr/share/wireshark/radius/dictionary.compat
+file path=usr/share/wireshark/radius/dictionary.compatible
file path=usr/share/wireshark/radius/dictionary.cosine
+file path=usr/share/wireshark/radius/dictionary.dante
file path=usr/share/wireshark/radius/dictionary.dhcp
file path=usr/share/wireshark/radius/dictionary.digium
+file path=usr/share/wireshark/radius/dictionary.dlink
+file path=usr/share/wireshark/radius/dictionary.dragonwave
+file path=usr/share/wireshark/radius/dictionary.efficientip
file path=usr/share/wireshark/radius/dictionary.eltex
file path=usr/share/wireshark/radius/dictionary.epygi
+file path=usr/share/wireshark/radius/dictionary.equallogic
file path=usr/share/wireshark/radius/dictionary.ericsson
+file path=usr/share/wireshark/radius/dictionary.ericsson.ab
+file path=usr/share/wireshark/radius/dictionary.ericsson.packet.core.networks
file path=usr/share/wireshark/radius/dictionary.erx
file path=usr/share/wireshark/radius/dictionary.extreme
+file path=usr/share/wireshark/radius/dictionary.f5
+file path=usr/share/wireshark/radius/dictionary.fdxtended
file path=usr/share/wireshark/radius/dictionary.fortinet
file path=usr/share/wireshark/radius/dictionary.foundry
+file path=usr/share/wireshark/radius/dictionary.freedhcp
file path=usr/share/wireshark/radius/dictionary.freeradius
file path=usr/share/wireshark/radius/dictionary.freeradius.internal
file path=usr/share/wireshark/radius/dictionary.freeswitch
@@ -203,7 +214,9 @@
file path=usr/share/wireshark/radius/dictionary.h3c
file path=usr/share/wireshark/radius/dictionary.hp
file path=usr/share/wireshark/radius/dictionary.huawei
+file path=usr/share/wireshark/radius/dictionary.iana
file path=usr/share/wireshark/radius/dictionary.iea
+file path=usr/share/wireshark/radius/dictionary.infoblox
file path=usr/share/wireshark/radius/dictionary.infonet
file path=usr/share/wireshark/radius/dictionary.ipunplugged
file path=usr/share/wireshark/radius/dictionary.issanni
@@ -211,12 +224,15 @@
file path=usr/share/wireshark/radius/dictionary.jradius
file path=usr/share/wireshark/radius/dictionary.juniper
file path=usr/share/wireshark/radius/dictionary.karlnet
+file path=usr/share/wireshark/radius/dictionary.kineto
file path=usr/share/wireshark/radius/dictionary.lancom
file path=usr/share/wireshark/radius/dictionary.livingston
file path=usr/share/wireshark/radius/dictionary.localweb
file path=usr/share/wireshark/radius/dictionary.lucent
file path=usr/share/wireshark/radius/dictionary.manzara
+file path=usr/share/wireshark/radius/dictionary.meinberg
file path=usr/share/wireshark/radius/dictionary.merit
+file path=usr/share/wireshark/radius/dictionary.meru
file path=usr/share/wireshark/radius/dictionary.microsoft
file path=usr/share/wireshark/radius/dictionary.mikrotik
file path=usr/share/wireshark/radius/dictionary.motorola
@@ -232,12 +248,15 @@
file path=usr/share/wireshark/radius/dictionary.ntua
file path=usr/share/wireshark/radius/dictionary.openser
file path=usr/share/wireshark/radius/dictionary.packeteer
+file path=usr/share/wireshark/radius/dictionary.paloalto
file path=usr/share/wireshark/radius/dictionary.patton
+file path=usr/share/wireshark/radius/dictionary.perle
file path=usr/share/wireshark/radius/dictionary.propel
file path=usr/share/wireshark/radius/dictionary.prosoft
+file path=usr/share/wireshark/radius/dictionary.proxim
+file path=usr/share/wireshark/radius/dictionary.purewave
file path=usr/share/wireshark/radius/dictionary.quiconnect
file path=usr/share/wireshark/radius/dictionary.quintum
-file path=usr/share/wireshark/radius/dictionary.redback
file path=usr/share/wireshark/radius/dictionary.redcreek
file path=usr/share/wireshark/radius/dictionary.rfc2865
file path=usr/share/wireshark/radius/dictionary.rfc2866
@@ -262,19 +281,37 @@
file path=usr/share/wireshark/radius/dictionary.rfc5904
file path=usr/share/wireshark/radius/dictionary.rfc6519
file path=usr/share/wireshark/radius/dictionary.rfc6572
+file path=usr/share/wireshark/radius/dictionary.rfc6677
+file path=usr/share/wireshark/radius/dictionary.rfc6911
+file path=usr/share/wireshark/radius/dictionary.rfc6929
+file path=usr/share/wireshark/radius/dictionary.rfc6930
+file path=usr/share/wireshark/radius/dictionary.rfc7055
+file path=usr/share/wireshark/radius/dictionary.rfc7155
+file path=usr/share/wireshark/radius/dictionary.rfc7268
+file path=usr/share/wireshark/radius/dictionary.rfc7499
+file path=usr/share/wireshark/radius/dictionary.riverbed
file path=usr/share/wireshark/radius/dictionary.riverstone
file path=usr/share/wireshark/radius/dictionary.roaringpenguin
+file path=usr/share/wireshark/radius/dictionary.ruckus
+file path=usr/share/wireshark/radius/dictionary.ruggedcom
+file path=usr/share/wireshark/radius/dictionary.sg
file path=usr/share/wireshark/radius/dictionary.shasta
file path=usr/share/wireshark/radius/dictionary.shiva
+file path=usr/share/wireshark/radius/dictionary.siemens
file path=usr/share/wireshark/radius/dictionary.slipstream
file path=usr/share/wireshark/radius/dictionary.sofaware
file path=usr/share/wireshark/radius/dictionary.sonicwall
file path=usr/share/wireshark/radius/dictionary.springtide
file path=usr/share/wireshark/radius/dictionary.starent
+file path=usr/share/wireshark/radius/dictionary.starent.vsa1
+file path=usr/share/wireshark/radius/dictionary.surfnet
+file path=usr/share/wireshark/radius/dictionary.symbol
file path=usr/share/wireshark/radius/dictionary.t_systems_nova
file path=usr/share/wireshark/radius/dictionary.telebit
file path=usr/share/wireshark/radius/dictionary.telkom
+file path=usr/share/wireshark/radius/dictionary.terena
file path=usr/share/wireshark/radius/dictionary.trapeze
+file path=usr/share/wireshark/radius/dictionary.travelping
file path=usr/share/wireshark/radius/dictionary.tropos
file path=usr/share/wireshark/radius/dictionary.ukerna
file path=usr/share/wireshark/radius/dictionary.unix
@@ -287,9 +324,14 @@
file path=usr/share/wireshark/radius/dictionary.waverider
file path=usr/share/wireshark/radius/dictionary.wichorus
file path=usr/share/wireshark/radius/dictionary.wimax
+file path=usr/share/wireshark/radius/dictionary.wimax.alvarion
file path=usr/share/wireshark/radius/dictionary.wimax.wichorus
file path=usr/share/wireshark/radius/dictionary.wispr
file path=usr/share/wireshark/radius/dictionary.xedia
+file path=usr/share/wireshark/radius/dictionary.xylan
+file path=usr/share/wireshark/radius/dictionary.yubico
+file path=usr/share/wireshark/radius/dictionary.zeus
+file path=usr/share/wireshark/radius/dictionary.zte
file path=usr/share/wireshark/radius/dictionary.zyxel
file path=usr/share/wireshark/randpkt.html
file path=usr/share/wireshark/rawshark.html
--- a/components/wireshark/wireshark.p5m Sun May 29 22:43:56 2016 -0700
+++ b/components/wireshark/wireshark.p5m Wed May 25 05:30:40 2016 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -34,10 +34,25 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2007/334
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/sbin/wireshark
-file wireshark-$(IPS_COMPONENT_VERSION)/wireshark.desktop \
+file usr/sbin/wireshark-gtk path=usr/sbin/wireshark
+file usr/share/applications/wireshark-gtk.desktop \
path=usr/share/applications/wireshark.desktop
+file path=usr/share/icons/hicolor/128x128/apps/wireshark.png
+file path=usr/share/icons/hicolor/128x128/mimetypes/application-wireshark-doc.png
+file path=usr/share/icons/hicolor/16x16/apps/wireshark.png
+file path=usr/share/icons/hicolor/16x16/mimetypes/application-wireshark-doc.png
+file path=usr/share/icons/hicolor/24x24/apps/wireshark.png
+file path=usr/share/icons/hicolor/24x24/mimetypes/application-wireshark-doc.png
+file path=usr/share/icons/hicolor/256x256/apps/wireshark.png
+file path=usr/share/icons/hicolor/256x256/mimetypes/application-wireshark-doc.png
+file path=usr/share/icons/hicolor/32x32/apps/wireshark.png
+file path=usr/share/icons/hicolor/32x32/mimetypes/application-wireshark-doc.png
+file path=usr/share/icons/hicolor/48x48/apps/wireshark.png
+file path=usr/share/icons/hicolor/48x48/mimetypes/application-wireshark-doc.png
+file path=usr/share/icons/hicolor/64x64/mimetypes/application-wireshark-doc.png
+file path=usr/share/icons/hicolor/scalable/apps/wireshark.svg
file path=usr/share/man/man1/wireshark.1
+file path=usr/share/mime/packages/wireshark.xml
file wireshark-$(IPS_COMPONENT_VERSION)/image/wsicon64.png \
path=usr/share/pixmaps/wireshark.png
license COPYING license=GPLv2