simplify the patch

3 files changed, 6 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b0980747af07..7d30f1452195 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sun Mar 12 10:16:30 UTC 2017
+# Sun Mar 12 10:20:16 UTC 2017
 pkgbase = parprouted
 	pkgdesc = daemon for transparent IP (Layer 3) proxy ARP bridging
 	pkgver = 0.7
@@ -16,7 +16,7 @@ pkgbase = parprouted
 	source = parprouted.conf
 	source = parprouted.service
 	sha512sums = c55d50dc7fc90ca108989a47a4b6f02509c0f3c72d13c9cc81cde27f56cce3dba4af74724a372395aae00c390222c9d53a604b61d6bd5af907124345b1b5e64f
-	sha512sums = 664f15b19f2a8ce7fa6ee3c251c62274df0d4bb7426cbad769affcafc5e68d288d1617953a6f3dd07aea699c167deaa423ae5c2b293fd32ce0f97144c5fd6a1a
+	sha512sums = a6281bd022f6b1d0d10f6b973b47c3fee2093428cd1835ba78ed4a6acd6210ea086fe42af3f254f5bdd60574e12ab4e2d0d235c56737e49e6d1ffc725d046517
 	sha512sums = fcb0e60618cf3d42baf175a5b318de6ef8d271f0993d5e77492698141740d2dd8fdfe8c093105ef48d5ecbb36c674027ab80d838222ef73e3a526f91b86ab64e
 	sha512sums = d6d15aaf44f8726aa27f7685ab76d9b5a7faa6655dec508909d4bf7420da5ab525bc738b85b1282bac8dbe9d11d73bf2a10b43f77c570a6db54bdb7f5688e6d3
 
diff --git a/000-routecmd.diff b/000-routecmd.diff
index f9a5ab3b1f69..b399135588b7 100644
--- a/000-routecmd.diff
+++ b/000-routecmd.diff
@@ -6,7 +6,7 @@ diff -ru parprouted-0.7.orig/parprouted.c parprouted-0.7/parprouted.c
      
      if (snprintf(routecmd_str, ROUTE_CMD_LEN-1, 
 -	    "/sbin/ip route del %s/32 metric 50 dev %s scope link",
-+	    ROUTE_CMD" route del %s/32 metric 50 dev %s scope link",
++	    "/usr/bin/ip route del %s/32 metric 50 dev %s scope link",
  	    inet_ntoa(cur_entry->ipaddr_ia), cur_entry->ifname) > ROUTE_CMD_LEN-1) 
      {
  	syslog(LOG_INFO, "ip route command too large to fit in buffer!");
@@ -15,22 +15,7 @@ diff -ru parprouted-0.7.orig/parprouted.c parprouted-0.7/parprouted.c
  
      if (snprintf(routecmd_str, ROUTE_CMD_LEN-1, 
 -	    "/sbin/ip route add %s/32 metric 50 dev %s scope link",
-+	    ROUTE_CMD" route add %s/32 metric 50 dev %s scope link",
++	    "/usr/bin/ip route add %s/32 metric 50 dev %s scope link",
  	    inet_ntoa(cur_entry->ipaddr_ia), cur_entry->ifname) > ROUTE_CMD_LEN-1) 
      {
  	syslog(LOG_INFO, "ip route command too large to fit in buffer!");
-diff -ru parprouted-0.7.orig/parprouted.h parprouted-0.7/parprouted.h
---- parprouted-0.7.orig/parprouted.h	2008-01-27 19:04:44.000000000 -0430
-+++ parprouted-0.7/parprouted.h	2010-12-31 02:38:39.746666672 -0430
-@@ -21,6 +21,11 @@
- #define ARP_LINE_LEN 255
- #define ARP_TABLE_ENTRY_LEN 20
- #define ARP_TABLE_ENTRY_TIMEOUT 60 /* seconds */
-+
-+#ifndef ROUTE_CMD
-+#define ROUTE_CMD "/usr/bin/ip"
-+#endif
-+
- #define ROUTE_CMD_LEN 255
- #define SLEEPTIME 1000000 /* ms */
- #define REFRESHTIME 50 /* seconds */
diff --git a/PKGBUILD b/PKGBUILD
index 7ea007915e64..e7fec9233773 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,14 +12,14 @@ source=("http://www.hazard.maks.net/parprouted/parprouted-$pkgver.tar.gz"
 	"parprouted.service")
 
 sha512sums=('c55d50dc7fc90ca108989a47a4b6f02509c0f3c72d13c9cc81cde27f56cce3dba4af74724a372395aae00c390222c9d53a604b61d6bd5af907124345b1b5e64f'
-            '664f15b19f2a8ce7fa6ee3c251c62274df0d4bb7426cbad769affcafc5e68d288d1617953a6f3dd07aea699c167deaa423ae5c2b293fd32ce0f97144c5fd6a1a'
+            'a6281bd022f6b1d0d10f6b973b47c3fee2093428cd1835ba78ed4a6acd6210ea086fe42af3f254f5bdd60574e12ab4e2d0d235c56737e49e6d1ffc725d046517'
             'fcb0e60618cf3d42baf175a5b318de6ef8d271f0993d5e77492698141740d2dd8fdfe8c093105ef48d5ecbb36c674027ab80d838222ef73e3a526f91b86ab64e'
             'd6d15aaf44f8726aa27f7685ab76d9b5a7faa6655dec508909d4bf7420da5ab525bc738b85b1282bac8dbe9d11d73bf2a10b43f77c570a6db54bdb7f5688e6d3')
 
 build() {
 	cd parprouted-$pkgver
 	patch -p1 < ../000-routecmd.diff
-	make CFLAGS+=' -DROUTE_CMD=\"/usr/bin/ip\"'
+	make
 }
 
 package() {