Sun Dec 20 21:03:00 2009 UTC ()
Pullup ticket 2954 - requested by tonnerre
security update

Revisions pulled up:
- pkgsrc/net/wireshark/Makefile			1.40
- pkgsrc/net/wireshark/distinfo			1.27

   -------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Thu Dec 10 19:03:31 UTC 2009

   Modified Files:
           pkgsrc/net/wireshark: Makefile distinfo

   Log Message:
   Update "wireshark" package to version 1.2.4. Changes since version 1.2.3:
   - Bug Fixes
     - Can't RTP stream in both directions. (Bug 4120)
   - Updated Protocol Support
     DCERPC, IPFIX/Netflow, IPv4, NAS EPS, RTCP, TIPC

   To generate a diff of this commit:
   cvs rdiff -u -r1.38 -r1.39 pkgsrc/net/wireshark/Makefile
   cvs rdiff -u -r1.25 -r1.26 pkgsrc/net/wireshark/distinfo

   -------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   tonnerre
   Date:           Sun Dec 20 19:25:34 UTC 2009

   Modified Files:
           pkgsrc/net/wireshark: Makefile distinfo

   Log Message:
   Update wireshark to version 1.2.5 in order to fix wpna-sec-2009-09.

   Changes since 1.2.4:
   Bugfixes:
    * The following vulnerabilities have been fixed. See the security advisory
      for details and a workaround.
    * The Daintree SNA file parser could overflow a buffer. (Bug 4294)
    * The SMB and SMB2 dissectors could crash. (Bug 4301)
    * The IPMI dissector could crash on Windows. (Bug 4319)
    * Wireshark does not graph rtp streams. (Bug 3801)
    * Wireshark showing extraneous data in a TCP stream. (Bug 3955)
    * Wrong decoding of gtp.target identification. (Bug 3974)
    * TTE dissector bug. (Bug 4247)
    * Upper case in Lua pref symbol causes Wireshark to crash. (Bug 4255)
    * OpenBSD 4.5 build fails at epan/dissectors/packet-rpcap.c. (Bug 4258)
    * Incorrect display of stream data using "Follow tcp stream" option.
      (Bug 4288)
    * Custom RADIUS dictionary can cause a crash. (Bug 4316)

   Updated Protocol Support:
    * DAP, eDonkey, GTP, IPMI, MIP, RADIUS, RANAP, SMB, SMB2, TCP, TTE, VNC,
      X.509sat

   Updated Capture File Support:
    * Daintree SNA.

   To generate a diff of this commit:
   cvs rdiff -u -r1.39 -r1.40 pkgsrc/net/wireshark/Makefile
   cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/wireshark/distinfo


(spz)
diff -r1.37.2.1 -r1.37.2.2 pkgsrc/net/wireshark/Makefile
diff -r1.24.2.1 -r1.24.2.2 pkgsrc/net/wireshark/distinfo
cvs diff -r1.37.2.1 -r1.37.2.2 pkgsrc/net/wireshark/Makefile (switch to unified diff)

--- pkgsrc/net/wireshark/Makefile 2009/11/02 07:14:40 1.37.2.1
+++ pkgsrc/net/wireshark/Makefile 2009/12/20 21:03:00 1.37.2.2
@@ -1,54 +1,54 @@ @@ -1,54 +1,54 @@
1# $NetBSD: Makefile,v 1.37.2.1 2009/11/02 07:14:40 spz Exp $ 1# $NetBSD: Makefile,v 1.37.2.2 2009/12/20 21:03:00 spz Exp $
2 2
3DISTNAME= wireshark-1.2.3 3DISTNAME= wireshark-1.2.5
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.24.2.1 -r1.24.2.2 pkgsrc/net/wireshark/distinfo (switch to unified diff)

--- pkgsrc/net/wireshark/distinfo 2009/11/02 07:14:40 1.24.2.1
+++ pkgsrc/net/wireshark/distinfo 2009/12/20 21:03:00 1.24.2.2
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.24.2.1 2009/11/02 07:14:40 spz Exp $ 1$NetBSD: distinfo,v 1.24.2.2 2009/12/20 21:03:00 spz Exp $
2 2
3SHA1 (wireshark-1.2.3.tar.bz2) = be69e1ea13cf63742fd71c69c02e658eec109d18 3SHA1 (wireshark-1.2.5.tar.bz2) = 46b74b82ae6bfad5f5f68ef1b3b7d453ae9b1087
4RMD160 (wireshark-1.2.3.tar.bz2) = 477565e97a05abba82faf5cd817de5281434fc78 4RMD160 (wireshark-1.2.5.tar.bz2) = 85f77a8a1c94999671c6e5226e4ced080176fbdd
5Size (wireshark-1.2.3.tar.bz2) = 15215978 bytes 5Size (wireshark-1.2.5.tar.bz2) = 15296289 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) = fa293d23390d015d0863367033ab07a3472430de 9SHA1 (patch-ad) = fa293d23390d015d0863367033ab07a3472430de