Pullup ticket 357 - requested by Lubomir Sedlacik

security fix for ethereal

Revisions pulled up:
- pkgsrc/net/ethereal/Makefile		1.104,1.105
- pkgsrc/net/ethereal/PLIST		1.20
- pkgsrc/net/ethereal/distinfo		1.36
- pkgsrc/net/ethereal/patches/patch-aa	removed
- pkgsrc/net/ethereal/patches/patch-ab	removed


   Module Name:    pkgsrc
   Committed By:   salo
   Date:           Mon Mar 14 15:09:28 UTC 2005

   Modified Files:
           pkgsrc/net/ethereal: Makefile PLIST distinfo
   Removed Files:
           pkgsrc/net/ethereal/patches: patch-aa patch-ab

   Log Message:
   Update to version 0.10.10

   This release fixes three security and stability-related issues:

   - Matevz Pustisek discovered a buffer overflow in the Etheric dissector.
     (CAN-2005-0704)
   - The GPRS-LLC dissector could crash if the "ignore cipher bit" option was
     enabled. (CAN-2005-0705)
   - Diego Giago discovered a buffer overflow in the 3GPP2 A11 dissector. This
     flaw was later reported by Leon Juranic. (CAN-2005-0699)
   - Leon Juranic discovered a buffer overflow in the IAPP dissector.
   - A bug in the JXTA dissector could make Ethereal crash.
   - A bug in the sFlow dissector could make Ethereal crash.

   Everyone is encouraged to upgrade.

   New and updated features:
   =========================
   - Tree view item context menus now let you browse to the display filter
     reference and wiki pages for a particular protocol.
   - Online help has been expanded.
   - VoIP call analysis (including nifty connection diagrams) has been added.
   - GSS-API decryption has been greatly enhanced.

   New protocol support:
   =====================
   AgentX, BUDB, DTP, G.723, IDP, INAP, KINK, Realplayer Data Protocol, Retix
   Spanning Tree Protocol, RTCP-XR, XML, XNS, SPP

   Updated protocol support:
   =========================
   3GPP2 A11, ACSE, AMR, ATM, BER, BSSGP, BUTC, CDP, CLNP, CoSine L2, DAAP,
   DCE/RPC, DCOM, DIAMETER, DNP, DNS, Etheric, FCP, FW-1, Gnutella, GPRS, GSM A,
   GSM MAP, H.225, H.245, H.248, H.450, HTTP, IAX2, ICQ, IEEE 802.11, IEEE 802.3
   Slow Protocols, IP, iSCSI, ISUP, Juniper, JXTA, Kerberos, L2TP, LDAP, MIP,
   MPLS, NDMP, NSIP, NTP, OSPF, OXID, PostgreSQL, RADIUS, RDT, Redback, RMCP,
   RTP, RTSP, SCSI, SCTP, SDP, SPNEGO, SSL, STUN, TCAP, TCP, TZSP

   New and updated capture file support:
   =====================================
   DBS Etherwatch, Lucent/Ascend, Nettl, Tcpdump (Redback)

   ---

   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Mon Mar 14 15:34:57 UTC 2005

   Modified Files:
           pkgsrc/net/ethereal: Makefile

   Log Message:
   Remove unnecessary "post-patch" target".

net/ethereal/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.100.2.2 2005/03/10 12:07:17 salo Exp $
+# $NetBSD: Makefile,v 1.100.2.3 2005/03/14 21:35:41 snj Exp $
 
-DISTNAME=		ethereal-0.10.9
-PKGREVISION=		1
+DISTNAME=		ethereal-0.10.10
 CATEGORIES=		net
 MASTER_SITES=		http://www.ethereal.com/distribution/ \
 			http://ethereal.planetmirror.com/distribution/ \
@@ -49,12 +48,6 @@ PTHREAD_OPTS=		require
 USE_BUILTIN.libpcap=	no
 .endif
 
-# Because we patch "epan/dissectors/packet-3g-a11.c" "register.c" would
-# get rebuilt which requires Python. Avoid the unnecessary overhead
-# by touching the file.
-post-patch:
-	@${TOUCH} ${WRKSRC}/epan/dissectors/register.c
-
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"

net/ethereal/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18.2.1 2005/01/21 06:41:53 snj Exp $
+@comment $NetBSD: PLIST,v 1.18.2.2 2005/03/14 21:35:41 snj Exp $
 bin/capinfos
 bin/dftest
 bin/editcap
@@ -8,6 +8,7 @@ bin/mergecap
 bin/tethereal
 bin/text2pcap
 lib/ethereal/plugins/${PKGVERSION}/acn.la
+lib/ethereal/plugins/${PKGVERSION}/agentx.la
 lib/ethereal/plugins/${PKGVERSION}/artnet.la
 lib/ethereal/plugins/${PKGVERSION}/asn1.la
 lib/ethereal/plugins/${PKGVERSION}/ciscosm.la
@@ -27,7 +28,9 @@ lib/ethereal/plugins/${PKGVERSION}/rdm.la
 lib/ethereal/plugins/${PKGVERSION}/rlm.la
 lib/ethereal/plugins/${PKGVERSION}/rtnet.la
 lib/ethereal/plugins/${PKGVERSION}/rudp.la
+lib/ethereal/plugins/${PKGVERSION}/stats_tree.la
 lib/ethereal/plugins/${PKGVERSION}/v5ua.la
+lib/ethereal/plugins/${PKGVERSION}/xml.la
 lib/libethereal.la
 lib/libwiretap.la
 man/man1/capinfos.1

net/ethereal/distinfo

@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.31.2.3 2005/03/14 15:26:50 salo Exp $
+$NetBSD: distinfo,v 1.31.2.4 2005/03/14 21:35:41 snj Exp $
 
-SHA1 (ethereal-0.10.9.tar.bz2) = fc27a93f4c19dcc4278968b376e0b33e7d756998
-Size (ethereal-0.10.9.tar.bz2) = 5499000 bytes
-SHA1 (patch-aa) = 2ae499f52047ef84ba30403fce535cc2084e7539
-SHA1 (patch-ab) = a59a7772ca8c6e4d3b1e8e2d422ffde6f6d5a4de
+SHA1 (ethereal-0.10.10.tar.bz2) = 611259edaf36a34a49331ed6fbc194c2407bd528
+Size (ethereal-0.10.10.tar.bz2) = 5799231 bytes