Pullup ticket #4543 - requested by tron net/wireshark: security update Revisions pulled up: - net/wireshark/Makefile 1.127 - net/wireshark/distinfo 1.78 - net/wireshark/patches/patch-aa 1.14 - net/wireshark/patches/patch-ab deleted ------------------------------------------------------------------- Module Name: pkgsrc Committed By: tron Date: Fri Nov 14 12:06:10 UTC 2014 Modified Files: pkgsrc/net/wireshark: Makefile distinfo pkgsrc/net/wireshark/patches: patch-aa Removed Files: pkgsrc/net/wireshark/patches: patch-ab Log Message: 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) To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 pkgsrc/net/wireshark/Makefile cvs rdiff -u -r1.77 -r1.78 pkgsrc/net/wireshark/distinfo cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/wireshark/patches/patch-aa cvs rdiff -u -r1.4 -r0 pkgsrc/net/wireshark/patches/patch-abdiff -r1.125 -r1.125.2.1 pkgsrc/net/wireshark/Makefile
(spz)
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.125 2014/09/17 22:32:18 tron Exp $ | 1 | # $NetBSD: Makefile,v 1.125.2.1 2014/11/23 22:20:47 spz Exp $ | |
2 | 2 | |||
3 | DISTNAME= wireshark-1.10.10 | 3 | DISTNAME= wireshark-1.10.11 | |
4 | CATEGORIES= net | 4 | CATEGORIES= net | |
5 | MASTER_SITES= http://www.wireshark.org/download/src/ \ | 5 | MASTER_SITES= http://www.wireshark.org/download/src/ \ | |
6 | ${MASTER_SITE_SOURCEFORGE:=wireshark/} | 6 | ${MASTER_SITE_SOURCEFORGE:=wireshark/} | |
7 | EXTRACT_SUFX= .tar.bz2 | 7 | EXTRACT_SUFX= .tar.bz2 | |
8 | 8 | |||
9 | OWNER= tron@NetBSD.org | 9 | OWNER= tron@NetBSD.org | |
10 | HOMEPAGE= http://www.wireshark.org/ | 10 | HOMEPAGE= http://www.wireshark.org/ | |
11 | COMMENT= Network protocol analyzer | 11 | COMMENT= Network protocol analyzer | |
12 | LICENSE= gnu-gpl-v2 | 12 | LICENSE= gnu-gpl-v2 | |
13 | 13 | |||
14 | CONFLICTS+= ethereal-[0-9]* | 14 | CONFLICTS+= ethereal-[0-9]* | |
15 | 15 | |||
16 | USE_LANGUAGES= c c++ | 16 | USE_LANGUAGES= c c++ |
@@ -1,13 +1,12 @@ | @@ -1,13 +1,12 @@ | |||
1 | $NetBSD: distinfo,v 1.77 2014/09/17 22:32:18 tron Exp $ | 1 | $NetBSD: distinfo,v 1.77.2.1 2014/11/23 22:20:47 spz Exp $ | |
2 | 2 | |||
3 | SHA1 (wireshark-1.10.10.tar.bz2) = bcad35318e0a2428caf7e44d6c33a79ec9c1bdd6 | 3 | SHA1 (wireshark-1.10.11.tar.bz2) = f8c75b65d79fc597a7a2468cf01d4e3061997ebf | |
4 | RMD160 (wireshark-1.10.10.tar.bz2) = f8ace3bad8736246c6342200d199d143bbbcebac | 4 | RMD160 (wireshark-1.10.11.tar.bz2) = 85a0752554cd5911faf1072bb8f99d401680c9f4 | |
5 | Size (wireshark-1.10.10.tar.bz2) = 26823919 bytes | 5 | Size (wireshark-1.10.11.tar.bz2) = 26857388 bytes | |
6 | SHA1 (patch-AUTHORS) = 2d4265d9b8b4df7e3ab438684637058fdcb391fc | 6 | SHA1 (patch-AUTHORS) = 2d4265d9b8b4df7e3ab438684637058fdcb391fc | |
7 | SHA1 (patch-aa) = c4b7a3d20fac115020069588e74f35e2e77235e6 | 7 | SHA1 (patch-aa) = 237c60ae1bd860bdc3ee42a17a46b4e212b97c0f | |
8 | SHA1 (patch-ab) = c68adc187ec802b076d3b3c3d3b0f3bb01a8a2eb | |||
9 | SHA1 (patch-ac) = 470a2a32a5577f16aef4ba3e638eb6b97c483ba3 | 8 | SHA1 (patch-ac) = 470a2a32a5577f16aef4ba3e638eb6b97c483ba3 | |
10 | SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9 | 9 | SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9 | |
11 | SHA1 (patch-bb) = 9379f67c2f5d1c63aa0b2c597ef789336db78352 | 10 | SHA1 (patch-bb) = 9379f67c2f5d1c63aa0b2c597ef789336db78352 | |
12 | SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e | 11 | SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e | |
13 | SHA1 (patch-ca) = 08c4ae23739fbec238b02a2d0398b4a157f9c077 | 12 | SHA1 (patch-ca) = 08c4ae23739fbec238b02a2d0398b4a157f9c077 |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: patch-aa,v 1.13 2013/12/18 11:52:25 tron Exp $ | 1 | $NetBSD: patch-aa,v 1.13.8.1 2014/11/23 22:20:47 spz Exp $ | |
2 | 2 | |||
3 | Fix build. | 3 | Fix build. | |
4 | 4 | |||
5 | --- ui/time_shift.c.orig 2013-07-04 20:20:31.000000000 +0000 | 5 | --- ui/time_shift.c.orig 2014-11-12 18:49:17.000000000 +0000 | |
6 | +++ ui/time_shift.c | 6 | +++ ui/time_shift.c 2014-11-14 10:08:51.000000000 +0000 | |
7 | @@ -29,6 +29,9 @@ | 7 | @@ -28,6 +28,9 @@ | |
8 | #include <stdio.h> | |||
8 | #include <string.h> | 9 | #include <string.h> | |
9 | #include <ctype.h> | |||
10 | #include <math.h> | 10 | #include <math.h> | |
11 | +#ifndef HAVE_FLOORL | 11 | +#ifndef HAVE_FLOORL | |
12 | +#define floorl(a) floor((double)(a)) | 12 | +#define floorl(a) floor((double)(a)) | |
13 | +#endif | 13 | +#endif | |
14 | 14 | |||
15 | #include <glib.h> | 15 | #include <glib.h> | |
16 | 16 |