pptp: remove support for underlying ipproto, it is adviced since a while that pptp...

SVN-Revision: 29694

diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 08f6b40aa3d02fc32d7c5cfaf1c936702b823eff..a6d213d387e85571bd2739a08e860b8b46f0726a 100644 (file)
--- 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 7efbb02fb8e5357d068153deb5459cf33681c3f4..19023e7ef45ac1c0a807654d6c1d497e5ed69f24 100644 (file)
--- 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=""