diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireshark/Makefile | 4 | ||||
| -rw-r--r-- | net/wireshark/distinfo | 11 | ||||
| -rw-r--r-- | net/wireshark/patches/patch-aa | 10 | ||||
| -rw-r--r-- | net/wireshark/patches/patch-ab | 22 |
4 files changed, 12 insertions, 35 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index be535469b61..8f96acac09f 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.125 2014/09/17 22:32:18 tron Exp $ +# $NetBSD: Makefile,v 1.125.2.1 2014/11/23 22:20:47 spz Exp $ -DISTNAME= wireshark-1.10.10 +DISTNAME= wireshark-1.10.11 CATEGORIES= net MASTER_SITES= http://www.wireshark.org/download/src/ \ ${MASTER_SITE_SOURCEFORGE:=wireshark/} diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index 7329ca8f299..3b8bf711370 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.77 2014/09/17 22:32:18 tron Exp $ +$NetBSD: distinfo,v 1.77.2.1 2014/11/23 22:20:47 spz Exp $ -SHA1 (wireshark-1.10.10.tar.bz2) = bcad35318e0a2428caf7e44d6c33a79ec9c1bdd6 -RMD160 (wireshark-1.10.10.tar.bz2) = f8ace3bad8736246c6342200d199d143bbbcebac -Size (wireshark-1.10.10.tar.bz2) = 26823919 bytes +SHA1 (wireshark-1.10.11.tar.bz2) = f8c75b65d79fc597a7a2468cf01d4e3061997ebf +RMD160 (wireshark-1.10.11.tar.bz2) = 85a0752554cd5911faf1072bb8f99d401680c9f4 +Size (wireshark-1.10.11.tar.bz2) = 26857388 bytes SHA1 (patch-AUTHORS) = 2d4265d9b8b4df7e3ab438684637058fdcb391fc -SHA1 (patch-aa) = c4b7a3d20fac115020069588e74f35e2e77235e6 -SHA1 (patch-ab) = c68adc187ec802b076d3b3c3d3b0f3bb01a8a2eb +SHA1 (patch-aa) = 237c60ae1bd860bdc3ee42a17a46b4e212b97c0f SHA1 (patch-ac) = 470a2a32a5577f16aef4ba3e638eb6b97c483ba3 SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9 SHA1 (patch-bb) = 9379f67c2f5d1c63aa0b2c597ef789336db78352 diff --git a/net/wireshark/patches/patch-aa b/net/wireshark/patches/patch-aa index 2bd7f3c10a6..0df97d05b80 100644 --- a/net/wireshark/patches/patch-aa +++ b/net/wireshark/patches/patch-aa @@ -1,12 +1,12 @@ -$NetBSD: patch-aa,v 1.13 2013/12/18 11:52:25 tron Exp $ +$NetBSD: patch-aa,v 1.13.8.1 2014/11/23 22:20:47 spz Exp $ Fix build. ---- ui/time_shift.c.orig 2013-07-04 20:20:31.000000000 +0000 -+++ ui/time_shift.c -@@ -29,6 +29,9 @@ +--- ui/time_shift.c.orig 2014-11-12 18:49:17.000000000 +0000 ++++ ui/time_shift.c 2014-11-14 10:08:51.000000000 +0000 +@@ -28,6 +28,9 @@ + #include <stdio.h> #include <string.h> - #include <ctype.h> #include <math.h> +#ifndef HAVE_FLOORL +#define floorl(a) floor((double)(a)) diff --git a/net/wireshark/patches/patch-ab b/net/wireshark/patches/patch-ab deleted file mode 100644 index 84df137449d..00000000000 --- a/net/wireshark/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2013/12/18 11:52:25 tron Exp $ - -Fix compiler warning caused by improper use of toupper(3). - ---- wiretap/dbs-etherwatch.c.orig 2007-07-06 12:52:45.000000000 +0200 -+++ wiretap/dbs-etherwatch.c -@@ -624,13 +624,13 @@ parse_hex_dump(char* dump, guint8 *buf, - if(isdigit((guchar)dump[pos])) { - buf[count] = (dump[pos] - '0') << 4; - } else { -- buf[count] = (toupper(dump[pos]) - 'A' + 10) << 4; -+ buf[count] = (toupper((guchar)dump[pos]) - 'A' + 10) << 4; - } - pos++; - if(isdigit((guchar)dump[pos])) { - buf[count] += dump[pos] - '0'; - } else { -- buf[count] += toupper(dump[pos]) - 'A' + 10; -+ buf[count] += toupper((guchar)dump[pos]) - 'A' + 10; - } - pos++; - count++; |