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

[dmichelsen at users.sourceforge.net]

Revision: 16249
          http://gar.svn.sourceforge.net/gar/?rev=16249&view=rev
Author:   dmichelsen
Date:     2011-11-24 16:12:52 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
wireshark/trunk: Add necessary patch

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

Added Paths:
-----------
    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	2011-11-24 16:05:49 UTC (rev 16248)
+++ csw/mgar/pkg/wireshark/trunk/Makefile	2011-11-24 16:12:52 UTC (rev 16249)
@@ -12,8 +12,12 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
-PATCHFILES = 0001-Solaris-9-doesn-t-have-stdint.h.patch
+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
+
 VENDOR_URL = http://www.wireshark.org/
 
 BUILD_DEP_PKGS += CSWlibgcrypt-dev

Added: 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	                        (rev 0)
+++ csw/mgar/pkg/wireshark/trunk/files/0002-Don-t-return-value-in-void-functions.patch	2011-11-24 16:12:52 UTC (rev 16249)
@@ -0,0 +1,25 @@
+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.