patch for bug #153245

Package-Manager: portage-2.1.1-r1

5 files changed, 94 insertions, 8 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/Manifest b/net-analyzer/cnet/Manifest
index d1cc6398034d..36da59d9a1e4 100644
--- a/net-analyzer/cnet/Manifest
+++ b/net-analyzer/cnet/Manifest
@@ -1,9 +1,40 @@
-MD5 512fe0c1d8bef42604109e060ab64caf ChangeLog 1745
-MD5 7b728ec0be0616db2efd657878610389 cnet-2.0.10.ebuild 1088
-MD5 5242584442a72f5ffd3bba06deccb200 cnet-2.0.9.ebuild 1155
+AUX cnet-2.0.10-gentoo.patch 3235 RMD160 024ded426702c8ec066d71b9a1435c79c03a1084 SHA1 d6dc89e55a871fb8e9b276b48d2579bc165d02ef SHA256 774d5666c8ce7901d37d48d3dbb1effcbffddaf669a6a64d3e47b146f5cbfada
 MD5 8a040b288c26f47b0d116462f5463591 files/cnet-2.0.10-gentoo.patch 3235
+RMD160 024ded426702c8ec066d71b9a1435c79c03a1084 files/cnet-2.0.10-gentoo.patch 3235
+SHA256 774d5666c8ce7901d37d48d3dbb1effcbffddaf669a6a64d3e47b146f5cbfada files/cnet-2.0.10-gentoo.patch 3235
+AUX cnet-2.0.5-gentoo.patch 1363 RMD160 f16e9f8366a657dceadb604494a52dbe5fd0a816 SHA1 df87ef9ac5e6810bf819e831451e25ffc6446aaa SHA256 66354faa416f232face67ad1ce53aaabf582a07f9d257bec1f70c64e5797b2ca
 MD5 652fb332fa98e02524b07ee1561c6182 files/cnet-2.0.5-gentoo.patch 1363
+RMD160 f16e9f8366a657dceadb604494a52dbe5fd0a816 files/cnet-2.0.5-gentoo.patch 1363
+SHA256 66354faa416f232face67ad1ce53aaabf582a07f9d257bec1f70c64e5797b2ca files/cnet-2.0.5-gentoo.patch 1363
+AUX cnet-2.0.9-gentoo.patch 1531 RMD160 33f44e1ee138eb8a746fc6b0932be500519c7f41 SHA1 fd77b781721257d7fa03ebb033194f5cfb099190 SHA256 16dbb994feadb2123a521ffcc2ef6e10f1e0b434c27c3215d318b6dbf17e10a8
 MD5 86dbc35b31d6c43d3ecdfbef24ba7da7 files/cnet-2.0.9-gentoo.patch 1531
