[csw-devel] SF.net SVN: gar:[21363] csw/mgar/pkg/wireshark/trunk

[dmichelsen at users.sourceforge.net]

Revision: 21363
          http://gar.svn.sourceforge.net/gar/?rev=21363&view=rev
Author:   dmichelsen
Date:     2013-06-18 06:55:17 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
wireshark/trunk: Update to 1.10.0, enable lua again

Modified Paths:
--------------
    csw/mgar/pkg/wireshark/trunk/Makefile
    csw/mgar/pkg/wireshark/trunk/checksums

Modified: csw/mgar/pkg/wireshark/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wireshark/trunk/Makefile	2013-06-17 21:28:50 UTC (rev 21362)
+++ csw/mgar/pkg/wireshark/trunk/Makefile	2013-06-18 06:55:17 UTC (rev 21363)
@@ -1,5 +1,5 @@
 NAME = wireshark
-VERSION = 1.8.6
+VERSION = 1.10.0
 GARTYPE = v2
 
 DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer
@@ -49,7 +49,7 @@
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibsmi2
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibkrb5-3
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibk5crypto3
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgnutls28
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcairo2
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgeoip1
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgmodule2-0-0
@@ -58,6 +58,7 @@
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWwireshark += CSWliblua5-2
 
 # No more library splitting unless absolutely necessary
 CHECKPKG_OVERRIDES_CSWwireshark += shared-lib-package-contains-so-symlink
@@ -81,14 +82,13 @@
 REINPLACE_WITH_mibs = /opt/csw/share/mibs
 REINPLACE_FILES_mibs += epan/oids.c
 
-# Do not use LD_OPTIONS as it leads to the new version being built against old
-# wireshark private libs
-#LD_OPTIONS =
-#EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
-
 # This is now deprecated in Pango, use workaround until Pango is updated
 EXTRA_CFLAGS += -DG_CONST_RETURN=const
 
+# Hardcode ipv6 until this is fixed (taken from acinclude.m4):
+#   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8813
+#EXTRA_CFLAGS += -DINET6 -DSOLARIS8_INET6
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-usr-local=no
 CONFIGURE_ARGS += --with-ssl=/opt/csw

Modified: csw/mgar/pkg/wireshark/trunk/checksums
===================================================================
--- csw/mgar/pkg/wireshark/trunk/checksums	2013-06-17 21:28:50 UTC (rev 21362)
+++ csw/mgar/pkg/wireshark/trunk/checksums	2013-06-18 06:55:17 UTC (rev 21363)
@@ -1 +1 @@
-317361e701936c72f7f18f857059b944  wireshark-1.8.6.tar.bz2
+72e51cd33fd33c7044a41c2ab51ad7af  wireshark-1.10.0.tar.bz2

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.