aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2015-09-15 14:52:47 +0000
committerSteven Barth <cyrus@openwrt.org>2015-09-15 14:52:47 +0000
commit3c335bb439adb643176d34d9f70508a642779ce1 (patch)
treed090c5f8c76f04dd64d6480abdfa1f19ba1fed90
parent90e1b84f152d130754001a18f22b2bbe31237a81 (diff)
downloadupstream-3c335bb439adb643176d34d9f70508a642779ce1.tar.gz
upstream-3c335bb439adb643176d34d9f70508a642779ce1.tar.bz2
upstream-3c335bb439adb643176d34d9f70508a642779ce1.zip
ppp: use more reliable way to set script environment
Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 46942
-rw-r--r--package/network/services/ppp/Makefile2
-rwxr-xr-xpackage/network/services/ppp/files/ppp.sh3
-rw-r--r--package/network/utils/comgt/Makefile2
-rw-r--r--package/network/utils/comgt/files/3g.sh4
4 files changed, 5 insertions, 6 deletions
diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile
index a4122a4f93..e0acf5993e 100644
--- 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 a6389a8b93..2a7e76b7fe 100755
--- 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 716bbbf3fa..ac19aad3ae 100644
--- 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 8aecb0fd62..b0cdae234d 100644
--- 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"