Thu May 13 13:36:28 2010 UTC ()
Pullup ticket 3114 - requested by tron
security update

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

   -------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Thu May 13 07:03:22 UTC 2010

   Modified Files:
           pkgsrc/net/wireshark: Makefile distinfo

   Log Message:
   Update "wireshark" package to version 1.2.8. Changes since 1.2.7:
   - The following vulnerabilities have been fixed. See the security
     advisory for details and a workaround.
     o The DOCSIS dissector could crash. (Bug 4644), (bug 4646) -->
       Versions affected: 0.9.6 to 1.0.12, 1.2.0 to 1.2.7
   - The following bugs have been fixed:
     o HTTP parser limits with Content-Length. (Bug 1958)
     o MATE dissector bug with GOGs. (Bug 3010)
     o Changing fonts and deleting system time from preferences,
       results in wireshark crash. (Bug 3387)
     o ERF file starting with record with timestamp=3D0,1 or 2 not
       recognized as ERF file. (Bug 4503)
     o The SSL dissector can not correctly resemple SSL records when
       the record header is spit between packets. (Bug 4535)
     o TCP reassembly can call subdissector with incorrect TCP
       sequence number. (Bug 4624)
    o PTP dissector displays big correction field values wrong. (Bug
       4635)
     o MSF is at Anthorn, not Rugby. (Bug 4678)
     o ProtoField __tostring() description is missing in Wireshark's
       Lua API Reference Manual. (Bug 4695)
     o EVRC packet bundling not handled correctly. (Bug 4718)
     o Completely unresponsive when run very first time by root user.
       (Bug 4308)
   - Updated Protocol Support: DOCSIS, HTTP, SSL
   - Updated Capture File Support: ERF, PacketLogger.

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


(spz)
diff -r1.43 -r1.43.2.1 pkgsrc/net/wireshark/Makefile
diff -r1.29 -r1.29.2.1 pkgsrc/net/wireshark/distinfo
cvs diff -r1.43 -r1.43.2.1 pkgsrc/net/wireshark/Makefile (switch to unified diff)

--- pkgsrc/net/wireshark/Makefile 2010/04/04 11:40:25 1.43
+++ pkgsrc/net/wireshark/Makefile 2010/05/13 13:36:27 1.43.2.1
@@ -1,54 +1,54 @@ @@ -1,54 +1,54 @@
1# $NetBSD: Makefile,v 1.43 2010/04/04 11:40:25 tron Exp $ 1# $NetBSD: Makefile,v 1.43.2.1 2010/05/13 13:36:27 spz Exp $
2 2
3DISTNAME= wireshark-1.2.7 3DISTNAME= wireshark-1.2.8
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]*
17 17
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_TOOLS+= gmake perl pkg-config 19USE_TOOLS+= gmake perl pkg-config
20 20
21USE_LIBTOOL= YES 21USE_LIBTOOL= YES
22SHLIBTOOL_OVERRIDE= # empty 22SHLIBTOOL_OVERRIDE= # empty
23CHECK_PORTABILITY_SKIP+= packaging/macosx/*/* 23CHECK_PORTABILITY_SKIP+= packaging/macosx/*/*
24 24
25GNU_CONFIGURE= YES 25GNU_CONFIGURE= YES
26CONFIGURE_ARGS+= --enable-static=no 26CONFIGURE_ARGS+= --enable-static=no
27CONFIGURE_ARGS+= --enable-threads 27CONFIGURE_ARGS+= --enable-threads
28CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} 28CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
29CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap} 29CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap}
30CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 30CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
31CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre} 31CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre}
32 32
33PTHREAD_OPTS+= require 33PTHREAD_OPTS+= require
34 34
35.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
36.include "options.mk" 36.include "options.mk"
37 37
38.if !empty(MACHINE_PLATFORM:MDarwin-[567].*-*) 38.if !empty(MACHINE_PLATFORM:MDarwin-[567].*-*)
39USE_BUILTIN.libpcap= no 39USE_BUILTIN.libpcap= no
40.endif 40.endif
41 41
42# wireshark no longer builds with NetBSD 3.x provided zlib 42# wireshark no longer builds with NetBSD 3.x provided zlib
43BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1 43BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1
44 44
45.include "../../devel/glib2/buildlink3.mk" 45.include "../../devel/glib2/buildlink3.mk"
46.include "../../devel/pcre/buildlink3.mk" 46.include "../../devel/pcre/buildlink3.mk"
47.include "../../devel/zlib/buildlink3.mk" 47.include "../../devel/zlib/buildlink3.mk"
48.include "../../net/libpcap/buildlink3.mk" 48.include "../../net/libpcap/buildlink3.mk"
49.include "../../devel/libsmi/buildlink3.mk" 49.include "../../devel/libsmi/buildlink3.mk"
50.include "../../security/gnutls/buildlink3.mk" 50.include "../../security/gnutls/buildlink3.mk"
51.include "../../security/openssl/buildlink3.mk" 51.include "../../security/openssl/buildlink3.mk"
52 52
53.include "../../mk/pthread.buildlink3.mk" 53.include "../../mk/pthread.buildlink3.mk"
54.include "../../mk/bsd.pkg.mk" 54.include "../../mk/bsd.pkg.mk"
cvs diff -r1.29 -r1.29.2.1 pkgsrc/net/wireshark/distinfo (switch to unified diff)

--- pkgsrc/net/wireshark/distinfo 2010/04/04 11:40:25 1.29
+++ pkgsrc/net/wireshark/distinfo 2010/05/13 13:36:27 1.29.2.1
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.29 2010/04/04 11:40:25 tron Exp $ 1$NetBSD: distinfo,v 1.29.2.1 2010/05/13 13:36:27 spz Exp $
2 2
3SHA1 (wireshark-1.2.7.tar.bz2) = e6f5d973886c7fc527c151811396286e361f8963 3SHA1 (wireshark-1.2.8.tar.bz2) = 147554f2175ccd8481e8ee7f0598663746b91983
4RMD160 (wireshark-1.2.7.tar.bz2) = 32687d76e9e82e0b4c08a7856b49faaed5d406a2 4RMD160 (wireshark-1.2.8.tar.bz2) = 2c11cfd2d158f44de476ded9a07a67603db8003e
5Size (wireshark-1.2.7.tar.bz2) = 15368816 bytes 5Size (wireshark-1.2.7.tar.bz2) = 15368816 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-ad) = 38baddf10f9335e2f766dc987589e7646b8ca014 9SHA1 (patch-ad) = 38baddf10f9335e2f766dc987589e7646b8ca014