21081515 Upgrade Wireshark to version 1.12.5
19016321 Support for DCBx-CEE TLVs in wireshark
21081432 problem in UTILITY/WIRESHARK
--- a/components/wireshark/Makefile Tue May 19 10:36:23 2015 -0700
+++ b/components/wireshark/Makefile Wed May 13 04:53:25 2015 -0700
@@ -23,16 +23,16 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= wireshark
-COMPONENT_VERSION= 1.10.13
+COMPONENT_VERSION= 1.12.5
COMPONENT_PROJECT_URL= http://www.wireshark.org/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
COMPONENT_ARCHIVE_HASH= \
- sha256:aed87fbe2f4c3e03101717cb9b98f2a6adf83a8dd1d374211aa5f7afda13c2d4
+ sha256:d0f177b2ef49e4deae4ff7d3299bdd295ba558a3934ce8ae489b2f13927cbd82
COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/wireshark
-TPNO= 21831
+TPNO= 22659
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
@@ -55,15 +55,14 @@
CONFIGURE_OPTIONS += --disable-randpkt
CONFIGURE_OPTIONS += --disable-dftest
CONFIGURE_OPTIONS += --with-krb5
+CONFIGURE_OPTIONS += --with-qt=no
+CONFIGURE_OPTIONS += --with-gtk2=yes
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
CONFIGURE_OPTIONS += PATH="/usr/perl5/bin:/usr/gnu/bin:$(PATH)"
# Use the 64-bit versions of pkg-config files
CONFIGURE_ENV += PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)"
-# Version 1.10 (libwireshark.so) doesn't play nicely with -Bdirect.
-LD_B_DIRECT=
-
# We need to avoid RPATH=/usr/lib in Wireshark libraries so that we can
# create successfully IPS package of different Wireshark branch than is
# installed on build system without dependency errors.
@@ -77,17 +76,29 @@
chmod 755 config.status; \
./config.status)
+# 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).
+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)
+
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
test: $(NO_TESTS)
-
REQUIRED_PACKAGES += developer/lexer/flex
REQUIRED_PACKAGES += developer/parser/bison
REQUIRED_PACKAGES += diagnostic/wireshark/wireshark-common
REQUIRED_PACKAGES += library/desktop/cairo
+REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
REQUIRED_PACKAGES += library/desktop/gtk2
REQUIRED_PACKAGES += library/desktop/pango
REQUIRED_PACKAGES += library/glib2
--- a/components/wireshark/patches/DesktopEntry.patch Tue May 19 10:36:23 2015 -0700
+++ b/components/wireshark/patches/DesktopEntry.patch Wed May 13 04:53:25 2015 -0700
@@ -1,6 +1,11 @@
+Patch origin: in-house
+Patch status: Solaris-specific; not suitable for upstream
+
+Starts Wireshark via pfexec to leverage any given privileges.
+
--- wireshark.desktop
+++ wireshark.desktop
-@@ -70,8 +70,8 @@
+@@ -69,8 +69,8 @@
Comment[fr]=Analyseur de trafic réseau
Comment[sv]=Nätverkstrafikanalysator
Icon=wireshark
--- a/components/wireshark/patches/evb.patch Tue May 19 10:36:23 2015 -0700
+++ b/components/wireshark/patches/evb.patch Wed May 13 04:53:25 2015 -0700
@@ -1,8 +1,13 @@
+Patch origin: in-house
+Patch status: Will be sent to upstream.
+
+Oracle Solaris ECP/VDP dissection based on IEEE 802.1Qbg Draft 2.1.
+
Index: epan/oui.h
===================================================================
--- epan/oui.h (revision 41973)
+++ epan/oui.h (working copy)
-@@ -47,6 +47,7 @@
+@@ -45,6 +45,7 @@
#define OUI_ERICSSON 0x0001EC /* Ericsson Group */
#define OUI_CATENA 0x00025A /* Catena Networks */
#define OUI_ATHEROS 0x00037F /* Atheros Communications */
@@ -14,7 +19,7 @@
===================================================================
--- epan/etypes.h (revision 41973)
+++ epan/etypes.h (working copy)
-@@ -514,6 +514,10 @@
+@@ -526,6 +526,10 @@
#define ETHERTYPE_HSR 0x892F /* High-availability Seamless Redundancy (IEC62439 Part 3) */
#endif
@@ -29,7 +34,7 @@
===================================================================
--- epan/dissectors/packet-ecp.c (revision 0)
+++ epan/dissectors/packet-ecp.c (revision 0)
-@@ -0,0 +1,616 @@
+@@ -0,0 +1,619 @@
+/* packet-ecp.c
+ * Routines for Solaris ECP/VDP dissection based on IEEE 802.1Qbg Draft 2.1
+ *
@@ -70,6 +75,7 @@
+static int proto_vdp = -1;
+static int hf_vdp_tlv_type = -1;
+static int hf_vdp_tlv_len = -1;
++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_vsitypeid = -1;
@@ -203,6 +209,12 @@
+ { 0x0, NULL }
+};
+
++static const true_false_string tfs_tlv_len_invalid = {
++ "",
++ ""
++};
++
++
+static void
+vdp_add_vidstr(tvbuff_t *tvb, proto_tree *tree, guint32 offset, proto_item *ti)
+{
@@ -304,7 +316,7 @@
+ offset++;
+
+ /* VSIID */
-+ str = tvb_bytes_to_str_punct(tvb, offset, 16, ':');
++ str = tvb_bytes_to_ep_str_punct(tvb, offset, 16, ':');
+ proto_tree_add_text(vdp_tlv_assoc_tree, tvb, offset, 16,
+ "VSIID: %s", str);
+ offset += 16;
@@ -356,10 +368,7 @@
+ tlvlen = TLV_INFO_LEN(tlvhdr);
+ if (tlvlen != 16) {
+ if (tree) {
-+ proto_tree_add_text(vdp_tlv_mgrid_tree, tvb, offset, 2,
-+ "%s Invalid Length: %u",
-+ decode_boolean_bitfield(tlvlen, TLV_INFO_LEN_MASK,
-+ 16, "", ""), tlvlen);
++ proto_tree_add_boolean(vdp_tlv_mgrid_tree, hf_vdp_tlv_len_invalid, tvb, offset, 2, tlvlen);
+ }
+ return -1;
+ }
@@ -399,10 +408,7 @@
+ tlvlen = TLV_INFO_LEN(tlvhdr);
+ if (tlvlen < 3) {
+ if (tree) {
-+ proto_tree_add_text(tree, tvb, offset, 2,
-+ "%s Invalid Length: %u",
-+ decode_boolean_bitfield(tlvlen, TLV_INFO_LEN_MASK,
-+ 16, "", ""), tlvlen);
++ proto_tree_add_boolean(tree, hf_vdp_tlv_len_invalid, tvb, offset, 2, tlvlen);
+ }
+ return -1;
+ }
@@ -504,11 +510,10 @@
+ ver = ECP_VERSION(hdr);
+ op = ECP_OP(hdr);
+ subtype = ECP_SUBTYPE(hdr);
-+ if (check_col(pinfo->cinfo, COL_INFO)) {
-+ col_append_fstr(pinfo->cinfo, COL_INFO,
-+ "PDU Version = %x OP = %x"
-+ " Subtype = %x", ver, op, subtype);
-+ }
++ col_append_fstr(pinfo->cinfo, COL_INFO,
++ "PDU Version = %x OP = %x"
++ " Subtype = %x", ver, op, subtype);
++
+ if (tree) {
+ /* details */
+ ti = proto_tree_add_item(tree, proto_ecp, tvb, 0, -1, ENC_NA);
@@ -572,7 +577,10 @@
+ { &hf_vdp_tlv_len,
+ { "VDP TLV Length", "vdp.tlvlen", FT_UINT16, BASE_DEC,
+ NULL, TLV_INFO_LEN_MASK, NULL, HFILL }},
-+
++ { &hf_vdp_tlv_len_invalid,
++ { "VDP TLV Invalid Length", "vdp.tlvlen_invalid", FT_BOOLEAN,
++ 16, TFS(&tfs_tlv_len_invalid), TLV_INFO_LEN_MASK,
++ NULL, HFILL}},
+ { &hf_vdp_tlv_assoc_reason,
+ { "Reason/Status", "vdp.assoc.reason", FT_UINT8, BASE_HEX,
+ NULL, 0x0, NULL, HFILL }},
@@ -650,11 +658,11 @@
===================================================================
--- epan/dissectors/Makefile.common (revision 41973)
+++ epan/dissectors/Makefile.common (working copy)
-@@ -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 \
+@@ -118,6 +118,7 @@
+ packet-dop.c \
+ packet-dsp.c \
+ packet-ess.c \
++ packet-ecp.c \
+ packet-ftam.c \
+ packet-goose.c \
+ packet-HI2Operations.c \
--- a/components/wireshark/patches/man.patch Tue May 19 10:36:23 2015 -0700
+++ b/components/wireshark/patches/man.patch Wed May 13 04:53:25 2015 -0700
@@ -1,6 +1,11 @@
+Patch origin: in-house
+Patch status: Solaris-specific; not suitable for upstream
+
+Solaris specific documentation changes.
+
--- doc/tshark.pod
+++ doc/tshark.pod
-@@ -449,9 +449,9 @@
+@@ -478,9 +478,9 @@
Network interface names should match one of the names listed in
"B<tshark -D>" (described above); a number, as reported by
@@ -13,7 +18,7 @@
If no interface is specified, B<TShark> searches the list of
interfaces, choosing the first non-loopback interface if there are any
-@@ -1403,7 +1403,7 @@
+@@ -1469,7 +1469,7 @@
=head1 CAPTURE FILTER SYNTAX
@@ -22,7 +27,7 @@
or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
=head1 READ FILTER SYNTAX
-@@ -1672,7 +1672,7 @@
+@@ -1756,7 +1756,7 @@
=head1 SEE ALSO
wireshark-filter(4), wireshark(1), editcap(1), pcap(3), dumpcap(1),
@@ -46,7 +51,7 @@
If no interface is specified, B<Wireshark> searches the list of
interfaces, choosing the first non-loopback interface if there are any
-@@ -2457,7 +2457,7 @@
+@@ -2476,7 +2476,7 @@
=head1 CAPTURE FILTER SYNTAX
@@ -55,7 +60,7 @@
or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
=head1 DISPLAY FILTER SYNTAX
-@@ -2837,7 +2837,7 @@
+@@ -2874,7 +2874,7 @@
=head1 SEE ALSO
wireshark-filter(4), tshark(1), editcap(1), pcap(3), dumpcap(1), mergecap(1),
@@ -77,7 +82,7 @@
--- doc/dumpcap.pod
+++ doc/dumpcap.pod
-@@ -342,13 +342,13 @@
+@@ -349,13 +349,13 @@
=head1 CAPTURE FILTER SYNTAX
@@ -95,7 +100,7 @@
--- doc/editcap.pod
+++ doc/editcap.pod
-@@ -339,7 +339,7 @@
+@@ -380,7 +380,7 @@
=head1 SEE ALSO
pcap(3), wireshark(1), tshark(1), mergecap(1), dumpcap(1), capinfos(1),
@@ -117,7 +122,7 @@
--- doc/rawshark.pod
+++ doc/rawshark.pod
-@@ -507,7 +507,7 @@
+@@ -546,7 +546,7 @@
=head1 SEE ALSO
wireshark-filter(4), wireshark(1), tshark(1), editcap(1), pcap(3), dumpcap(1),
@@ -128,7 +133,7 @@
--- doc/text2pcap.pod
+++ doc/text2pcap.pod
-@@ -223,7 +223,7 @@
+@@ -238,7 +238,7 @@
=head1 SEE ALSO
od(1), pcap(3), wireshark(1), tshark(1), dumpcap(1), mergecap(1),
--- a/components/wireshark/wireshark-common.p5m Tue May 19 10:36:23 2015 -0700
+++ b/components/wireshark/wireshark-common.p5m Wed May 13 04:53:25 2015 -0700
@@ -37,20 +37,24 @@
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.3.1.$(MICRO_VERSION)
-link path=usr/lib/$(MACH64)/libwireshark.so.3 \
- target=libwireshark.so.3.1.$(MICRO_VERSION)
-file path=usr/lib/$(MACH64)/libwireshark.so.3.1.$(MICRO_VERSION)
+ 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)/libwiretap.so \
- target=libwiretap.so.3.0.$(MICRO_VERSION)
-link path=usr/lib/$(MACH64)/libwiretap.so.3 \
- target=libwiretap.so.3.0.$(MICRO_VERSION)
-file path=usr/lib/$(MACH64)/libwiretap.so.3.0.$(MICRO_VERSION)
-link path=usr/lib/$(MACH64)/libwsutil.so target=libwsutil.so.3.0.0
-link path=usr/lib/$(MACH64)/libwsutil.so.3 target=libwsutil.so.3.0.0
-file path=usr/lib/$(MACH64)/libwsutil.so.3.0.0
-file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/asn1.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
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
@@ -88,14 +92,17 @@
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/Nokia.xml
file path=usr/share/wireshark/diameter/NokiaSiemensNetworks.xml
file path=usr/share/wireshark/diameter/SKT.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/Vodafone.xml
file path=usr/share/wireshark/diameter/chargecontrol.xml
file path=usr/share/wireshark/diameter/dictionary.dtd
@@ -148,6 +155,7 @@
file path=usr/share/wireshark/radius/dictionary.acme
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