From c113ad85457451879d00aa186dee27a9e27dcb47 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 22 Oct 2021 20:30:29 +0800
Subject: [PATCH] update-10.22

---
 luci-app-easymesh/Makefile              |  4 ++--
 luci-app-ssr-plus/Makefile              | 24 +++---------------------
 my-default-settings/files/packages.init |  6 +++---
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/luci-app-easymesh/Makefile b/luci-app-easymesh/Makefile
index 96fc94c27..547b37fe3 100755
--- a/luci-app-easymesh/Makefile
+++ b/luci-app-easymesh/Makefile
@@ -5,8 +5,8 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI Support for easymesh
-LUCI_DEPENDS:= +kmod-cfg80211 +batctl-default +kmod-batman-adv +wpad-openssl +dawn
-PKG_VERSION:=1.7
+LUCI_DEPENDS:= +kmod-cfg80211 +batctl-default +kmod-batman-adv +wpad-mesh-openssl +dawn
+PKG_VERSION:=1.8
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile
index 57b46833f..5a324af28 100644
--- a/luci-app-ssr-plus/Makefile
+++ b/luci-app-ssr-plus/Makefile
@@ -21,7 +21,9 @@ PKG_CONFIG_DEPENDS:= \
 
 LUCI_TITLE:=SS/SSR/V2Ray/Trojan/NaiveProxy/Socks5/Tun LuCI interface
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+coreutils +coreutils-base64 +dns2socks +dnsmasq-full +ipset \
+LUCI_DEPENDS:= \
+	@(PACKAGE_libustream-mbedtls||PACKAGE_libustream-openssl||PACKAGE_libustream-wolfssl) \
+	+coreutils +coreutils-base64 +dns2socks +dnsmasq-full +ipset \
 	+ip-full +iptables-mod-tproxy +lua +libuci-lua +microsocks +pdnsd-alt \
 	+tcping +resolveip +shadowsocksr-libev-ssr-check +uclient-fetch \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun:kcptun-client \
@@ -43,26 +45,6 @@ LUCI_DEPENDS:=+coreutils +coreutils-base64 +dns2socks +dnsmasq-full +ipset \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray-core
 
 define Package/$(PKG_NAME)/config
-menu "Include libustream-ssl"
-	depends on PACKAGE_$(PKG_NAME)
-	config PACKAGE_$(PKG_NAME)_INCLUDE_libustream-wolfssl
-		bool "Include libustream-wolfssl"
-		default y if DEFAULT_libustream-wolfssl
-		select PACKAGE_libustream-wolfssl
-	
-	config PACKAGE_$(PKG_NAME)_INCLUDE_libustream-openssl
-		depends on !PACKAGE_$(PKG_NAME)_INCLUDE_libustream-wolfssl
-		bool "Include libustream-openssl"
-		default y if DEFAULT_libustream-openssl
-		select PACKAGE_libustream-openssl
-
-	config PACKAGE_$(PKG_NAME)_INCLUDE_libustream-mbedtls
-		depends on !(PACKAGE_$(PKG_NAME)_INCLUDE_libustream-wolfssl || PACKAGE_$(PKG_NAME)_INCLUDE_libustream-openssl)
-		bool "Include libustream-mbedtls"
-		default y if DEFAULT_libustream-mbedtls
-		select PACKAGE_libustream-mbedtls
-
-endmenu
 config PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun
 	bool "Include Kcptun"
 	default n
diff --git a/my-default-settings/files/packages.init b/my-default-settings/files/packages.init
index 272271467..e9d0e1d21 100644
--- a/my-default-settings/files/packages.init
+++ b/my-default-settings/files/packages.init
@@ -41,9 +41,9 @@ fi
 					if [ "$upopkg" != " " ]; then
 							for ipk in $upopkg; do
 								while :; do
-									opkg install --force-overwrite --force-checksum --force-depends $ipk | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 || true
+									opkg install --force-overwrite --force-checksum --force-depends $ipk | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 >/dev/null 2>&1 || true
 									if [[ $ipk == luci-app-* ]]; then
-										opkg install --force-overwrite --force-checksum luci-i18n-"$(echo $ipk | cut -d - -f 3-4)"-zh-cn | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 || true
+										opkg install --force-overwrite --force-checksum luci-i18n-"$(echo $ipk | cut -d - -f 3-4)"-zh-cn | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 >/dev/null 2>&1 || true
 									fi
 									[[ "$(opkg list-installed | grep $ipk)" ]] && {
 										break
@@ -61,7 +61,7 @@ fi
 					fi
 					[[ -f $BKOPKG/failed.txt &&  -f /etc/inited ]] && {
 						for ipk in $(cat $BKOPKG/failed.txt); do
-							opkg install --force-overwrite --force-checksum --force-depends $ipk | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 || true
+							opkg install --force-overwrite --force-checksum --force-depends $ipk | sed -e "s/^/$(date +%Y-%m-%d" "%H:%M:%S) /" >>/tmp/opkgupdate.log 2>&1 >/dev/null 2>&1 || true
 							[[ "$(opkg list-installed | grep $ipk)" ]] && {
 								sed -i '/$ipk/d' $BKOPKG/failed.txt
 							}