ppp: use more reliable way to set script environment

Signed-off-by: Steven Barth <steven@midlink.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46942 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile
index a4122a4..e0acf59 100644 (file)
--- a/package/network/services/ppp/Makefile
+++ b/package/network/services/ppp/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.7
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://download.samba.org/pub/ppp/

diff --git a/package/network/services/ppp/files/ppp.sh b/package/network/services/ppp/files/ppp.sh
index a6389a8..2a7e76b 100755 (executable)
--- a/package/network/services/ppp/files/ppp.sh
+++ b/package/network/services/ppp/files/ppp.sh
@@ -90,7 +90,7 @@ ppp_generic_setup() {
                ipv6=""
        elif [ -z "$ipv6" -o "$ipv6" = auto ]; then
                ipv6=1
-               proto_export "AUTOIPV6=1"
+               autoipv6=1
        fi
 
        if [ "${demand:-0}" -gt 0 ]; then
@@ -126,6 +126,7 @@ ppp_generic_setup() {
                ${localip:+$localip:} \
                ${lcp_failure:+lcp-echo-interval $lcp_interval lcp-echo-failure $lcp_failure $lcp_adaptive} \
                ${ipv6:++ipv6} \
+               ${autoipv6:+set AUTOIPV6=1} \
                nodefaultroute \
                usepeerdns \
                $demand maxfail 1 \

diff --git a/package/network/utils/comgt/Makefile b/package/network/utils/comgt/Makefile
index 716bbbf..ac19aad 100644 (file)
--- a/package/network/utils/comgt/Makefile
+++ b/package/network/utils/comgt/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=comgt
 PKG_VERSION:=0.32
-PKG_RELEASE:=26
+PKG_RELEASE:=27
 
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/comgt

diff --git a/package/network/utils/comgt/files/3g.sh b/package/network/utils/comgt/files/3g.sh
index 8aecb0f..b0cdae2 100644 (file)
--- a/package/network/utils/comgt/files/3g.sh
+++ b/package/network/utils/comgt/files/3g.sh
@@ -89,9 +89,6 @@ proto_3g_setup() {
                ;;
        esac
 
-       # Enable RFC 7278
-       proto_export "EXTENDPREFIX=1"
-
        connect="${apn:+USE_APN=$apn }DIALNUMBER=$dialnumber /usr/sbin/chat -t5 -v -E -f $chat"
        ppp_generic_setup "$interface" \
                noaccomp \
@@ -99,6 +96,7 @@ proto_3g_setup() {
                novj \
                nobsdcomp \
                noauth \
+               set EXTENDPREFIX=1 \
                lock \
                crtscts \
                115200 "$device"