patch for bug #153245

(Portage version: 2.1.1-r1)

4 files changed, 58 insertions, 3 deletions

diff --git a/net-analyzer/cnet/ChangeLog b/net-analyzer/cnet/ChangeLog
index 2d6081fec680..a9f7c7b326d1 100644
--- a/net-analyzer/cnet/ChangeLog
+++ b/net-analyzer/cnet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/cnet
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/ChangeLog,v 1.10 2006/04/21 01:00:59 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/ChangeLog,v 1.11 2006/11/24 22:38:17 cedk Exp $
+
+  24 Nov 2006; Cedric Krier <cedk@gentoo.org>
+  +files/cnet-2.0.9-parser.patch, cnet-2.0.9.ebuild:
+  patch for bug #153245
 
 *cnet-2.0.10 (21 Apr 2006)
 
diff --git a/net-analyzer/cnet/cnet-2.0.9.ebuild b/net-analyzer/cnet/cnet-2.0.9.ebuild
index daf8119f9d8a..a28351f97ccc 100644
--- a/net-analyzer/cnet/cnet-2.0.9.ebuild
+++ b/net-analyzer/cnet/cnet-2.0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/cnet-2.0.9.ebuild,v 1.2 2005/01/31 13:55:30 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/cnet-2.0.9.ebuild,v 1.3 2006/11/24 22:38:17 cedk Exp $
 
 inherit eutils
 
@@ -26,6 +26,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-gentoo.patch
 	sed -i.orig -e "s/^CFLAGS.*/CFLAGS=${CFLAGS}/" ${S}/src/Makefile.linux
+	epatch "${FILESDIR}/${P}-parser.patch"
 }
 
 src_install() {
diff --git a/net-analyzer/cnet/files/cnet-2.0.9-parser.patch b/net-analyzer/cnet/files/cnet-2.0.9-parser.patch
new file mode 100644
index 000000000000..9b8adbefbbda
--- /dev/null
+++ b/net-analyzer/cnet/files/cnet-2.0.9-parser.patch
@@ -0,0 +1,48 @@
+Only in cnet-2.0.9/src: applicationlayer.o
+Only in cnet-2.0.9/src: checksums.o
+Only in cnet-2.0.9/src: cnet64bits.o
+Only in cnet-2.0.9/src: cnetmain.o
+Only in cnet-2.0.9/src: compile.o
+Only in cnet-2.0.9/src: drawframes.o
+Only in cnet-2.0.9/src: error.o
+Only in cnet-2.0.9/src: ethernet.o
+Only in cnet-2.0.9/src: events.o
+Only in cnet-2.0.9/src: exit.o
+Only in cnet-2.0.9/src: globals.o
+Only in cnet-2.0.9/src: images.o
+Only in cnet-2.0.9/src: lexical.o
+Only in cnet-2.0.9/src: link_menu.o
+Only in cnet-2.0.9/src: link_windows.o
+Only in cnet-2.0.9/src: load.o
+Only in cnet-2.0.9/src: main_window.o
+Only in cnet-2.0.9/src: motd.o
+Only in cnet-2.0.9/src: node_menu.o
+Only in cnet-2.0.9/src: node_windows.o
+diff -ru cnet-2.0.9~/src/parser.c cnet-2.0.9/src/parser.c
+--- cnet-2.0.9~/src/parser.c	2006-11-24 23:23:01.000000000 +0100
++++ cnet-2.0.9/src/parser.c	2006-11-24 23:32:16.000000000 +0100
+@@ -26,6 +26,8 @@
+     59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  */
+ 
++extern	void init_reboot_args(NODEATTR *na, int argc, char **argv);
++
+ #define expect(t,msg)	if(token == t) gettoken(); \
+ 			else compile_error("%s expected\n", msg)
+ 
+@@ -224,7 +226,6 @@
+ 	check_string(&(na->outputfile));
+ 	break;
+     case T_ATTR_NODE_REBOOTARGS : {
+-	extern	void init_reboot_args(NODEATTR *na, int argc, char **argv);
+ 
+ 	int	argc;
+ 	char	**argv;
+@@ -420,7 +421,6 @@
+ static int node_defn(CnetNodetype nodetype)
+ {
+     extern int	add_node(CnetNodetype, char *, int, int *);
+-    extern void	init_reboot_args(int n, int argc, char **argv);
+ 
+     int		thisnode, wasnew;
+ 
diff --git a/net-analyzer/cnet/files/digest-cnet-2.0.9 b/net-analyzer/cnet/files/digest-cnet-2.0.9
index 3e256f4b2e50..c06ba8373464 100644
--- a/net-analyzer/cnet/files/digest-cnet-2.0.9
+++ b/net-analyzer/cnet/files/digest-cnet-2.0.9
@@ -1 +1,3 @@
 MD5 593b63c809773a284bc3d655dc609298 cnet-2.0.9.tgz 1165028
+RMD160 d8a5d6f997d525e0e146aadee849b8601e08d652 cnet-2.0.9.tgz 1165028
+SHA256 e7895a09a04cf02f694ff9f4a272a3e9bb1d4723a6c0a8415b0d03442e4f6c76 cnet-2.0.9.tgz 1165028