Fri Apr 10 21:16:49 2009 UTC ()
Pullup ticket 2731 - requested by tron
Security fix

Revisions pulled up:
- pkgsrc/net/wireshark/Makefile		1.30
- pkgsrc/net/wireshark/distinfo		1.20

   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Fri Apr 10 07:21:29 UTC 2009

   Modified Files:
           pkgsrc/net/wireshark: Makefile distinfo

   Log Message:
   Update "wireshark" package to version 1.0.7. Changes since version 1.0.6:
   - Security-related bugs in the Profinet, LDAP, and CPHAP dissectors and
     the Tektronix K12 file format have been fixed.
   - Many other bugs have been fixed.

   To generate a diff of this commit:
   cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/wireshark/Makefile
   cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/wireshark/distinfo


(spz)
diff -r1.29 -r1.29.2.1 pkgsrc/net/wireshark/Makefile
diff -r1.19 -r1.19.2.1 pkgsrc/net/wireshark/distinfo

cvs diff -r1.29 -r1.29.2.1 pkgsrc/net/wireshark/Makefile (expand / switch to unified diff)

--- pkgsrc/net/wireshark/Makefile 2009/02/13 09:41:11 1.29
+++ pkgsrc/net/wireshark/Makefile 2009/04/10 21:16:49 1.29.2.1
@@ -1,29 +1,31 @@ @@ -1,29 +1,31 @@
1# $NetBSD: Makefile,v 1.29 2009/02/13 09:41:11 tron Exp $ 1# $NetBSD: Makefile,v 1.29.2.1 2009/04/10 21:16:49 spz Exp $
2 2
3DISTNAME= wireshark-1.0.6 3DISTNAME= wireshark-1.0.7
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
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15CONFLICTS+= ethereal-[0-9]* 15CONFLICTS+= ethereal-[0-9]*
16 16
 17LICENSE= gnu-gpl-v2
 18
17USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
18USE_TOOLS+= gmake perl pkg-config 20USE_TOOLS+= gmake perl pkg-config
19 21
20USE_LIBTOOL= YES 22USE_LIBTOOL= YES
21SHLIBTOOL_OVERRIDE= # empty 23SHLIBTOOL_OVERRIDE= # empty
22 24
23GNU_CONFIGURE= YES 25GNU_CONFIGURE= YES
24CONFIGURE_ARGS+= --enable-static=no 26CONFIGURE_ARGS+= --enable-static=no
25CONFIGURE_ARGS+= --enable-threads 27CONFIGURE_ARGS+= --enable-threads
26CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} 28CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
27CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap} 29CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap}
28CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 30CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
29CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre} 31CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre}

cvs diff -r1.19 -r1.19.2.1 pkgsrc/net/wireshark/distinfo (expand / switch to unified diff)

--- pkgsrc/net/wireshark/distinfo 2009/02/13 09:41:11 1.19
+++ pkgsrc/net/wireshark/distinfo 2009/04/10 21:16:49 1.19.2.1
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.19 2009/02/13 09:41:11 tron Exp $ 1$NetBSD: distinfo,v 1.19.2.1 2009/04/10 21:16:49 spz Exp $
2 2
3SHA1 (wireshark-1.0.6.tar.bz2) = 1aa726e32905a2815d01a9f33df84a873b11c7ef 3SHA1 (wireshark-1.0.7.tar.bz2) = ac7253ed010ffe8075de21fde362bb162b59f279
4RMD160 (wireshark-1.0.6.tar.bz2) = 5037c3c5f38c914233f064efb3dbe409896b3e0b 4RMD160 (wireshark-1.0.7.tar.bz2) = cd52704cde4afe57cccb09733c7f0ddfef2363e9
5Size (wireshark-1.0.6.tar.bz2) = 13161721 bytes 5Size (wireshark-1.0.7.tar.bz2) = 13289668 bytes
6SHA1 (patch-aa) = c155f38e66a553b14778dc73344b46f8614eb9b0 6SHA1 (patch-aa) = c155f38e66a553b14778dc73344b46f8614eb9b0
7SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c 7SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c
8SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840 8SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840