[pkgsrc/trunk]: pkgsrc/net/wireshark Update "wireshark" package to version 1....

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3c2fb7c61c6d
branches:  trunk
changeset: 641653:3c2fb7c61c6d
user:      tron <tron%pkgsrc.org@localhost>
date:      Fri Nov 14 12:06:10 2014 +0000

description:
Update "wireshark" package to version 1.10.11. Changes since 1.10.10:
- Bug Fixes
  The following vulnerabilities have been fixed.
    * wnpa-sec-2014-20
      SigComp UDVM buffer overflow. (Bug 10662)
      CVE-2014-8710
    * wnpa-sec-2014-21
      AMQP crash. (Bug 10582) CVE-2014-8711
    * wnpa-sec-2014-22
      NCP crashes. (Bug 10552, Bug 10628) CVE-2014-8712
      CVE-2014-8713
    * wnpa-sec-2014-23
      TN5250 infinite loops. (Bug 10596) CVE-2014-8714
  The following bugs have been fixed:
    * 6LoWPAN Mesh headers not treated as encapsulating address.
      (Bug 10462)
    * UCP dissector bug of operation 31 - PID 0639 not
      recognized. (Bug 10463)
    * iSCSI dissector rejects PDUs with "expected data transfer
      length" > 16M. (Bug 10469)
    * GTPv2: trigging_tree under Trace information has wrong
      length. (Bug 10470)
    * Attempt to render an SMS-DELIVER-REPORT instead of an
      SMS-DELIVER. (Bug 10547)
    * IPv6 Mobility Option IPv6 Address/Prefix marks too many
      bytes for the address/prefix field. (Bug 10576)
    * IPv6 Mobility Option Binding Authorization Data for FMIPv6
      Authenticator field is read beyond the option data.
      (Bug 10577)
    * IPv6 Mobility Option Mobile Node Link Layer Identifier
      Link-layer Identifier field is read beyond the option data.
      (Bug 10578)
    * Malformed PTPoE announce packet. (Bug 10611)
    * IPv6 Permanent Home Keygen Token mobility option includes
      too many bytes for the token field. (Bug 10619)
    * IPv6 Redirect Mobility Option K and N bits are parsed
      incorrectly. (Bug 10622)
    * IPv6 Care Of Test mobility option includes too many bytes
      for the Keygen Token field. (Bug 10624)
    * IPv6 MESG-ID mobility option is parsed incorrectly.
      (Bug 10625)
    * IPv6 AUTH mobility option parses Mobility SPI and
      Authentication Data incorrectly. (Bug 10626)
    * IPv6 DNS-UPDATE-TYPE mobility option includes too many
      bytes for the MD identity field. (Bug 10629)
    * IPv6 Local Mobility Anchor Address mobility option's code
      and reserved fields are parsed as 2 bytes instead of 1.
      (Bug 10630)
    * TShark crashes when running with PDML on a specific packet.
      (Bug 10651)
    * IPv6 Mobility Option Context Request reads an extra
      request. (Bug 10676)
- Updated Protocol Support
  6LoWPAN, AMQP, GSM MAP, GTPv2, H.223, IEEE 802.11, iSCSI, MIH,
  Mobile IPv6, PTPoE, TN5250, and UCP
- New and Updated Capture File Support
  Catapult DCT2000, HP-UX nettl, pcap-ng, and Sniffer (DOS)

diffstat:

 net/wireshark/Makefile         |   5 ++---
 net/wireshark/distinfo         |  11 +++++------
 net/wireshark/patches/patch-aa |  10 +++++-----
 net/wireshark/patches/patch-ab |  22 ----------------------
 4 files changed, 12 insertions(+), 36 deletions(-)

diffs (80 lines):

diff -r 8422ff9ab30d -r 3c2fb7c61c6d net/wireshark/Makefile
--- a/net/wireshark/Makefile    Fri Nov 14 11:53:01 2014 +0000
+++ b/net/wireshark/Makefile    Fri Nov 14 12:06:10 2014 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.126 2014/10/19 22:27:47 alnsn Exp $
+# $NetBSD: Makefile,v 1.127 2014/11/14 12:06:10 tron Exp $
 
-DISTNAME=      wireshark-1.10.10
-PKGREVISION=   1
+DISTNAME=      wireshark-1.10.11
 CATEGORIES=    net
 MASTER_SITES=  http://www.wireshark.org/download/src/ \
                ${MASTER_SITE_SOURCEFORGE:=wireshark/}
diff -r 8422ff9ab30d -r 3c2fb7c61c6d net/wireshark/distinfo
--- a/net/wireshark/distinfo    Fri Nov 14 11:53:01 2014 +0000
+++ b/net/wireshark/distinfo    Fri Nov 14 12:06:10 2014 +0000
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.77 2014/09/17 22:32:18 tron Exp $
+$NetBSD: distinfo,v 1.78 2014/11/14 12:06:10 tron 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 -r 8422ff9ab30d -r 3c2fb7c61c6d net/wireshark/patches/patch-aa
--- a/net/wireshark/patches/patch-aa    Fri Nov 14 11:53:01 2014 +0000
+++ b/net/wireshark/patches/patch-aa    Fri Nov 14 12:06:10 2014 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.13 2013/12/18 11:52:25 tron Exp $
+$NetBSD: patch-aa,v 1.14 2014/11/14 12:06:10 tron 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 -r 8422ff9ab30d -r 3c2fb7c61c6d net/wireshark/patches/patch-ab
--- a/net/wireshark/patches/patch-ab    Fri Nov 14 11:53:01 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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++;