Fri Jul 27 05:46:23 2012 UTC ()
Pullup ticket #3876 - requested by drochner
net/wireshark: security update

Revisions pulled up:
- net/wireshark/Makefile                                        1.80 via patch
- net/wireshark/distinfo                                        1.56

---
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Tue Jul 24 17:24:55 UTC 2012

   Modified Files:
           pkgsrc/net/wireshark: Makefile distinfo

   Log Message:
   update to 1.6.9
   changes:
   -security fixes:
    -The PPP dissector could crash (CVE-2012-4048)
    -The NFS dissector could use excessive amounts of CPU (CVE-2012-4049)
   -more bugfixes, see
    http://www.wireshark.org/lists/wireshark-announce/201207/msg00002.html
    for details

   approved by The Maintainer


(tron)
diff -r1.78 -r1.78.2.1 pkgsrc/net/wireshark/Makefile
diff -r1.55 -r1.55.2.1 pkgsrc/net/wireshark/distinfo
cvs diff -r1.78 -r1.78.2.1 pkgsrc/net/wireshark/Makefile (expand / switch to unified diff)

--- pkgsrc/net/wireshark/Makefile 2012/05/22 22:42:17 1.78
+++ pkgsrc/net/wireshark/Makefile 2012/07/27 05:46:22 1.78.2.1
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.78 2012/05/22 22:42:17 tron Exp $ 1# $NetBSD: Makefile,v 1.78.2.1 2012/07/27 05:46:22 tron Exp $
2 2
3DISTNAME= wireshark-1.6.8 3DISTNAME= wireshark-1.6.9
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= http://www.wireshark.org/download/src/ \ 5MASTER_SITES= http://www.wireshark.org/download/src/ \
6 ${MASTER_SITE_SOURCEFORGE:=wireshark/} 6 ${MASTER_SITE_SOURCEFORGE:=wireshark/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9OWNER= tron@NetBSD.org 9OWNER= tron@NetBSD.org
10HOMEPAGE= http://www.wireshark.org/ 10HOMEPAGE= http://www.wireshark.org/
11COMMENT= Network protocol analyzer 11COMMENT= Network protocol analyzer
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16CONFLICTS+= ethereal-[0-9]* 16CONFLICTS+= ethereal-[0-9]*
cvs diff -r1.55 -r1.55.2.1 pkgsrc/net/wireshark/distinfo (expand / switch to unified diff)

--- pkgsrc/net/wireshark/distinfo 2012/05/22 22:42:17 1.55
+++ pkgsrc/net/wireshark/distinfo 2012/07/27 05:46:22 1.55.2.1
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.55 2012/05/22 22:42:17 tron Exp $ 1$NetBSD: distinfo,v 1.55.2.1 2012/07/27 05:46:22 tron Exp $
2 2
3SHA1 (wireshark-1.6.8.tar.bz2) = fb79058c66944581b822e4d8370848f953cfc9d4 3SHA1 (wireshark-1.6.9.tar.bz2) = 7e86dfc93e38faf907b105c35c76ba3e2f31a8b4
4RMD160 (wireshark-1.6.8.tar.bz2) = 858ee1bdcf61658356c1acd386135eb071205dd6 4RMD160 (wireshark-1.6.9.tar.bz2) = 32b91d0c4724ca876d06fc50fdc7f647eb9220d7
5Size (wireshark-1.6.8.tar.bz2) = 21967111 bytes 5Size (wireshark-1.6.9.tar.bz2) = 22012780 bytes
6SHA1 (patch-aa) = d0744f069ac2d3a8a43b810e1f958360d99200a9 6SHA1 (patch-aa) = d0744f069ac2d3a8a43b810e1f958360d99200a9
7SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c 7SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c
8SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840 8SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840
9SHA1 (patch-ae) = 7af195e797f8636a9636d30cdea4ee464fd853df 9SHA1 (patch-ae) = 7af195e797f8636a9636d30cdea4ee464fd853df
10SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9 10SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9
11SHA1 (patch-bb) = 0758ca0be8054b8b95bb56a304605e6fea0a8f72 11SHA1 (patch-bb) = 0758ca0be8054b8b95bb56a304605e6fea0a8f72
12SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e 12SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e