# HG changeset patch
# User Petr Sumbera <petr.sumbera@oracle.com>
# Date 1406014410 25200
# Node ID d8137835c0b4a6a80ef8c279e8e3c1401c2c878f
# Parent  f89394c8965279b612e442218db771bce0f3ba4d
19155791 Upgrade Wireshark to version 1.10.8
19014270 problem in UTILITY/WIRESHARK

diff -r f89394c89652 -r d8137835c0b4 components/wireshark/Makefile
--- a/components/wireshark/Makefile	Fri Jul 18 06:53:27 2014 -0700
+++ b/components/wireshark/Makefile	Tue Jul 22 00:33:30 2014 -0700
@@ -23,19 +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=			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)
 
diff -r f89394c89652 -r d8137835c0b4 components/wireshark/tshark.p5m
--- a/components/wireshark/tshark.p5m	Fri Jul 18 06:53:27 2014 -0700
+++ b/components/wireshark/tshark.p5m	Tue Jul 22 00:33:30 2014 -0700
@@ -26,7 +26,7 @@
     value=pkg:/diagnostic/wireshark/tshark@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Command-line network protocol analyzer"
 set name=com.oracle.info.description value="TShark, the Wireshark command line network protocol analyzer"
-set name=com.oracle.info.tpno value=17414
+set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Internet
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
diff -r f89394c89652 -r d8137835c0b4 components/wireshark/wireshark-common.p5m
--- a/components/wireshark/wireshark-common.p5m	Fri Jul 18 06:53:27 2014 -0700
+++ b/components/wireshark/wireshark-common.p5m	Tue Jul 22 00:33:30 2014 -0700
@@ -26,7 +26,7 @@
     value=pkg:/diagnostic/wireshark/wireshark-common@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Libraries and Tools used by Wireshark and TShark Network protocol analyzers"
 set name=com.oracle.info.description value="the Wireshark and TShark common libraries and tools"
-set name=com.oracle.info.tpno value=17414
+set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Internet
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -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
 
diff -r f89394c89652 -r d8137835c0b4 components/wireshark/wireshark.p5m
--- a/components/wireshark/wireshark.p5m	Fri Jul 18 06:53:27 2014 -0700
+++ b/components/wireshark/wireshark.p5m	Tue Jul 22 00:33:30 2014 -0700
@@ -26,7 +26,7 @@
     value=pkg:/diagnostic/wireshark@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Graphical network protocol analyzer"
 set name=com.oracle.info.description value="the Wireshark graphical network protocol analyzer"
-set name=com.oracle.info.tpno value=17414
+set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Internet
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)