jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

pptp: update to pptp-1.8.0

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-04-01 21:33:00 +02:00
parent b3b701f004
commit dd163ce00c
3 changed files with 7 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/network/pptp/package.mk
View File

@ -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() {

33
packages/network/pptp/patches/pptp-1.7.2-configure.patch
View File

@ -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

36
packages/network/pptp/patches/pptp-1.7.2-use-sbin-ip.patch
View File

@ -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);
}