From 57d8f5198b6ad55160da1ed0ccc059a7cede1a88 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Sat, 2 Nov 2013 23:49:57 -0500
Subject: network/pptp: Updated for version 1.8.0.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 network/pptp/pptp.SlackBuild |  7 ++-----
 network/pptp/pptp.info       |  6 +++---
 network/pptp/routing.c.patch | 28 ----------------------------
 3 files changed, 5 insertions(+), 36 deletions(-)
 delete mode 100644 network/pptp/routing.c.patch

(limited to 'network/pptp')

diff --git a/network/pptp/pptp.SlackBuild b/network/pptp/pptp.SlackBuild
index 3fd2061f71..907e57d5b4 100644
--- a/network/pptp/pptp.SlackBuild
+++ b/network/pptp/pptp.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pptp
-VERSION=${VERSION:-1.7.2}
+VERSION=${VERSION:-1.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,10 +72,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix path to 'ip' binary
-patch -p1 < $CWD/routing.c.patch
-
-make OPTIMIZE="$SLKCFLAGS"
+make IP=/sbin/ip OPTIMIZE="$SLKCFLAGS"
 make install MANDIR=$PKG/usr/man/man8 DESTDIR=$PKG 
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/network/pptp/pptp.info b/network/pptp/pptp.info
index e6260f110e..ce3efc5d79 100644
--- a/network/pptp/pptp.info
+++ b/network/pptp/pptp.info
@@ -1,8 +1,8 @@
 PRGNAM="pptp"
-VERSION="1.7.2"
+VERSION="1.8.0"
 HOMEPAGE="http://pptpclient.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/pptpclient/pptp-1.7.2.tar.gz"
-MD5SUM="4c3d19286a37459a632c7128c92a9857"
+DOWNLOAD="http://downloads.sourceforge.net/pptpclient/pptp-1.8.0.tar.gz"
+MD5SUM="4efce9f263e2c3f38d79d9df222476de"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/pptp/routing.c.patch b/network/pptp/routing.c.patch
deleted file mode 100644
index 45d2ca9c03..0000000000
--- a/network/pptp/routing.c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/routing.c.ORIG	2008-05-14 08:33:55.000000000 +0200
-+++ a/routing.c	2009-07-29 23:37:03.196933022 +0200
-@@ -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);
- }
-- 
cgit v1.2.3