summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/wireshark/dumpcap_sel_ret.patch13
-rw-r--r--network/wireshark/wireshark.SlackBuild9
-rw-r--r--network/wireshark/wireshark.info8
3 files changed, 5 insertions, 25 deletions
diff --git a/network/wireshark/dumpcap_sel_ret.patch b/network/wireshark/dumpcap_sel_ret.patch
deleted file mode 100644
index ced4115ae8..0000000000
--- a/network/wireshark/dumpcap_sel_ret.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 a500d32401..df0253246d 100644
--- a/network/wireshark/wireshark.SlackBuild
+++ b/network/wireshark/wireshark.SlackBuild
@@ -26,7 +26,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=wireshark
-VERSION=${VERSION:-1.6.4}
+VERSION=${VERSION:-1.6.5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -73,13 +73,6 @@ 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" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/network/wireshark/wireshark.info b/network/wireshark/wireshark.info
index e0a46b6215..f382e06f10 100644
--- a/network/wireshark/wireshark.info
+++ b/network/wireshark/wireshark.info
@@ -1,10 +1,10 @@
PRGNAM="wireshark"
-VERSION="1.6.4"
+VERSION="1.6.5"
HOMEPAGE="http://www.wireshark.org/"
-DOWNLOAD="http://www.wireshark.org/download/src/all-versions/wireshark-1.6.4.tar.bz2"
-MD5SUM="a348521c514fcdd890d974f2a0b59db3"
+DOWNLOAD="http://www.wireshark.org/download/src/all-versions/wireshark-1.6.5.tar.bz2"
+MD5SUM="794948a10d387fc8e37d824ea11dbac9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Michiel van Wessem"
EMAIL="michiel@slackbuilds.org"
-APPROVED="Niels Horn"
+APPROVED="rworkman"