[package] pptp: remove support for underlying ipproto, it is adviced since a while...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29694 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 08f6b40..a6d213d 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.
 #
 # 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_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
 
 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 7efbb02..19023e7 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 device
        config_get device "$config" device
 

-       local ipproto
-       config_get ipproto "$config" ipproto
-

        local server
        config_get server "$config" server
 
        local server
        config_get server "$config" server
 


@@ -39,7 +36,6 @@ setup_interface_pptp() {
        done
        sleep 1
 
        done
        sleep 1
 

-       setup_interface "$device" "$config" "${ipproto:-dhcp}"

        local gw="$(find_gw)"
        [ -n "$gw" ] && {
                local serv_addrs=""
        local gw="$(find_gw)"
        [ -n "$gw" ] && {
                local serv_addrs=""