pptp: - bring pptp scripts in sync with updated ppp logic - bump package revision

SVN-Revision: 21284

diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 76e0f6e644cfcb9638755424fdd00f91987257a0..fd8f443564fec4eacc675e4f1aab02316c955132 100644 (file)
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pptp
 PKG_VERSION:=1.6.0
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 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 e38c24200dd7bae5d427bdc39e3603e27286244e..ed5f46fff33c18464a516b5f05c2affcc9d44e69 100644 (file)
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -1,11 +1,10 @@
-scan_pptp() {
-       scan_ppp "$@"
-}
-
 find_gw() {
        route -n | awk '$1 == "0.0.0.0" { print $2; exit }'
 }
 
+stop_interface_pptp() {
+       stop_interface_ppp "$1"
+}
 
 setup_interface_pptp() {
        local config="$2"
@@ -31,11 +30,6 @@ setup_interface_pptp() {
        config_get netmask "$config" netmask
        [ -z "$netmask" -o -z "$device" ] || ifconfig $device netmask $netmask
 
-       # make sure the network state references the correct ifname
-       scan_ppp "$config"
-       config_get ifname "$config" ifname
-       uci_set_state network "$config" ifname "$ifname"
-
        config_get mtu "$config" mtu
        mtu=${mtu:-1452}
        start_pppd "$config" \