# HG changeset patch
# User Petr Sumbera <petr.sumbera@oracle.com>
# Date 1453217261 28800
# Node ID a83f71c2f5cf4c54e49531c38cd593f6c486bcbb
# Parent  4ec6f72e88e0e6403affc7a392866f6810d2a598
22503479 Upgrade Wireshark to version 1.12.9
22496202 problem in UTILITY/WIRESHARK
22501938 problem in UTILITY/WIRESHARK
22501946 problem in UTILITY/WIRESHARK
22501961 problem in UTILITY/WIRESHARK
22501972 problem in UTILITY/WIRESHARK
22501980 problem in UTILITY/WIRESHARK
22501994 problem in UTILITY/WIRESHARK
22502001 problem in UTILITY/WIRESHARK
22502011 problem in UTILITY/WIRESHARK
22502019 problem in UTILITY/WIRESHARK
22502029 problem in UTILITY/WIRESHARK
22502036 problem in UTILITY/WIRESHARK
22502052 problem in UTILITY/WIRESHARK
22502063 problem in UTILITY/WIRESHARK
22502077 problem in UTILITY/WIRESHARK
22502092 problem in UTILITY/WIRESHARK
22502104 problem in UTILITY/WIRESHARK
22502112 problem in UTILITY/WIRESHARK
22502124 problem in UTILITY/WIRESHARK
22502136 problem in UTILITY/WIRESHARK
22502147 problem in UTILITY/WIRESHARK
22502156 problem in UTILITY/WIRESHARK
22502172 problem in UTILITY/WIRESHARK

diff -r 4ec6f72e88e0 -r a83f71c2f5cf components/wireshark/Makefile
--- a/components/wireshark/Makefile	Tue Jan 19 07:17:27 2016 -0800
+++ b/components/wireshark/Makefile	Tue Jan 19 07:27:41 2016 -0800
@@ -18,21 +18,21 @@
 #
 # 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.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		wireshark
-COMPONENT_VERSION=	1.12.8
+COMPONENT_VERSION=	1.12.9
 COMPONENT_PROJECT_URL=	http://www.wireshark.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7
+    sha256:fca9c8365a3839f2411e67dddbfd17e87e906dfeb1cb9f91727013e1f2179e80
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/wireshark
 
-TPNO=			25137
+TPNO=			26265
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
diff -r 4ec6f72e88e0 -r a83f71c2f5cf components/wireshark/wireshark-common.p5m
--- a/components/wireshark/wireshark-common.p5m	Tue Jan 19 07:17:27 2016 -0800
+++ b/components/wireshark/wireshark-common.p5m	Tue Jan 19 07:27:41 2016 -0800
@@ -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>
@@ -293,6 +293,7 @@
 file path=usr/share/wireshark/radius/dictionary.zyxel
 file path=usr/share/wireshark/randpkt.html
 file path=usr/share/wireshark/rawshark.html
+file path=usr/share/wireshark/reordercap.html
 file path=usr/share/wireshark/services
 file path=usr/share/wireshark/smi_modules
 file path=usr/share/wireshark/text2pcap.html