[csw-devel] SF.net SVN: gar:[19347] csw/mgar/pkg/wireshark/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Oct 2 10:32:58 CEST 2012
Revision: 19347
http://gar.svn.sourceforge.net/gar/?rev=19347&view=rev
Author: dmichelsen
Date: 2012-10-02 08:32:58 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
wireshark/trunk: Update to 1.8.2, disable LUA for now
Modified Paths:
--------------
csw/mgar/pkg/wireshark/trunk/Makefile
csw/mgar/pkg/wireshark/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/wireshark/trunk/files/0001-Solaris-9-doesn-t-have-stdint.h.patch
csw/mgar/pkg/wireshark/trunk/files/0002-Don-t-return-value-in-void-functions.patch
Modified: csw/mgar/pkg/wireshark/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wireshark/trunk/Makefile 2012-10-02 08:32:08 UTC (rev 19346)
+++ csw/mgar/pkg/wireshark/trunk/Makefile 2012-10-02 08:32:58 UTC (rev 19347)
@@ -1,5 +1,5 @@
NAME = wireshark
-VERSION = 1.6.8
+VERSION = 1.8.2
CATEGORIES = apps
GARTYPE = v2
@@ -13,12 +13,6 @@
MASTER_SITES = $(SF_MIRRORS)
DISTFILES = $(NAME)-$(VERSION).tar.bz2
-#PATCHFILES += 0001-Solaris-9-doesn-t-have-stdint.h.patch
-
-# Use patch until this is fixed:
-# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6615
-#PATCHFILES += 0002-Don-t-return-value-in-void-functions.patch
-
#new glib2 only on Solaris 10
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
@@ -36,11 +30,15 @@
BUILD_DEP_PKGS += CSWlibpcap-dev
BUILD_DEP_PKGS += CSWlibsmi-dev
BUILD_DEP_PKGS += CSWlibkrb5-dev
-BUILD_DEP_PKGS += CSWossldevel
+BUILD_DEP_PKGS += CSWlibssl-dev
BUILD_DEP_PKGS += CSWlibgnutls-dev
-BUILD_DEP_PKGS += CSWlua
+# BUILD_DEP_PKGS += CSWlua
BUILD_DEP_PKGS += CSWgeoip-dev
+# Lua support disabled because luaL_register is checked during autoconf which
+# is deprecated as described in http://lua-users.org/wiki/LuaFiveTwo
+# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7409
+
PACKAGES += CSWwireshark
SPKG_DESC_CSWwireshark = Wireshark (was Ethereal) is a free network protocol analyzer
# PKGFILES is catchall
@@ -56,7 +54,7 @@
RUNTIME_DEP_PKGS_CSWwireshark += CSWlibkrb5-3
RUNTIME_DEP_PKGS_CSWwireshark += CSWlibk5crypto3
RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgnutls26
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlua
+# RUNTIME_DEP_PKGS_CSWwireshark += CSWlua
RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcairo2
RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgeoip1
RUNTIME_DEP_PKGS_CSWwireshark += CSWlibfontconfig1
@@ -94,6 +92,11 @@
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)
+
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 2012-10-02 08:32:08 UTC (rev 19346)
+++ csw/mgar/pkg/wireshark/trunk/checksums 2012-10-02 08:32:58 UTC (rev 19347)
@@ -1 +1 @@
-dcdc5f4904af5804b622c955a30974e2 wireshark-1.6.8.tar.bz2
+5e3ea7eed50dace479e12f49d24506f4 wireshark-1.8.2.tar.bz2
Deleted: csw/mgar/pkg/wireshark/trunk/files/0001-Solaris-9-doesn-t-have-stdint.h.patch
===================================================================
--- csw/mgar/pkg/wireshark/trunk/files/0001-Solaris-9-doesn-t-have-stdint.h.patch 2012-10-02 08:32:08 UTC (rev 19346)
+++ csw/mgar/pkg/wireshark/trunk/files/0001-Solaris-9-doesn-t-have-stdint.h.patch 2012-10-02 08:32:58 UTC (rev 19347)
@@ -1,26 +0,0 @@
-From dd7dcff4a05a4dfdd2e2db961c633e15fff4f8eb Mon Sep 17 00:00:00 2001
-From: Roger Hakansson <hson at current9x.(none)>
-Date: Thu, 23 Sep 2010 21:19:05 +0200
-Subject: [PATCH] Solaris 9 doesn't have stdint.h
-
----
- epan/wslua/lua_bitop.c | 4 ++
- 1 files changed, 4 insertions(+)
-
-diff --git a/epan/wslua/lua_bitop.c b/epan/wslua/lua_bitop.c
-index e358e7a..6603eb6 100644
---- a/epan/wslua/lua_bitop.c
-+++ b/epan/wslua/lua_bitop.c
-@@ -40,8 +40,12 @@ typedef __int32 int32_t;
- typedef unsigned __int32 uint32_t;
- typedef unsigned __int64 uint64_t;
- #else
-+#if defined(__SUNPRO_C) || defined (__SUNPRO_CC)
-+#include <sys/inttypes.h>
-+#else
- #include <stdint.h>
- #endif
-+#endif
-
- typedef int32_t SBits;
- typedef uint32_t UBits;
Deleted: csw/mgar/pkg/wireshark/trunk/files/0002-Don-t-return-value-in-void-functions.patch
===================================================================
--- csw/mgar/pkg/wireshark/trunk/files/0002-Don-t-return-value-in-void-functions.patch 2012-10-02 08:32:08 UTC (rev 19346)
+++ csw/mgar/pkg/wireshark/trunk/files/0002-Don-t-return-value-in-void-functions.patch 2012-10-02 08:32:58 UTC (rev 19347)
@@ -1,25 +0,0 @@
-From 583bad1ad03a42d33e51108f2db484b0ef063b68 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 24 Nov 2011 16:40:06 +0100
-Subject: [PATCH] Don't return value in void functions
-
----
- epan/dissectors/packet-capwap.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c
-index 21afadc..b572492 100644
---- a/epan/dissectors/packet-capwap.c
-+++ b/epan/dissectors/packet-capwap.c
-@@ -1376,7 +1376,7 @@ dissect_capwap_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
- {
- const int len_rem = tvb_length_remaining(tvb, offset);
- if (len_rem <= 0)
-- return offset;
-+ return;
-
- pinfo->fragmented = TRUE;
-
---
-1.7.6.1
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list