18123708 Upgrade Wireshark to version 1.8.12 (for 11.1SRU)
18010389 problem in UTILITY/WIRESHARK
--- a/components/wireshark/Makefile Wed Jan 22 21:51:25 2014 -0800
+++ b/components/wireshark/Makefile Thu Jan 23 06:43:28 2014 -0800
@@ -18,17 +18,17 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= wireshark
-COMPONENT_VERSION= 1.8.11
+COMPONENT_VERSION= 1.8.12
COMPONENT_PROJECT_URL= http://www.wireshark.org/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
COMPONENT_ARCHIVE_HASH= \
- sha256:fcba2bd7ccd85d0d68cda18d0d6422be45a7f04dcd897b59a4aa859ff48f8fdb
+ sha256:f99080ad249b01c22371cc4e0feae9260312053e0162f1785d6849708bc0cb93
COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE)
include ../../make-rules/prep.mk
--- a/components/wireshark/wireshark-common.p5m Wed Jan 22 21:51:25 2014 -0800
+++ b/components/wireshark/wireshark-common.p5m Thu Jan 23 06:43:28 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -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.11
-file path=usr/lib/libwiretap.so.2.1.11
+file path=usr/lib/libwireshark.so.2.0.12
+file path=usr/lib/libwiretap.so.2.1.12
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,10 +293,10 @@
file path=usr/share/wireshark/ws.css
license wireshark.license license=GPLv2
-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/libwireshark.so target=libwireshark.so.2.0.12
+link path=usr/lib/libwireshark.so.2 target=libwireshark.so.2.0.12
+link path=usr/lib/libwiretap.so target=libwiretap.so.2.1.12
+link path=usr/lib/libwiretap.so.2 target=libwiretap.so.2.1.12
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