Pullup ticket #4090 - requested by tron

net/wireshark: security update

Revisions pulled up:
- net/wireshark/Makefile                                        1.97
- net/wireshark/distinfo                                        1.63
- net/wireshark/patches/patch-ae                                deleted

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Thu Mar  7 12:44:11 UTC 2013

   Modified Files:
   	pkgsrc/net/wireshark: Makefile distinfo
   Removed Files:
   	pkgsrc/net/wireshark/patches: patch-ae

   Log Message:
   Update "wireshark" package to version 1.8.6. Changes since 1.8.5:
   - Bug Fixes
      The following vulnerabilities have been fixed.
        o wnpa-sec-2013-10
          The TCP dissector could crash. (Bug 8274)
          Versions affected: 1.8.0 to 1.8.5.
          CVE-2013-2475
        o wnpa-sec-2013-11
          The HART/IP dissectory could go into an infinite loop. (Bug
          8360)
          Versions affected: 1.8.0 to 1.8.5.
          CVE-2013-2476
        o wnpa-sec-2013-12
          The CSN.1 dissector could crash. Discovered by Laurent Butti.
          (Bug 8383)
          Versions affected: 1.8.0 to 1.8.5.
          CVE-2013-2477
        o wnpa-sec-2013-13
          The MS-MMS dissector could crash. Discovered by Laurent Butti.
          (Bug 8382)
          Versions affected: 1.8.0 to 1.8.5, 1.6.0 to 1.6.13.
          CVE-2013-2478
        o wnpa-sec-2013-14
          The MPLS Echo dissector could go into an infinite loop.
          Discovered by Laurent Butti. (Bug 8039)
          Versions affected: 1.8.0 to 1.8.5.
          CVE-2013-2479
        o wnpa-sec-2013-15
          The RTPS and RTPS2 dissectors could crash. Discovered by
          Alyssa Milburn. (Bug 8332)
          Versions affected: 1.8.0 to 1.8.5, 1.6.0 to 1.6.13.
          CVE-2013-2480
        o wnpa-sec-2013-16
          The Mount dissector could crash. Discovered by Alyssa Milburn.
          (Bug 8335)
          Versions affected: 1.8.0 to 1.8.5, 1.6.0 to 1.6.13.
          CVE-2013-2481
        o wnpa-sec-2013-17
          The AMPQ dissector could go into an infinite loop. Discovered
          by Moshe Kaplan. (Bug 8337)
          Versions affected: 1.8.0 to 1.8.5, 1.6.0 to 1.6.13.
          CVE-2013-2482
        o wnpa-sec-2013-18
          The ACN dissector could attempt to divide by zero. Discovered
          by Alyssa Milburn. (Bug 8340)
          Versions affected: 1.8.0 to 1.8.5, 1.6.0 to 1.6.13.
          CVE-2013-2483
        o wnpa-sec-2013-19
          The CIMD dissector could crash. Discovered by Moshe Kaplan.
          (Bug 8346)
          Versions affected: 1.8.0 to 1.8.5, 1.6.0 to 1.6.13.
          CVE-2013-2484
        o wnpa-sec-2013-20
          The FCSP dissector could go into an infinite loop. Discovered
          by Moshe Kaplan. (Bug 8359)
          Versions affected: 1.8.0 to 1.8.5, 1.6.0 to 1.6.13.
          CVE-2013-2485
        o wnpa-sec-2013-21
          The RELOAD dissector could go into an infinite loop.
          Discovered by Even Jensen. (Bug 8364)
          Versions affected: 1.8.0 to 1.8.5.
          CVE-2013-2486
          CVE-2013-2487
        o wnpa-sec-2013-22
          The DTLS dissector could crash. Discovered by Laurent Butti.
          (Bug 8380)
          Versions affected: 1.8.0 to 1.8.5, 1.6.0 to 1.6.13.
          CVE-2013-2488
      The following bugs have been fixed:
        o Lua pinfo.cols.protocol not holding value in postdissector.
          (Bug 6020)
        o data combined via ssl_desegment_app_data not visible via
          "Follow SSL Stream" only decrypted ssl data tabs. (Bug 6434)
        o HTTP application/json-rpc should be decoded/shown as
          application/json. (Bug 7939)
        o Maximum value of 802.11-2012 Duration field should be 32767.
          (Bug 8056)
        o Voice RTP player crash if player is closed while playing. (Bug
          8065)
        o Display Filter Macros crash. (Bug 8073)
        o RRC RadioBearerSetup message decoding issue. (Bug 8290)
        o R-click filters add ! in front of field when choosing "apply
          as filter>selected". (Bug 8297)
        o BACnet - Loop Object - Setpoint-Reference property does not
          decode correctly. (Bug 8306)
        o WMM TSPEC Element Parsing is not done is wrong due to a wrong
          switch case number. (Bug 8320)
        o Incorrect RTP statistics (Lost Packets indication not ok).
          (Bug 8321)
        o Registering ieee802154 dissector for IEEE802.15.4 frames
          inside Linux SLL frames. (Bug 8325)
        o Version Field is skipped while parsing WMM_TSPEC causing wrong
          dissecting (1 byte offset missing) of all fields in the TSPEC.
          (Bug 8330)
        o [BACnet] UCS-2 strings longer than 127 characters do not
          decode correctly. (Bug 8331)
        o Malformed IEEE80211 frame triggers DISSECTOR_ASSERT. (Bug
          8345)
        o Decoding of GSM MAP SMS Diagnostics. (Bug 8378)
        o Incorrect packet length displayed for Flight Message Transfer
          Protocol (FMTP). (Bug 8407)
        o Netflow dissector flowDurationMicroseconds nanosecond
          conversion wrong. (Bug 8410)
        o BE (3) AC is wrongly named as "Video" in (qos_acs). (Bug 8432)
   - Updated Protocol Support
     ACN, AMQP, ASN.1 PER, BACnet, CIMD, CSN.1, DOCSIS TLVs, DTLS,
     FCSP, FMP/NOTIFY, FMTP, GSM MAP SMS, HART/IP, IEEE 802.11, IEEE
     802.15.4, JSON, Linux SLL, LTE RRC, Mount, MPLS Echo, Netflow,
     RELOAD, RSL, RTP, RTPS, RTPS2, SABP, SIP, SSL, TCP


   To generate a diff of this commit:
   cvs rdiff -u -r1.96 -r1.97 pkgsrc/net/wireshark/Makefile
   cvs rdiff -u -r1.62 -r1.63 pkgsrc/net/wireshark/distinfo
   cvs rdiff -u -r1.3 -r0 pkgsrc/net/wireshark/patches/patch-ae

