From 17297750090b93cab03f7943e25a1ccd073439de Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 16 Mar 2014 08:15:40 +0100
Subject: fix compile, fropm openwrt

---
 package/arpd/Makefile             |  2 +-
 package/arpd/patches/patch-arpd_c | 29 ++++++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 6 deletions(-)

(limited to 'package/arpd')

diff --git a/package/arpd/Makefile b/package/arpd/Makefile
index 32730f11d..c1294c368 100644
--- a/package/arpd/Makefile
+++ b/package/arpd/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		arpd
 PKG_VERSION:=		0.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		e2911fa9de1b92ef50deda1489ae944d
 PKG_DESCR:=		Generates ARP responses for IP address ranges
 PKG_SECTION:=		route
diff --git a/package/arpd/patches/patch-arpd_c b/package/arpd/patches/patch-arpd_c
index 857396d76..84dd457aa 100644
--- a/package/arpd/patches/patch-arpd_c
+++ b/package/arpd/patches/patch-arpd_c
@@ -1,5 +1,5 @@
 --- arpd.orig/arpd.c	2003-02-09 05:20:40.000000000 +0100
-+++ arpd/arpd.c	2007-01-21 00:39:05.000000000 +0100
++++ arpd/arpd.c	2014-03-16 08:11:53.000000000 +0100
 @@ -70,7 +70,7 @@ static int			 arpd_sig;
  static void
  usage(void)
@@ -74,10 +74,21 @@
  			    addr_ntoa(&req->pa), addr_ntoa(&src.arp_ha));
  			
  			/* This address is claimed */
-@@ -465,14 +469,14 @@ main(int argc, char *argv[])
+@@ -445,9 +449,6 @@ arpd_recv(int fd, short type, void *ev)
+ void
+ terminate_handler(int sig)
+ {
+-	extern int event_gotsig;
+-
+-	event_gotsig = 1;
+ 	arpd_sig = sig;
+ }
+ 
+@@ -464,15 +465,14 @@ int
+ main(int argc, char *argv[])
  {
  	struct event recv_ev;
- 	extern int (*event_sigcb)(void);
+-	extern int (*event_sigcb)(void);
 -	char *dev;
 +	char *dev, *and_pcap_exp;
  	int c, debug;
@@ -91,7 +102,7 @@
  		switch (c) {
  		case 'd':
  			debug = 1;
-@@ -480,6 +484,9 @@ main(int argc, char *argv[])
+@@ -480,6 +480,9 @@ main(int argc, char *argv[])
  		case 'i':
  			dev = optarg;
  			break;
@@ -101,7 +112,7 @@
  		default:
  			usage();
  			break;
-@@ -489,9 +496,9 @@ main(int argc, char *argv[])
+@@ -489,9 +492,9 @@ main(int argc, char *argv[])
  	argv += optind;
  
  	if (argc == 0)
@@ -113,3 +124,11 @@
  	
  	if ((fp = fopen(PIDFILE, "w")) == NULL)
  		err(1, "fopen");
+@@ -524,7 +527,6 @@ main(int argc, char *argv[])
+ 		perror("signal");
+ 		return (-1);
+ 	}
+-	event_sigcb = arpd_signal;
+ 	
+ 	event_dispatch();
+ 
-- 
cgit v1.2.3