17827024 Upgrade Wireshark to version 1.8.11 (for 11.1SRU) s11u1-sru
authorPetr Sumbera <petr.sumbera@oracle.com>
Tue, 26 Nov 2013 13:57:44 -0800
branchs11u1-sru
changeset 2833 7c462f1b96b8
parent 2830 3d056f49638d
child 2834 d69aa373f992
17827024 Upgrade Wireshark to version 1.8.11 (for 11.1SRU) 17731750 problem in UTILITY/WIRESHARK 17240842 tshark and wireshark-comon have optional depend on nonexistant pkg
components/wireshark/Makefile
components/wireshark/tshark.p5m
components/wireshark/wireshark-common.p5m
--- a/components/wireshark/Makefile	Mon Nov 25 14:43:56 2013 -0800
+++ b/components/wireshark/Makefile	Tue Nov 26 13:57:44 2013 -0800
@@ -23,12 +23,12 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		wireshark
-COMPONENT_VERSION=	1.8.10
+COMPONENT_VERSION=	1.8.11
 COMPONENT_PROJECT_URL=	http://www.wireshark.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:27b67be9c8024c18899f1694698b01b589f3111f673f3e8da62cbe548cd2c242
+    sha256:fcba2bd7ccd85d0d68cda18d0d6422be45a7f04dcd897b59a4aa859ff48f8fdb
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
--- a/components/wireshark/tshark.p5m	Mon Nov 25 14:43:56 2013 -0800
+++ b/components/wireshark/tshark.p5m	Tue Nov 26 13:57:44 2013 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -41,4 +41,4 @@
 
 license wireshark.license license=GPLv2
 
-depend type=optional fmri=diagnostic/wireshark/[email protected],5.11-0.172
+depend type=optional fmri=diagnostic/[email protected],5.11-0.172
--- a/components/wireshark/wireshark-common.p5m	Mon Nov 25 14:43:56 2013 -0800
+++ b/components/wireshark/wireshark-common.p5m	Tue Nov 26 13:57:44 2013 -0800
@@ -54,8 +54,8 @@
 dir path=usr/share/wireshark/tpncp
 dir path=usr/share/wireshark/wimaxasncp
 file exec_attr.dumpcap path=etc/security/exec_attr.d/diagnostic:wireshark:wireshark-common
-file path=usr/lib/libwireshark.so.2.0.10
-file path=usr/lib/libwiretap.so.2.1.10
+file path=usr/lib/libwireshark.so.2.0.11
+file path=usr/lib/libwiretap.so.2.1.11
 file path=usr/lib/libwsutil.so.2.0.0
 file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/asn1.so
 file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/docsis.so
@@ -293,12 +293,12 @@
 file path=usr/share/wireshark/ws.css
 
 license wireshark.license license=GPLv2
-link path=usr/lib/libwireshark.so target=libwireshark.so.2.0.10
-link path=usr/lib/libwireshark.so.2 target=libwireshark.so.2.0.10
-link path=usr/lib/libwiretap.so target=libwiretap.so.2.1.10
-link path=usr/lib/libwiretap.so.2 target=libwiretap.so.2.1.10
+link path=usr/lib/libwireshark.so target=libwireshark.so.2.0.11
+link path=usr/lib/libwireshark.so.2 target=libwireshark.so.2.0.11
+link path=usr/lib/libwiretap.so target=libwiretap.so.2.1.11
+link path=usr/lib/libwiretap.so.2 target=libwiretap.so.2.1.11
 link path=usr/lib/libwsutil.so target=libwsutil.so.2.0.0
 link path=usr/lib/libwsutil.so.2 target=libwsutil.so.2.0.0
 
-depend type=optional fmri=diagnostic/wireshark/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+depend type=optional fmri=diagnostic/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 depend type=optional fmri=diagnostic/wireshark/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)