Add patch from bug #143290 thanks to Joshua Schmidkofer

(Portage version: 2.1.2-r8)

5 files changed, 67 insertions, 2 deletions

diff --git a/net-analyzer/argus-clients/ChangeLog b/net-analyzer/argus-clients/ChangeLog
index 322eac2f237a..1eaade45a7e2 100644
--- a/net-analyzer/argus-clients/ChangeLog
+++ b/net-analyzer/argus-clients/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/argus-clients
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/ChangeLog,v 1.4 2006/02/15 21:44:59 jokey Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/ChangeLog,v 1.5 2007/02/15 21:42:40 jokey Exp $
+
+*argus-clients-2.0.6-r1 (15 Feb 2007)
+
+  15 Feb 2007; Markus Ullmann <jokey@gentoo.org>
+  +files/argus-clients-2.0.6-netmask.patch, +argus-clients-2.0.6-r1.ebuild:
+  Add patch from bug #143290 thanks to Joshua Schmidkofer
 
   15 Feb 2006; Markus Ullmann <jokey@gentoo.org> argus-clients-2.0.6.ebuild:
   Removing virtual/libpcap wrt bug #117898
diff --git a/net-analyzer/argus-clients/argus-clients-2.0.6-r1.ebuild b/net-analyzer/argus-clients/argus-clients-2.0.6-r1.ebuild
new file mode 100644
index 000000000000..5d41e07b27b9
--- /dev/null
+++ b/net-analyzer/argus-clients/argus-clients-2.0.6-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-2.0.6-r1.ebuild,v 1.1 2007/02/15 21:42:40 jokey Exp $
+
+inherit eutils
+
+DESCRIPTION="Clients for net-analyzer/argus"
+HOMEPAGE="http://www.qosient.com/argus/"
+SRC_URI="ftp://ftp.qosient.com/pub/argus/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="virtual/libc
+	net-libs/libpcap
+	>=net-analyzer/argus-2.0.6"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/bison-1.28
+	>=sys-devel/flex-2.4.6"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix from bug #143290
+	epatch "${FILESDIR}"/${P}-netmask.patch || die "patch failed"
+}
+
+src_install() {
+	# argus_parse.a and argus_common.a are supplied by net-analyzer/argus
+	dolib lib/argus_client.a || die "Failed to process argus_client.a"
+	dobin bin/ra* || die "Failed to install ra*"
+
+	dodoc ChangeLog CREDITS README
+
+	#do not install man/man1/tcpdump.1, file collision
+	rm man/man1/tcpdump.1
+	doman man/man{1,5}/*
+}
diff --git a/net-analyzer/argus-clients/files/argus-clients-2.0.6-netmask.patch b/net-analyzer/argus-clients/files/argus-clients-2.0.6-netmask.patch
new file mode 100644
index 000000000000..d5680404ef8e
--- /dev/null
+++ b/net-analyzer/argus-clients/files/argus-clients-2.0.6-netmask.patch
@@ -0,0 +1,12 @@
+diff -urN argus-clients-2.0.6.orig/common/gencode.c argus-clients-2.0.6/common/gencode.c
+--- argus-clients-2.0.6.orig/common/gencode.c	2004-04-26 09:30:23.000000000 -0700
++++ argus-clients-2.0.6/common/gencode.c	2007-01-10 10:30:03.000000000 -0800
+@@ -232,7 +232,7 @@
+ #include <signal.h>
+ #include <sys/wait.h>
+ 
+-static u_int ArgusNetMask;
++u_int ArgusNetMask; /* AMD64 build fix */ 
+ static int snaplen;
+ 
+ int
diff --git a/net-analyzer/argus-clients/files/digest-argus-clients-2.0.6 b/net-analyzer/argus-clients/files/digest-argus-clients-2.0.6
index 4b9c60789948..b46d01997865 100644
--- a/net-analyzer/argus-clients/files/digest-argus-clients-2.0.6
+++ b/net-analyzer/argus-clients/files/digest-argus-clients-2.0.6
@@ -1 +1,3 @@
 MD5 6a0b11043e70de20c93f23655a28b80d argus-clients-2.0.6.tar.gz 691629
+RMD160 35b1bd832d38b6818918e3f484bf03229371cb20 argus-clients-2.0.6.tar.gz 691629
+SHA256 490b7b690d134169579a4f4f20038bad1c113e7a30e030c5d632ce917bd5b6ac argus-clients-2.0.6.tar.gz 691629
diff --git a/net-analyzer/argus-clients/files/digest-argus-clients-2.0.6-r1 b/net-analyzer/argus-clients/files/digest-argus-clients-2.0.6-r1
new file mode 100644
index 000000000000..b46d01997865
--- /dev/null
+++ b/net-analyzer/argus-clients/files/digest-argus-clients-2.0.6-r1
@@ -0,0 +1,3 @@
+MD5 6a0b11043e70de20c93f23655a28b80d argus-clients-2.0.6.tar.gz 691629
+RMD160 35b1bd832d38b6818918e3f484bf03229371cb20 argus-clients-2.0.6.tar.gz 691629
+SHA256 490b7b690d134169579a4f4f20038bad1c113e7a30e030c5d632ce917bd5b6ac argus-clients-2.0.6.tar.gz 691629