Pullup ticket 347 - requested by Matthias Scheler

security fix for ethereal

Revisions pulled up:
- pkgsrc/net/ethereal/Makefile		1.103
- pkgsrc/net/ethereal/distinfo		1.33, 1.35
- pkgsrc/net/ethereal/patches/patch-aa	1.11
- pkgsrc/net/ethereal/patches/patch-ab	1.3

   Module Name:		pkgsrc
   Committed By:	salo
   Date:		Mon Jan 31 22:53:54 UTC 2005

   Modified Files:
   	pkgsrc/net/ethereal: distinfo
   Added Files:
   	pkgsrc/net/ethereal/patches: patch-aa

   Log Message:
   Remove attributes in prototype for unnamed pointers.
   ethereal svn version is laready fixed.

   From PR pkg/29065 by Greg A. Woods.
---
   Module Name:		pkgsrc
   Committed By:	tron
   Date:		Thu Mar 10 10:05:33 UTC 2005

   Modified Files:
   	pkgsrc/net/ethereal: Makefile distinfo
   Added Files:
   	pkgsrc/net/ethereal/patches: patch-ab

   Log Message:
   Fix security vulernability in dissector for CDMA2000 A11 packets.
   Bump package revision.

4 files changed, 38 insertions, 3 deletions

diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index d6109f62e03..b329ee50955 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.100.2.1 2005/01/21 06:41:53 snj Exp $
-#
+# $NetBSD: Makefile,v 1.100.2.2 2005/03/10 12:07:17 salo Exp $
 
 DISTNAME=		ethereal-0.10.9
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		http://www.ethereal.com/distribution/ \
 			http://ethereal.planetmirror.com/distribution/ \
@@ -49,6 +49,12 @@ 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"
diff --git a/net/ethereal/distinfo b/net/ethereal/distinfo
index b490fd86e71..9cbe2653cb5 100644
--- a/net/ethereal/distinfo
+++ b/net/ethereal/distinfo
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.31.2.1 2005/01/21 06:41:53 snj Exp $
+$NetBSD: distinfo,v 1.31.2.2 2005/03/10 12:07:17 salo Exp $
 
 SHA1 (ethereal-0.10.9.tar.bz2) = fc27a93f4c19dcc4278968b376e0b33e7d756998
+RMD160 (ethereal-0.10.9.tar.bz2) = 25085f1ff149316a3e71c4d4abdda0dcb4a07320
 Size (ethereal-0.10.9.tar.bz2) = 5499000 bytes
+SHA1 (patch-aa) = 2ae499f52047ef84ba30403fce535cc2084e7539
+SHA1 (patch-ab) = a59a7772ca8c6e4d3b1e8e2d422ffde6f6d5a4de
diff --git a/net/ethereal/patches/patch-aa b/net/ethereal/patches/patch-aa
new file mode 100644
index 00000000000..fbf0a4e129b
--- /dev/null
+++ b/net/ethereal/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.10.10.1 2005/03/10 12:07:17 salo Exp $
+
+--- plugins/mate/mate.h.orig	2005-01-18 03:39:21.000000000 +0100
++++ plugins/mate/mate.h	2005-01-29 23:25:43.000000000 +0100
+@@ -324,7 +324,7 @@
+ extern void initialize_mate_runtime(void);
+ extern mate_pdu* mate_get_pdus(guint32 framenum);
+ extern void mate_analyze_frame(packet_info *pinfo, proto_tree* tree);
+-extern int mate_packet(void* _U_, packet_info* _U_, epan_dissect_t* _U_,const void* _U_);
++extern int mate_packet(void*, packet_info*, epan_dissect_t*,const void*);
+ 
+ /* from mate_setup.c */
+ extern mate_config* mate_make_config(guint8* filename);
diff --git a/net/ethereal/patches/patch-ab b/net/ethereal/patches/patch-ab
new file mode 100644
index 00000000000..4d451786400
--- /dev/null
+++ b/net/ethereal/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.2.10.1 2005/03/10 12:07:17 salo Exp $
+
+--- epan/dissectors/packet-3g-a11.c.orig	2005-01-18 02:39:50.000000000 +0000
++++ epan/dissectors/packet-3g-a11.c	2005-03-10 09:32:18.000000000 +0000
+@@ -312,7 +312,7 @@
+ };
+ #define NUM_ATTR (sizeof(attrs)/sizeof(struct radius_attribute))
+ 
+-#define MAX_STRVAL 16
++#define MAX_STRVAL 256
+ 
+ #define RADIUS_VENDOR_SPECIFIC 26
+ #define SKIP_HDR_LEN 6