network/wireshark: Updated for version 1.6.4.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
This commit is contained in:
Michiel van Wessem 2011-12-08 19:08:28 -02:00 committed by Niels Horn
parent 8bba600469
commit ec230da83c
3 changed files with 23 additions and 5 deletions

View file

@ -0,0 +1,13 @@
diff -Naur /tmp/SBo/wireshark-1.6.4-orig//dumpcap.c wireshark-1.6.4//dumpcap.c
--- /tmp/SBo/wireshark-1.6.4-orig//dumpcap.c 2011-11-18 19:14:44.000000000 +0000
+++ wireshark-1.6.4//dumpcap.c 2011-12-06 19:36:17.965368736 +0000
@@ -2491,6 +2491,9 @@
#ifndef USE_THREADS
int sel_ret;
#endif
+#ifdef MUST_DO_SELECT
+ int sel_ret;
+#endif
packet_count_before = ld->packet_count;
if (ld->from_cap_pipe) {

View file

@ -2,7 +2,7 @@
# Slackware build script for wireshark # Slackware build script for wireshark
# Copyright 2008-2011 Michiel van Wessem, Manchester, United Kingdom # Copyright 2008-2011 Michiel van Wessem, Leicester, United Kingdom
# Originally written by Jick Nan (jick.nan@gmail.com) # Originally written by Jick Nan (jick.nan@gmail.com)
# All rights reserved. # All rights reserved.
# #
@ -26,7 +26,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=wireshark PRGNAM=wireshark
VERSION=${VERSION:-1.6.3} VERSION=${VERSION:-1.6.4}
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
TAG=${TAG:-_SBo} TAG=${TAG:-_SBo}
@ -73,6 +73,11 @@ find . \
# systems with 32bit compat libs install. Thanks to Heinz Wiesinger. # systems with 32bit compat libs install. Thanks to Heinz Wiesinger.
sed -i "s|/lib)|/lib$LIBDIRSUFFIX)|g" configure.in sed -i "s|/lib)|/lib$LIBDIRSUFFIX)|g" configure.in
# Fix dumpcap.c as it crashes out during compile time as noted in this bug.
# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6614. The solution is
# highlighted in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6603
patch -p1 < $CWD/dumpcap_sel_ret.patch
autoreconf -vif autoreconf -vif
CFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \

View file

@ -1,8 +1,8 @@
PRGNAM="wireshark" PRGNAM="wireshark"
VERSION="1.6.3" VERSION="1.6.4"
HOMEPAGE="http://www.wireshark.org/" HOMEPAGE="http://www.wireshark.org/"
DOWNLOAD="http://www.wireshark.org/download/src/all-versions/wireshark-1.6.3.tar.bz2" DOWNLOAD="http://www.wireshark.org/download/src/all-versions/wireshark-1.6.4.tar.bz2"
MD5SUM="5012c75c379ffd47fbcf395d9a6e417e" MD5SUM="a348521c514fcdd890d974f2a0b59db3"
DOWNLOAD_x86_64="" DOWNLOAD_x86_64=""
MD5SUM_x86_64="" MD5SUM_x86_64=""
MAINTAINER="Michiel van Wessem" MAINTAINER="Michiel van Wessem"