# HG changeset patch
# User Petr Sumbera <petr.sumbera@oracle.com>
# Date 1396341546 25200
# Node ID 98abf9cbe64909b85d6e87bb8b00a1fbb8fe38f0
# Parent  c90fa3307f21609be9f20220fa2ecfc2c87932ce
18457505 Upgrade Wireshark to version 1.10.6
18384235 problem in UTILITY/WIRESHARK

diff -r c90fa3307f21 -r 98abf9cbe649 components/wireshark/Makefile
--- a/components/wireshark/Makefile	Mon Mar 31 21:40:30 2014 -0700
+++ b/components/wireshark/Makefile	Tue Apr 01 01:39:06 2014 -0700
@@ -23,12 +23,12 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		wireshark
-COMPONENT_VERSION=	1.10.5
+COMPONENT_VERSION=	1.10.6
 COMPONENT_PROJECT_URL=	http://www.wireshark.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:a02190da9573dd381e7598277a31d0c63b05b2af9fe05ab6b7fc058bbea141f5
+    sha256:a9de3fd3002d4df0946cfea2f5a33557666e14c7014dbc42d1f78dfe113f6b5d
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/wireshark
 
diff -r c90fa3307f21 -r 98abf9cbe649 components/wireshark/wireshark-common.p5m
--- a/components/wireshark/wireshark-common.p5m	Mon Mar 31 21:40:30 2014 -0700
+++ b/components/wireshark/wireshark-common.p5m	Tue Apr 01 01:39:06 2014 -0700
@@ -35,8 +35,8 @@
     value=PSARC/2007/334
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file exec_attr.dumpcap path=etc/security/exec_attr.d/diagnostic:wireshark:wireshark-common
-file path=usr/lib/$(MACH64)/libwireshark.so.3.1.5
-file path=usr/lib/$(MACH64)/libwiretap.so.3.0.5
+file path=usr/lib/$(MACH64)/libwireshark.so.3.1.6
+file path=usr/lib/$(MACH64)/libwiretap.so.3.0.6
 file path=usr/lib/$(MACH64)/libwsutil.so.3.0.0
 file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/asn1.so
 file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/docsis.so
@@ -285,10 +285,10 @@
 file path=usr/share/wireshark/ws.css
 
 license wireshark.license license=GPLv2
-link path=usr/lib/$(MACH64)/libwireshark.so target=libwireshark.so.3.1.5
-link path=usr/lib/$(MACH64)/libwireshark.so.3 target=libwireshark.so.3.1.5
-link path=usr/lib/$(MACH64)/libwiretap.so target=libwiretap.so.3.0.5
-link path=usr/lib/$(MACH64)/libwiretap.so.3 target=libwiretap.so.3.0.5
+link path=usr/lib/$(MACH64)/libwireshark.so target=libwireshark.so.3.1.6
+link path=usr/lib/$(MACH64)/libwireshark.so.3 target=libwireshark.so.3.1.6
+link path=usr/lib/$(MACH64)/libwiretap.so target=libwiretap.so.3.0.6
+link path=usr/lib/$(MACH64)/libwiretap.so.3 target=libwiretap.so.3.0.6
 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