summaryrefslogtreecommitdiff
path: root/network/wireshark
diff options
context:
space:
mode:
authorMichiel van Wessem <michiel@slackbuilds.org>2011-12-08 19:08:28 -0200
committerNiels Horn <niels.horn@slackbuilds.org>2011-12-08 19:08:28 -0200
commitec230da83c6ba84bb8a26c85facc5baa07947556 (patch)
treecd7210b335115aaea5fbc136a4450d7da783ff34 /network/wireshark
parent8bba600469a7003741f85c0638f24345c17feb0e (diff)
downloadslackbuilds-ec230da83c6ba84bb8a26c85facc5baa07947556.tar.gz
network/wireshark: Updated for version 1.6.4.
Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
Diffstat (limited to 'network/wireshark')
-rw-r--r--network/wireshark/dumpcap_sel_ret.patch13
-rw-r--r--network/wireshark/wireshark.SlackBuild9
-rw-r--r--network/wireshark/wireshark.info6
3 files changed, 23 insertions, 5 deletions
diff --git a/network/wireshark/dumpcap_sel_ret.patch b/network/wireshark/dumpcap_sel_ret.patch
new file mode 100644
index 0000000000..ced4115ae8
--- /dev/null
+++ b/network/wireshark/dumpcap_sel_ret.patch
@@ -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) {
diff --git a/network/wireshark/wireshark.SlackBuild b/network/wireshark/wireshark.SlackBuild
index c7b5e95d97..a500d32401 100644
--- a/network/wireshark/wireshark.SlackBuild
+++ b/network/wireshark/wireshark.SlackBuild
@@ -2,7 +2,7 @@
# 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)
# All rights reserved.
#
@@ -26,7 +26,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=wireshark
-VERSION=${VERSION:-1.6.3}
+VERSION=${VERSION:-1.6.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -73,6 +73,11 @@ find . \
# systems with 32bit compat libs install. Thanks to Heinz Wiesinger.
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
CFLAGS="$SLKCFLAGS" \
diff --git a/network/wireshark/wireshark.info b/network/wireshark/wireshark.info
index dd4f122bbb..e0a46b6215 100644
--- a/network/wireshark/wireshark.info
+++ b/network/wireshark/wireshark.info
@@ -1,8 +1,8 @@
PRGNAM="wireshark"
-VERSION="1.6.3"
+VERSION="1.6.4"
HOMEPAGE="http://www.wireshark.org/"
-DOWNLOAD="http://www.wireshark.org/download/src/all-versions/wireshark-1.6.3.tar.bz2"
-MD5SUM="5012c75c379ffd47fbcf395d9a6e417e"
+DOWNLOAD="http://www.wireshark.org/download/src/all-versions/wireshark-1.6.4.tar.bz2"
+MD5SUM="a348521c514fcdd890d974f2a0b59db3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Michiel van Wessem"