patch from bug #76833, thanks to those guys, also works on amd64

Package-Manager: portage-2.0.51.20-r4

4 files changed, 58 insertions, 17 deletions

diff --git a/net-misc/arpd/ChangeLog b/net-misc/arpd/ChangeLog
index 0986942f16d1..9af1d8f4e24e 100644
--- a/net-misc/arpd/ChangeLog
+++ b/net-misc/arpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/arpd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/arpd/ChangeLog,v 1.6 2005/01/29 21:21:15 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/arpd/ChangeLog,v 1.7 2005/04/27 00:31:14 iggy Exp $
+
+  27 Apr 2005; Brian Jackson <iggy@gentoo.org> +files/arpd.c.patch,
+  arpd-0.2.ebuild:
+  patch from bug #76833, thanks to those guys, also works on amd64
 
   30 Jan 2005; Daniel Black <dragonheart@gentoo.org> arpd-0.2.ebuild:
   Transition dependancy from net-libs/libpcap to virtual/libpcap
diff --git a/net-misc/arpd/Manifest b/net-misc/arpd/Manifest
index b7ca60f7b64c..26f6fef647ea 100644
--- a/net-misc/arpd/Manifest
+++ b/net-misc/arpd/Manifest
@@ -1,13 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0f880231da44d6f26fee0ec582f1d39e ChangeLog 668
-MD5 a7c03c95d50544b4cc46fb655398a61b arpd-0.2.ebuild 1026
+MD5 9b9bafbe006258577c91c3ae11865ce9 arpd-0.2.ebuild 1113
+MD5 3c779d82b648312cb1c106d314882149 ChangeLog 816
 MD5 24084c279daf0f876446c530a64ff287 files/digest-arpd-0.2 59
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB+/5RmdTrptrqvGERAjOMAJwOGFiqGyZaz5PRdvdy6iiqWE7yQACdHKPy
-9OcZyZ3trZda3Cv1cCLB114=
-=s1ki
------END PGP SIGNATURE-----
+MD5 cef41ba111aec61fe276ef665e51e03b files/arpd.c.patch 1477
diff --git a/net-misc/arpd/arpd-0.2.ebuild b/net-misc/arpd/arpd-0.2.ebuild
index ddc9f42cbdd1..1eb200282326 100644
--- a/net-misc/arpd/arpd-0.2.ebuild
+++ b/net-misc/arpd/arpd-0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/arpd/arpd-0.2.ebuild,v 1.9 2005/01/29 21:21:15 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/arpd/arpd-0.2.ebuild,v 1.10 2005/04/27 00:31:14 iggy Exp $
 
 DESCRIPTION="ARP reply daemon enables a single host to claim all unassigned addresses on a LAN for network monitoring or simulation"
 HOMEPAGE="http://www.citi.umich.edu/u/provos/honeyd/"
@@ -8,9 +8,11 @@ SRC_URI="http://www.citi.umich.edu/u/provos/honeyd/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc hppa"
+KEYWORDS="x86 ~sparc ~ppc hppa ~amd64"
 IUSE=""
 
+inherit eutils
+
 DEPEND=">=dev-libs/libdnet-1.4
 	>=dev-libs/libevent-0.6
 	virtual/libpcap"
@@ -21,10 +23,12 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	epatch ${FILESDIR}/arpd.c.patch || die "epatch failed"
+
 	sed -i \
 		-e 's|$withval/lib/libevent.a; then||' \
 		-e 's|if test -f $withval/include/event.h -a -f|if test -f $withval/include/event.h -a -f $withval/lib/libevent.a; then|' \
-		configure || die
+		configure || die "sed failed"
 }
 
 src_compile() {
diff --git a/net-misc/arpd/files/arpd.c.patch b/net-misc/arpd/files/arpd.c.patch
new file mode 100644
index 000000000000..732ed16c92d7
--- /dev/null
+++ b/net-misc/arpd/files/arpd.c.patch
@@ -0,0 +1,42 @@
+--- arpd.c.orig	2005-03-30 15:13:37.136590624 -0700
++++ arpd.c	2005-03-30 15:23:50.295231384 -0700
+@@ -265,7 +265,7 @@
+ 	    spa->addr_ip, tha->addr_eth, tpa->addr_ip);
+ 	
+ 	if (op == ARP_OP_REQUEST) {
+-		syslog(LOG_DEBUG, __FUNCTION__ ": who-has %s tell %s",
++		syslog(LOG_DEBUG, __FUNCTION__, ": who-has %s tell %s", 
+ 		    addr_ntoa(tpa), addr_ntoa(spa));
+ 	} else if (op == ARP_OP_REPLY) {
+ 		syslog(LOG_INFO, "arp reply %s is-at %s",
+@@ -282,7 +282,7 @@
+ 	int error;
+ 
+ 	if (addr_cmp(addr, &arpd_ifent.intf_addr) == 0) {
+-		syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
++		syslog(LOG_DEBUG, __FUNCTION__, ": %s at %s",
+ 		    addr_ntoa(addr), addr_ntoa(&arpd_ifent.intf_link_addr));
+ 		return (0);
+ 	}
+@@ -291,10 +291,10 @@
+ 	error = arp_get(arpd_arp, &arpent);
+ 	
+ 	if (error == -1) {
+-		syslog(LOG_DEBUG, __FUNCTION__ ": no entry for %s",
++		syslog(LOG_DEBUG, __FUNCTION__, ": no entry for %s",
+ 		    addr_ntoa(addr));
+ 	} else {
+-		syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
++		syslog(LOG_DEBUG, __FUNCTION__, ": %s at %s",
+ 		    addr_ntoa(addr), addr_ntoa(&arpent.arp_ha));
+ 	}
+ 	return (error);
+@@ -423,7 +423,7 @@
+ 		if ((req = SPLAY_FIND(tree, &arpd_reqs, &tmp)) != NULL) {
+ 			addr_pack(&src.arp_ha, ADDR_TYPE_ETH, ETH_ADDR_BITS,
+ 			    ethip->ar_sha, ETH_ADDR_LEN);
+-			syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
++			syslog(LOG_DEBUG, __FUNCTION__, ": %s at %s",
+ 			    addr_ntoa(&req->pa), addr_ntoa(&src.arp_ha));
+ 			
+ 			/* This address is claimed */