From d18f879b454a050ff644100678354c883161ecbc Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Thu, 27 Sep 2018 12:54:30 +0800 Subject: [PATCH] repare for ipsec ipv6 support --- package/lean/luci-app-ipsec-vpnd/Makefile | 4 ++-- package/network/config/netifd/Makefile | 8 ++++---- package/network/config/netifd/files/etc/init.d/network | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/lean/luci-app-ipsec-vpnd/Makefile b/package/lean/luci-app-ipsec-vpnd/Makefile index 57fb5adbe..2779ce756 100644 --- a/package/lean/luci-app-ipsec-vpnd/Makefile +++ b/package/lean/luci-app-ipsec-vpnd/Makefile @@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for IPSec VPN Server (IKEv1 with PSK and Xauth) -LUCI_DEPENDS:=+strongswan-minimal +strongswan-mod-xauth-generic +kmod-br-netfilter +LUCI_DEPENDS:=+strongswan-minimal +strongswan-mod-xauth-generic LUCI_PKGARCH:=all PKG_VERSION:=2.0 -PKG_RELEASE:=9 +PKG_RELEASE:=10 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index a089f0c6e..1694a5fda 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netifd -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git -PKG_SOURCE_DATE:=2018-08-20 -PKG_SOURCE_VERSION:=7454d121090f60428777c01f431031059acc96eb -PKG_MIRROR_HASH:=434f39ebc328bd172307e84dd532a8239f48fcae7e32ea4d456b4e24ddd739f3 +PKG_SOURCE_DATE:=2018-09-18 +PKG_SOURCE_VERSION:=23941d7ef3134de9c89c363896e45a0ea4fbe45b +PKG_MIRROR_HASH:=16dd30215b833e2ff5efa0ab95dfabe80e3e239c3720de3e27db5f4ce22bcccf PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 diff --git a/package/network/config/netifd/files/etc/init.d/network b/package/network/config/netifd/files/etc/init.d/network index 6cd167d19..99d9f6582 100755 --- a/package/network/config/netifd/files/etc/init.d/network +++ b/package/network/config/netifd/files/etc/init.d/network @@ -133,9 +133,9 @@ service_triggers() procd_open_validate validate_atm_bridge_section validate_route_section - validate_route6_section + [ -e /proc/sys/net/ipv6 ] && validate_route6_section validate_rule_section - validate_rule6_section + [ -e /proc/sys/net/ipv6 ] && validate_rule6_section validate_switch_section validate_switch_vlan procd_close_validate