19155791 Upgrade Wireshark to version 1.10.8
19014270 problem in UTILITY/WIRESHARK
--- a/components/wireshark/Makefile Mon Jul 07 13:15:12 2014 -0700
+++ b/components/wireshark/Makefile Mon Jul 07 14:51:25 2014 -0700
@@ -23,21 +23,25 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= wireshark
-COMPONENT_VERSION= 1.10.7
+COMPONENT_VERSION= 1.10.8
COMPONENT_PROJECT_URL= http://www.wireshark.org/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
COMPONENT_ARCHIVE_HASH= \
- sha256:d98d263b31dd904a0337ba2db6d1a80bb495b4ac419a304f0f25c551d50cafc6
+ sha256:27d9cf4f0ca1ac436104b7f27caf8ad65f73db09edc8df0742ce9688c7d38763
COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/wireshark
-TPNO= 17414
+TPNO= 18282
include ../../make-rules/prep.mk
include ../../make-rules/configure.mk
include ../../make-rules/ips.mk
+# Micro version for easy libraries packaging
+MICRO_VERSION:= $(shell echo $(COMPONENT_VERSION) | awk -F. '{ print $$3 }')
+PKG_MACROS+= MICRO_VERSION=$(MICRO_VERSION)
+
# Enable ASLR for this component
ASLR_MODE = $(ASLR_ENABLE)
--- a/components/wireshark/wireshark-common.p5m Mon Jul 07 13:15:12 2014 -0700
+++ b/components/wireshark/wireshark-common.p5m Mon Jul 07 14:51:25 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.7
-file path=usr/lib/$(MACH64)/libwiretap.so.3.0.7
+file path=usr/lib/$(MACH64)/libwireshark.so.3.1.$(MICRO_VERSION)
+file path=usr/lib/$(MACH64)/libwiretap.so.3.0.$(MICRO_VERSION)
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 COPYING license=GPLv2
-link path=usr/lib/$(MACH64)/libwireshark.so target=libwireshark.so.3.1.7
-link path=usr/lib/$(MACH64)/libwireshark.so.3 target=libwireshark.so.3.1.7
-link path=usr/lib/$(MACH64)/libwiretap.so target=libwiretap.so.3.0.7
-link path=usr/lib/$(MACH64)/libwiretap.so.3 target=libwiretap.so.3.0.7
+link path=usr/lib/$(MACH64)/libwireshark.so target=libwireshark.so.3.1.$(MICRO_VERSION)
+link path=usr/lib/$(MACH64)/libwireshark.so.3 target=libwireshark.so.3.1.$(MICRO_VERSION)
+link path=usr/lib/$(MACH64)/libwiretap.so target=libwiretap.so.3.0.$(MICRO_VERSION)
+link path=usr/lib/$(MACH64)/libwiretap.so.3 target=libwiretap.so.3.0.$(MICRO_VERSION)
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