aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-01-08 15:41:34 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-01-08 15:41:34 +0000
commitd4a872bb035aa132c7811cbccdbae8be11c58ec5 (patch)
tree4c08776eb4d2d8287f7d843770ac52f6920bea17
parent53291d4ceb1b40372bca34f3e9f7e62b878c9c91 (diff)
downloadupstream-d4a872bb035aa132c7811cbccdbae8be11c58ec5.tar.gz
upstream-d4a872bb035aa132c7811cbccdbae8be11c58ec5.tar.bz2
upstream-d4a872bb035aa132c7811cbccdbae8be11c58ec5.zip
[package] pptp: remove support for underlying ipproto, it is adviced since a while that pptp should be declared as separate interface alognside wan - in this configuration the ipproto will cause stray udhcpc errors due to not existent interfaces, so remove it
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29694 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/pptp/Makefile4
-rw-r--r--package/pptp/files/pptp.sh4
2 files changed, 2 insertions, 6 deletions
diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 08f6b40aa3..a6d213d387 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=pptp
PKG_VERSION:=1.7.1
-PKG_RELEASE:=4
+PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/pptpclient
diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index 7efbb02fb8..19023e7ef4 100644
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -24,9 +24,6 @@ setup_interface_pptp() {
local device
config_get device "$config" device
- local ipproto
- config_get ipproto "$config" ipproto
-
local server
config_get server "$config" server
@@ -39,7 +36,6 @@ setup_interface_pptp() {
done
sleep 1
- setup_interface "$device" "$config" "${ipproto:-dhcp}"
local gw="$(find_gw)"
[ -n "$gw" ] && {
local serv_addrs=""