--- a/components/wireshark/Makefile Thu Feb 09 10:08:49 2017 -0800
+++ b/components/wireshark/Makefile Tue Feb 14 01:12:11 2017 -0800
@@ -18,21 +18,21 @@
#
# 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.
#
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_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
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)
COMPONENT_BUGDB= utility/wireshark
-TPNO= 32709
+TPNO= 33580
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
@@ -50,6 +50,10 @@
# We don't have automake 1.14 yet. Thus need to reconfigure with older one.
COMPONENT_PREP_ACTION += ( cd $(@D) ; $(CONFIG_SHELL) autogen.sh );
+# Look for gnutls-3 pkg-config & libraries before the defaults
+PKG_CONFIG_PATH.64 := $(PKG_CONFIG_PATH.64)/gnutls-3:$(PKG_CONFIG_PATH.64)
+LDFLAGS += -L$(USRLIBDIR64)/gnutls-3
+
# Reported via bug 12923
CFLAGS += -I/usr/include/kerberosv5
@@ -66,6 +70,7 @@
# Use the 64-bit versions of pkg-config files
CONFIGURE_ENV += PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)"
+CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)"
# We need to avoid RPATH=/usr/lib in Wireshark libraries so that we can
# create successfully IPS package of different Wireshark branch than is
@@ -83,7 +88,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) )
@@ -103,7 +108,7 @@
REQUIRED_PACKAGES += library/desktop/gtk2
REQUIRED_PACKAGES += library/desktop/pango
REQUIRED_PACKAGES += library/glib2
-REQUIRED_PACKAGES += library/gnutls
+REQUIRED_PACKAGES += library/gnutls-3
REQUIRED_PACKAGES += library/security/libgpg-error
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += runtime/lua