ppp: enable IPv6CP by default

Signed-off-by: Steven Barth <[email protected]>
Backport of r42158

SVN-Revision: 42355

diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile
index 4cee97a0a2d5c01e2f8799cdd7a25de2a6ef781e..724be30ef3db68abcc8bde98118dab4cc4aaaf55 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.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/

diff --git a/package/network/services/ppp/files/ppp.sh b/package/network/services/ppp/files/ppp.sh
index 8f4cdebcef29457debee7784b57597ea6dcf2839..f07b11f3fd34fa114552700308de50869c3d9aaf 100755 (executable)
--- a/package/network/services/ppp/files/ppp.sh
+++ b/package/network/services/ppp/files/ppp.sh
@@ -26,7 +26,11 @@ ppp_generic_setup() {
        local config="$1"; shift
 
        json_get_vars ipv6 demand keepalive username password pppd_options pppname
-       [ "$ipv6" = 1 ] || ipv6=""
+       if [ "$ipv6" = 0 ]; then
+               ipv6=""
+       else
+               ipv6=1
+       fi
        if [ "${demand:-0}" -gt 0 ]; then
                demand="precompiled-active-filter /etc/ppp/filter demand idle $demand"
        else