25443214 Upgrade Wireshark to version 2.2.4
25443235 problem in UTILITY/WIRESHARK
--- a/components/wireshark/Makefile Mon Feb 13 11:35:38 2017 -0800
+++ b/components/wireshark/Makefile Tue Jan 24 04:19:08 2017 -0800
@@ -20,20 +20,20 @@
#
#
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
#
BUILD_BITS= 64
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= wireshark
-COMPONENT_VERSION= 2.2.2
+COMPONENT_VERSION= 2.2.4
COMPONENT_PROJECT_URL= http://www.wireshark.org/
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
COMPONENT_ARCHIVE_HASH= \
- sha256:f9acef5e9a9021a400b4244fafc06969f41ec594ec57fd7f0ff63bafca0055b3
+ sha256:42a7fb35eed5a32478153e24601a284bb50148b7ba919c3e8452652f4c2a3911
COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE)
-TPNO= 32709
+TPNO= 33580
# Enable adiheap and adistack security extensions
ADIHEAP_MODE = $(ADIHEAP_ENABLE)
@@ -87,7 +87,7 @@
# During install libtool will relink libwireshark library so that it
# requires libwiretap version from system and not from proto area.
# This workaround is only needed when CBE contains older libwiretap.
-LIBWIRESHARK=$(PROTOUSRLIBDIR64)/libwireshark.so.8.1.0
+LIBWIRESHARK=$(PROTOUSRLIBDIR64)/libwireshark.so.8.1.$(MICRO_VERSION)
COMPONENT_POST_INSTALL_ACTION = \
(WTAP=`$(ELFEDIT) -e dyn:dump $(LIBWIRESHARK) | grep 'libwiretap' | awk '{print $$4}'` \
; $(ELFEDIT) -e "dyn:value -s -with-valstr $$WTAP libwiretap.so.6" $(LIBWIRESHARK) )
--- a/components/wireshark/patches/release_version.patch Mon Feb 13 11:35:38 2017 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=13163
-
---- make-version.pl
-+++ make-version.pl
-@@ -689,9 +689,11 @@
- }
-
- if (! open(FILE, "<$vconf_file")) {
-- print_diag "Version configuration file $vconf_file not "
-- . "found. Using defaults.\n";
-- return 1;
-+ if (! open(FILE, "<$srcdir/$vconf_file")) {
-+ print_diag "Version configuration file $vconf_file not "
-+ . "found. Using defaults.\n";
-+ return 1;
-+ }
- }
-
- while (<FILE>) {
--- a/components/wireshark/wireshark-common.p5m Mon Feb 13 11:35:38 2017 -0800
+++ b/components/wireshark/wireshark-common.p5m Tue Jan 24 04:19:08 2017 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -37,9 +37,11 @@
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)/libwireshark.so target=libwireshark.so.8.1.0
-link path=usr/lib/$(MACH64)/libwireshark.so.8 target=libwireshark.so.8.1.0
-file path=usr/lib/$(MACH64)/libwireshark.so.8.1.0
+link path=usr/lib/$(MACH64)/libwireshark.so \
+ target=libwireshark.so.8.1.$(MICRO_VERSION)
+link path=usr/lib/$(MACH64)/libwireshark.so.8 \
+ target=libwireshark.so.8.1.$(MICRO_VERSION)
+file path=usr/lib/$(MACH64)/libwireshark.so.8.1.$(MICRO_VERSION)
link path=usr/lib/$(MACH64)/libwiretap.so \
target=libwiretap.so.6.0.$(MICRO_VERSION)
link path=usr/lib/$(MACH64)/libwiretap.so.6 \