-MD5 8753e1a6b6b3a032dfb413e320385b8c files/digest-cnet-2.0.10 61
-MD5 1f8197488ef6fbb97976d664d345d1d0 files/digest-cnet-2.0.9 60
+RMD160 33f44e1ee138eb8a746fc6b0932be500519c7f41 files/cnet-2.0.9-gentoo.patch 1531
+SHA256 16dbb994feadb2123a521ffcc2ef6e10f1e0b434c27c3215d318b6dbf17e10a8 files/cnet-2.0.9-gentoo.patch 1531
+AUX cnet-2.0.9-parser.patch 1572 RMD160 753efa935ec9cdbc27d61e362e1bf869bd88f202 SHA1 001662ddbcec597815dddb338b7aee740ca89658 SHA256 1e5add21e0123ccf19386e7fd29ddce03136e68e9d7a2d4759d86356d6f05c69
+MD5 2453f04398fac7948eebc10e533c32bf files/cnet-2.0.9-parser.patch 1572
+RMD160 753efa935ec9cdbc27d61e362e1bf869bd88f202 files/cnet-2.0.9-parser.patch 1572
+SHA256 1e5add21e0123ccf19386e7fd29ddce03136e68e9d7a2d4759d86356d6f05c69 files/cnet-2.0.9-parser.patch 1572
+DIST cnet-2.0.10.tgz 1158887
+DIST cnet-2.0.9.tgz 1165028 RMD160 d8a5d6f997d525e0e146aadee849b8601e08d652 SHA1 8d7cd56644f65ef7d331de5cc30f6552f98e2d0f SHA256 e7895a09a04cf02f694ff9f4a272a3e9bb1d4723a6c0a8415b0d03442e4f6c76
+EBUILD cnet-2.0.10.ebuild 1088 RMD160 2e3822b5b9e8eef51d20484cfffaa01a5bbf83d3 SHA1 b3119e33f3cee7d137b3a7fed27cd9422577a2ae SHA256 e196db00106676be11f21f9f956a46862994b321af6bda66b77f97c8ee874bf5
+MD5 7b728ec0be0616db2efd657878610389 cnet-2.0.10.ebuild 1088
+RMD160 2e3822b5b9e8eef51d20484cfffaa01a5bbf83d3 cnet-2.0.10.ebuild 1088
+SHA256 e196db00106676be11f21f9f956a46862994b321af6bda66b77f97c8ee874bf5 cnet-2.0.10.ebuild 1088
+EBUILD cnet-2.0.9.ebuild 1192 RMD160 1fe15a4f8d24430fec911c73391ffc8e45ee9ad5 SHA1 477715d628181a93d24549f86ff8a4935a9723f3 SHA256 4923b1cac2ac38139ea6c5fd70e6132561ad465dd5db3e7dc0ac7f0c3e34884e
+MD5 a76557378d0f6ad00d8f3d749e7f93c2 cnet-2.0.9.ebuild 1192
+RMD160 1fe15a4f8d24430fec911c73391ffc8e45ee9ad5 cnet-2.0.9.ebuild 1192
+SHA256 4923b1cac2ac38139ea6c5fd70e6132561ad465dd5db3e7dc0ac7f0c3e34884e cnet-2.0.9.ebuild 1192
+MISC ChangeLog 1863 RMD160 8f9759711bb83bd8af667aae74907b0218759bf2 SHA1 03b2cdee82f79f677bbc0d570fa78e5d48bcb8be SHA256 e86123189a52a867cf99b83ff39bdb45c9bd1d78ca35de471ce3a172f93666f9
+MD5 a7b904e0e972764d5cbbc383a27907fc ChangeLog 1863
+RMD160 8f9759711bb83bd8af667aae74907b0218759bf2 ChangeLog 1863
+SHA256 e86123189a52a867cf99b83ff39bdb45c9bd1d78ca35de471ce3a172f93666f9 ChangeLog 1863
+MISC metadata.xml 218 RMD160 a812d9696192b58b1390b15f36a55ac9cf235dff SHA1 7055e31d03348a70284f86725fc06f7a77231024 SHA256 d3470d760c9c0bba1b56da4d676f0c3b97d523c57cb050c7baea8de94eed3ddd
 MD5 b4e1d959ab12c9bb69e0db9f1d66205f metadata.xml 218
+RMD160 a812d9696192b58b1390b15f36a55ac9cf235dff metadata.xml 218
+SHA256 d3470d760c9c0bba1b56da4d676f0c3b97d523c57cb050c7baea8de94eed3ddd metadata.xml 218
+MD5 8753e1a6b6b3a032dfb413e320385b8c files/digest-cnet-2.0.10 61
+RMD160 5c6ce372dc71d86767dcee69981f267b3219670e files/digest-cnet-2.0.10 61
+SHA256 e6d8e33208068a4c9791fc6d471861251de5f9743c050c75127dc8fb2dd817cc files/digest-cnet-2.0.10 61
+MD5 56f9cd065c8fbe73164a5677c54fd4c3 files/digest-cnet-2.0.9 226
+RMD160 07c15f86bd6f72cc9239818131e92bca57a83b9e files/digest-cnet-2.0.9 226
+SHA256 6abc05540ebbc8f441fe0f03713d9123e05304012f2a612a12bd730cf2007828 files/digest-cnet-2.0.9 226
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