AA: ppp: Backport r35188, r36904

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36906 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index d7eddbc..b6fbded 100644 (file)
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.5
-PKG_RELEASE:=8
+PKG_RELEASE:=10
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/

diff --git a/package/ppp/files/lib/netifd/ppp-up b/package/ppp/files/lib/netifd/ppp-up
index 8ab8c9d..fa14550 100755 (executable)
--- a/package/ppp/files/lib/netifd/ppp-up
+++ b/package/ppp/files/lib/netifd/ppp-up
@@ -5,10 +5,9 @@ PPP_IPPARAM="$6"
 proto_init_update "$IFNAME" 1 1
 proto_set_keep 1
 [ -n "$PPP_IPPARAM" ] && {
-       [ -n "$IPLOCAL" ] && proto_add_ipv4_address "$IPLOCAL" 32
+       [ -n "$IPLOCAL" ] && proto_add_ipv4_address "$IPLOCAL" 32 "" "${IPREMOTE:-2.2.2.2}"
        [ -n "$IPREMOTE" ] && proto_add_ipv4_route 0.0.0.0 0 "$IPREMOTE"
        [ -n "$LLLOCAL" ] && proto_add_ipv6_address "$LLLOCAL" 128
-       [ -n "$LLREMOTE" ] && proto_add_ipv6_route "::0" 0 "$LLREMOTE"
        [ -n "$DNS1" ] && proto_add_dns_server "$DNS1"
        [ -n "$DNS2" -a "$DNS1" != "$DNS2" ] && proto_add_dns_server "$DNS2"
 }