3 files changed, 6 insertions, 20 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 455811d0703..d468540e2aa 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.92.2.1 2013/02/14 09:17:11 spz Exp $
+# $NetBSD: Makefile,v 1.92.2.2 2013/03/08 19:23:30 spz Exp $
 
-DISTNAME=		wireshark-1.8.5
+DISTNAME=		wireshark-1.8.6
 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 3d2c3a3c5d8..bd8c10a54b3 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.61.2.1 2013/02/14 09:17:11 spz Exp $
+$NetBSD: distinfo,v 1.61.2.2 2013/03/08 19:23:30 spz Exp $
 
-SHA1 (wireshark-1.8.5.tar.bz2) = 76c719d92a2e200588a5452bbe61178b915eb99b
-RMD160 (wireshark-1.8.5.tar.bz2) = ecf67d55cd2d9218c28335163ede3969a9776d97
-Size (wireshark-1.8.5.tar.bz2) = 24196532 bytes
+SHA1 (wireshark-1.8.6.tar.bz2) = 0f51ed901b5e07cceb1373f3368f739be8f1e827
+RMD160 (wireshark-1.8.6.tar.bz2) = 21688bef39816cc81d596205eefc5a067e5d6c25
+Size (wireshark-1.8.6.tar.bz2) = 24250787 bytes
 SHA1 (patch-aa) = 78b9c01d7ecc272f1188a3fb8cfb806c8a040f6d
 SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c
 SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840
-SHA1 (patch-ae) = 7af195e797f8636a9636d30cdea4ee464fd853df
 SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9
 SHA1 (patch-bb) = 9379f67c2f5d1c63aa0b2c597ef789336db78352
 SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e
diff --git a/net/wireshark/patches/patch-ae b/net/wireshark/patches/patch-ae
deleted file mode 100644
index 9ab4d2bad56..00000000000
--- a/net/wireshark/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2011/01/31 12:21:34 adam Exp $
-
---- tools/lemon/Makefile.in.orig	2011-01-31 12:03:39.000000000 +0000
-+++ tools/lemon/Makefile.in
-@@ -631,7 +631,7 @@ uninstall-am: uninstall-info-am
- 
- 
- lemon$(EXEEXT): lemon.c
--	$(CC_FOR_BUILD) -D_U_="" $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $?
-+	$(CC_FOR_BUILD) -D_U_="" $(CFLAGS) $(LDFLAGS) -o $@ $?
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT: