--- a/components/wireshark/Makefile	Wed Jul 20 06:05:37 2016 -0700
+++ b/components/wireshark/Makefile	Wed Jul 20 01:31:35 2016 -0700
@@ -23,16 +23,16 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		wireshark
-COMPONENT_VERSION=	2.0.3
+COMPONENT_VERSION=	2.0.4
 COMPONENT_PROJECT_URL=	http://www.wireshark.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:e196376e75fe21fdef41b4eaa27ce2e1b2b561e7f7b20328a8e96657cc4465fc
+    sha256:9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/wireshark
 
-TPNO=			28025
+TPNO=			29395
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -60,8 +60,6 @@
 CONFIGURE_OPTIONS +=	--with-gtk2=yes
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)" 
 CONFIGURE_OPTIONS +=	PATH="/usr/perl5/bin:/usr/gnu/bin:$(PATH)"
-# Workaround for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12391
-CONFIGURE_OPTIONS +=	ac_cv_func_gethostbyname=yes
 
 # Use the 64-bit versions of pkg-config files
 CONFIGURE_ENV +=	PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)"
@@ -81,12 +79,11 @@
 
 # During install libtool will relink libwireshark library so that it
 # requires libwiretap version from system and not from proto area.
-# This can be removed if SRU CBE is updated to contain Wireshark 2.0.
+# This workaround is only needed when CBE contains older libwiretap.
+LIBWIRESHARK=$(PROTOUSRLIBDIR64)/libwireshark.so.6.1.$(MICRO_VERSION)
 COMPONENT_POST_INSTALL_ACTION = \
-	(/usr/bin/elfdump -d $(PROTO_DIR)/usr/lib/$(MACH64)/libwireshark.so.6.1.0 | \
-	    grep 'libwiretap.so.4' && /usr/bin/elfedit \
-	    -e 'dyn:value -s -with-valstr libwiretap.so.4 libwiretap.so.5' \
-	    $(PROTO_DIR)/usr/lib/$(MACH64)/libwireshark.so.6.1.0; true)
+	(WTAP=`$(ELFEDIT) -e dyn:dump $(LIBWIRESHARK) | grep 'libwiretap' | awk '{print $$4}'` \
+	; $(ELFEDIT) -e "dyn:value -s -with-valstr $$WTAP libwiretap.so.5" $(LIBWIRESHARK) )
 
 configure:	$(CONFIGURE_64)
 

--- a/components/wireshark/wireshark-common.p5m	Wed Jul 20 06:05:37 2016 -0700
+++ b/components/wireshark/wireshark-common.p5m	Wed Jul 20 01:31:35 2016 -0700
@@ -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.6.1.0
-link path=usr/lib/$(MACH64)/libwireshark.so.6 target=libwireshark.so.6.1.0
-file path=usr/lib/$(MACH64)/libwireshark.so.6.1.0
+link path=usr/lib/$(MACH64)/libwireshark.so \
+    target=libwireshark.so.6.1.$(MICRO_VERSION)
+link path=usr/lib/$(MACH64)/libwireshark.so.6 \
+    target=libwireshark.so.6.1.$(MICRO_VERSION)
+file path=usr/lib/$(MACH64)/libwireshark.so.6.1.$(MICRO_VERSION)
 link path=usr/lib/$(MACH64)/libwiretap.so \
     target=libwiretap.so.5.0.$(MICRO_VERSION)
 link path=usr/lib/$(MACH64)/libwiretap.so.5 \

--- a/make-rules/shared-macros.mk	Wed Jul 20 06:05:37 2016 -0700
+++ b/make-rules/shared-macros.mk	Wed Jul 20 01:31:35 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 PATH=/usr/bin:/usr/gnu/bin
@@ -407,6 +407,7 @@
 TCLSH =		$(TCLSH.$(TCL_VERSION).$(MACH).$(BITS))
 
 CCSMAKE =	/usr/ccs/bin/make
+ELFEDIT =	/usr/bin/elfedit
 GMAKE =		/usr/gnu/bin/make
 GPATCH =	/usr/gnu/bin/patch
 PATCH_LEVEL =	1