From 8fb85a21c1a68b3def01d82d07e9d2da82122c71 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Tue, 13 Dec 2005 23:22:26 +0000
Subject: Add a work arround for file descriptor leak in radius dictionary
 parser which renders "ethereal" useless. Bump package revision.

---
 net/ethereal/Makefile         |  4 ++--
 net/ethereal/distinfo         |  3 ++-
 net/ethereal/patches/patch-ad | 20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 net/ethereal/patches/patch-ad

(limited to 'net/ethereal')

diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 0393dc5a6f6..4b3f8e9c200 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.121 2005/12/10 21:55:35 salo Exp $
+# $NetBSD: Makefile,v 1.122 2005/12/13 23:22:26 tron Exp $
 
 DISTNAME=		ethereal-0.10.13
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		net
 MASTER_SITES=		http://www.ethereal.com/distribution/ \
 			http://ethereal.planetmirror.com/distribution/ \
diff --git a/net/ethereal/distinfo b/net/ethereal/distinfo
index 12c56f54b4c..15eac827d63 100644
--- a/net/ethereal/distinfo
+++ b/net/ethereal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2005/12/10 21:55:35 salo Exp $
+$NetBSD: distinfo,v 1.47 2005/12/13 23:22:27 tron Exp $
 
 SHA1 (ethereal-0.10.13.tar.bz2) = 4ed2014a1ede6bdb05fbe99b0469a030c7794a13
 RMD160 (ethereal-0.10.13.tar.bz2) = 54f6431ac2d807e0d7dd896af71463d340c66107
@@ -6,3 +6,4 @@ Size (ethereal-0.10.13.tar.bz2) = 8029087 bytes
 SHA1 (patch-aa) = 0513b971c0af032fc64fc181fbd64d78aef0d044
 SHA1 (patch-ab) = bfbefb0ae66607068e21d0912a15a72606ab8ea8
 SHA1 (patch-ac) = 101cbc6315b2ad9732b70d697295ad8e4a389dcd
+SHA1 (patch-ad) = a7678d74599af94c8888a226f5ee012a11616c0e
diff --git a/net/ethereal/patches/patch-ad b/net/ethereal/patches/patch-ad
new file mode 100644
index 00000000000..63688ab75df
--- /dev/null
+++ b/net/ethereal/patches/patch-ad
@@ -0,0 +1,20 @@
+--- epan/radius_dict.c.orig	2005-10-19 17:23:28.000000000 +0100
++++ epan/radius_dict.c	2005-12-13 23:10:30.000000000 +0000
+@@ -1181,6 +1181,8 @@
+ 	
+ 	fullpaths[include_stack_ptr] = g_strdup_printf("%s%c%s",directory,DIR_SEPARATOR,yytext);
+ 
++	if (yyin != NULL)
++		(void) fclose(yyin);
+ 	yyin = fopen( fullpaths[include_stack_ptr], "r" );
+ 	
+ 	if (!yyin) {
+@@ -2286,6 +2288,8 @@
+ 	BEGIN OUT;
+ 
+ 	yylex();
++	(void) fclose(yyin);
++	yyin = NULL;
+
+ 	for (i=0; i < 10; i++) {
+ 		if (fullpaths[i]) g_free(fullpaths[i]);
-- 
cgit v1.2.3