From 5d99eeef7c4aaab0bc4f4804cb97e42105ac20e4 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Wed, 30 Jun 2021 13:04:33 +0800
Subject: [PATCH] luci-app-ipsec-vpnd: add strongswan-mod-kernel-libipsec

---
 include/target.mk                           |  3 +--
 package/lean/luci-app-ipsec-vpnd/Makefile   |  4 ++--
 target/linux/ath79/image/generic-tp-link.mk | 24 ++++++++++-----------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/include/target.mk b/include/target.mk
index 2f5d2669d..da924b931 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -50,8 +50,7 @@ DEFAULT_PACKAGES.router:=\
 	default-settings luci luci-app-ddns luci-app-upnp luci-app-autoreboot \
 	luci-app-filetransfer luci-app-vsftpd luci-app-ssr-plus luci-app-unblockmusic luci-app-arpbind \
 	luci-app-vlmcsd luci-app-wol luci-app-ramfree \
-	luci-app-turboacc luci-app-nlbwmon luci-app-accesscontrol \
-	ddns-scripts_aliyun ddns-scripts_dnspod
+	luci-app-turboacc luci-app-nlbwmon luci-app-accesscontrol
 
 ifneq ($(DUMP),)
   all: dumpinfo
diff --git a/package/lean/luci-app-ipsec-vpnd/Makefile b/package/lean/luci-app-ipsec-vpnd/Makefile
index ab7cc45c4..46bef920f 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 +strongswan-minimal +strongswan-mod-xauth-generic
+LUCI_DEPENDS:=+strongswan +strongswan-minimal +strongswan-mod-xauth-generic +strongswan-mod-kernel-libipsec
 LUCI_PKGARCH:=all
 PKG_VERSION:=1.0
-PKG_RELEASE:=8
+PKG_RELEASE:=9
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk
index 8e769b046..bce5fc561 100644
--- a/target/linux/ath79/image/generic-tp-link.mk
+++ b/target/linux/ath79/image/generic-tp-link.mk
@@ -564,18 +564,6 @@ define Device/tplink_tl-wdr4900-v2
 endef
 TARGET_DEVICES += tplink_tl-wdr4900-v2
 
-define Device/tplink_tl-wdr7500-v3
-  $(Device/tplink-8mlzma)
-  SOC := qca9558
-  DEVICE_MODEL := TL-WDR7500
-  DEVICE_VARIANT := v3
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \
-	ath10k-firmware-qca988x-ct
-  TPLINK_HWID := 0x75000003
-  SUPPORTED_DEVICES += archer-c7
-endef
-TARGET_DEVICES += tplink_tl-wdr7500-v3
-
 define Device/tplink_tl-wdr6500-v2
   $(Device/tplink-8mlzma)
   SOC := qca9561
@@ -591,6 +579,18 @@ define Device/tplink_tl-wdr6500-v2
 endef
 TARGET_DEVICES += tplink_tl-wdr6500-v2
 
+define Device/tplink_tl-wdr7500-v3
+  $(Device/tplink-8mlzma)
+  SOC := qca9558
+  DEVICE_MODEL := TL-WDR7500
+  DEVICE_VARIANT := v3
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct \
+	ath10k-firmware-qca988x-ct
+  TPLINK_HWID := 0x75000003
+  SUPPORTED_DEVICES += archer-c7
+endef
+TARGET_DEVICES += tplink_tl-wdr7500-v3
+
 define Device/tplink_tl-wpa8630-v1
   $(Device/tplink-8mlzma)
   SOC := qca9563