From dd163ce00ce6e781e58cbfe1034879d42c9dd80b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 1 Apr 2014 21:33:00 +0200
Subject: [PATCH] pptp: update to pptp-1.8.0

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/pptp/package.mk              |  9 +++--
 .../pptp/patches/pptp-1.7.2-configure.patch   | 33 -----------------
 .../pptp/patches/pptp-1.7.2-use-sbin-ip.patch | 36 -------------------
 3 files changed, 7 insertions(+), 71 deletions(-)
 delete mode 100644 packages/network/pptp/patches/pptp-1.7.2-configure.patch
 delete mode 100644 packages/network/pptp/patches/pptp-1.7.2-use-sbin-ip.patch

diff --git a/packages/network/pptp/package.mk b/packages/network/pptp/package.mk
index 5f37669df1..07f232f076 100644
--- a/packages/network/pptp/package.mk
+++ b/packages/network/pptp/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pptp"
-PKG_VERSION="1.7.2"
+PKG_VERSION="1.8.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -33,7 +33,12 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 make_target() {
-  make PPPD="/usr/sbin/pppd" CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" config.h pptp
+  make PPPD="/usr/sbin/pppd" \
+       IP="/sbin/ip" \
+       CC="$CC" \
+       CFLAGS="$CFLAGS" \
+       LDFLAGS="$LDFLAGS" \
+       config.h pptp
 }
 
 makeinstall_target() {
diff --git a/packages/network/pptp/patches/pptp-1.7.2-configure.patch b/packages/network/pptp/patches/pptp-1.7.2-configure.patch
deleted file mode 100644
index b841956b8f..0000000000
--- a/packages/network/pptp/patches/pptp-1.7.2-configure.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur pptp-1.7.2/Makefile pptp-1.7.2.patch/Makefile
---- pptp-1.7.2/Makefile	2008-05-14 08:33:55.000000000 +0200
-+++ pptp-1.7.2.patch/Makefile	2012-08-17 14:06:16.929624069 +0200
-@@ -4,25 +4,25 @@
- 
- #################################################################
- # CHANGE THIS LINE to point to the location of your pppd binary.
--PPPD = /usr/sbin/pppd
-+PPPD := /usr/sbin/pppd
- #################################################################
- 
- BINDIR=$(DESTDIR)/usr/sbin
- MANDIR=$(DESTDIR)/usr/share/man/man8
- PPPDIR=$(DESTDIR)/etc/ppp
- 
--CC	= gcc
-+CC	:= gcc
- RM	= rm -f
- OPTIMIZE= -O0
- DEBUG	= -g
- INCLUDE =
--CFLAGS  = -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE)
-+CFLAGS  := -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE)
- LIBS	= -lutil
- # Solaris 10
- # LIBS	= -lnsl -lsocket -lresolv
- # Solaris Nevada build 14 or above
- # LIBS    = -lnsl -lsocket
--LDFLAGS	=
-+LDFLAGS	:=
- 
- PPTP_BIN = pptp
- 
diff --git a/packages/network/pptp/patches/pptp-1.7.2-use-sbin-ip.patch b/packages/network/pptp/patches/pptp-1.7.2-use-sbin-ip.patch
deleted file mode 100644
index 17b09a5439..0000000000
--- a/packages/network/pptp/patches/pptp-1.7.2-use-sbin-ip.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit aa1536de73a383ca64f2bd325ec2844679a269c2
-Author: Stefan Saraev <stefan@saraev.ca>
-Date:   Sat Oct 12 18:08:59 2013 +0300
-
-    use /sbin/ip for routing
-
-diff --git a/routing.c b/routing.c
-index ab20a03..7fb4277 100644
---- a/routing.c
-+++ b/routing.c
-@@ -55,7 +55,7 @@ regardless (not yet implemented).
- 
- void routing_init(char *ip) {
-   char buf[256];
--  snprintf(buf, 255, "/bin/ip route get %s", ip);
-+  snprintf(buf, 255, "/sbin/ip route get %s", ip);
-   FILE *p = popen(buf, "r");
-   fgets(buf, 255, p);
-   /* TODO: check for failure of fgets */
-@@ -66,14 +66,14 @@ void routing_init(char *ip) {
- 
- void routing_start() {
-   char buf[256];
--  snprintf(buf, 255, "/bin/ip route replace %s", route);
-+  snprintf(buf, 255, "/sbin/ip route replace %s", route);
-   FILE *p = popen(buf, "r");
-   pclose(p);
- }
- 
- void routing_end() {
-   char buf[256];
--  snprintf(buf, 255, "/bin/ip route delete %s", route);
-+  snprintf(buf, 255, "/sbin/ip route delete %s", route);
-   FILE *p = popen(buf, "r");
-   pclose(p);
- }