Merge Mainline

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-01-17 00:30:24 +08:00 · 2021-01-17 00:30:24 +08:00 · c06e7b4bfe
commit c06e7b4bfe
parent 4ceedc3f17 0a81e6ef4f
9 changed files with 6601 additions and 6509 deletions
--- a/package/ctcgfw/sub-web/Makefile
+++ b/package/ctcgfw/sub-web/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=sub-web
 PKG_VERSION:=1.0.0
-PKG_RELEASE:=5
+PKG_RELEASE:=6

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/CareyWang/sub-web.git
--- a/package/ctcgfw/sub-web/patches/020-views-add-examples-from-ACL4SSR-and-Subconverter.patch
+++ b/package/ctcgfw/sub-web/patches/020-views-add-examples-from-ACL4SSR-and-Subconverter.patch
@ -8,8 +8,6 @@ Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
 src/views/Subconverter.vue | 104 +++++++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)

-diff --git a/src/views/Subconverter.vue b/src/views/Subconverter.vue
-index 701006f..d058719 100644
 --- a/src/views/Subconverter.vue
 +++ b/src/views/Subconverter.vue
@@ -257,6 +257,110 @@ export default {
@ -31,52 +29,52 @@ index 701006f..d058719 100644
 +              {
 +                label: "ACL4SSR_Online 默认版 分组比较全 (与Github同步)",
 +                value:
-+                  "https://cdn.jsdelivr.net/gh/ACL4SSR/ACL4SSR@master/Clash/config/ACL4SSR_Online.ini"
+                  "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online.ini"
 +              },
 +              {
 +                label: "ACL4SSR_Online_AdblockPlus 更多去广告 (与Github同步)",
 +                value:
-+                  "https://cdn.jsdelivr.net/gh/ACL4SSR/ACL4SSR@master/Clash/config/ACL4SSR_Online_AdblockPlus.ini"
+                  "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_AdblockPlus.ini"
 +              },
 +              {
 +                label: "ACL4SSR_Online_NoAuto 无自动测速 (与Github同步)",
 +                value:
-+                  "https://cdn.jsdelivr.net/gh/ACL4SSR/ACL4SSR@master/Clash/config/ACL4SSR_Online_NoAuto.ini"
+                  "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_NoAuto.ini"
 +              },
 +              {
 +                label: "ACL4SSR_Online_Mini 精简版 (与Github同步)",
 +                value:
-+                  "https://cdn.jsdelivr.net/gh/ACL4SSR/ACL4SSR@master/Clash/config/ACL4SSR_Online_Mini.ini"
+                  "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Mini.ini"
 +              },
 +              {
 +                label: "ACL4SSR_Online_Mini_AdblockPlus.ini 精简版 更多去广告 (与Github同步)",
 +                value:
-+                  "https://cdn.jsdelivr.net/gh/ACL4SSR/ACL4SSR@master/Clash/config/ACL4SSR_Online_Mini_AdblockPlus.ini"
+                  "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Mini_AdblockPlus.ini"
 +              },
 +              {
 +                label: "ACL4SSR_Online_Mini_NoAuto.ini 精简版 不带自动测速 (与Github同步)",
 +                value:
-+                  "https://cdn.jsdelivr.net/gh/ACL4SSR/ACL4SSR@master/Clash/config/ACL4SSR_Online_Mini_NoAuto.ini"
+                  "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Mini_NoAuto.ini"
 +              },
 +              {
 +                label: "ACL4SSR_Online_Mini_Fallback.ini 精简版 带故障转移 (与Github同步)",
 +                value:
-+                  "https://cdn.jsdelivr.net/gh/ACL4SSR/ACL4SSR@master/Clash/config/ACL4SSR_Online_Mini_Fallback.ini"
+                  "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Mini_Fallback.ini"
 +              },
 +              {
 +                label: "ACL4SSR_Online_Mini_MultiMode.ini 精简版 自动测速、故障转移、负载均衡 (与Github同步)",
 +                value:
-+                  "https://cdn.jsdelivr.net/gh/ACL4SSR/ACL4SSR@master/Clash/config/ACL4SSR_Online_Mini_MultiMode.ini"
+                  "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Mini_MultiMode.ini"
 +              },
 +              {
 +                label: "ACL4SSR_Online_Full 全分组 重度用户使用 (与Github同步)",
 +                value:
-+                  "https://cdn.jsdelivr.net/gh/ACL4SSR/ACL4SSR@master/Clash/config/ACL4SSR_Online_Full.ini"
+                  "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Full.ini"
 +              },
 +              {
 +                label: "ACL4SSR_Online_Full_AdblockPlus 全分组 重度用户使用 更多去广告 (与Github同步)",
 +                value:
-+                  "https://cdn.jsdelivr.net/gh/ACL4SSR/ACL4SSR@master/Clash/config/ACL4SSR_Online_Full_AdblockPlus.ini"
+                  "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Full_AdblockPlus.ini"
 +              },
 +              {
 +                label: "ACL4SSR 本地 默认版 分组比较全",
@ -123,6 +121,3 @@ index 701006f..d058719 100644
           {
             label: "universal",
             options: [
-- 
-2.17.1
-
--- a/package/lean/luci-app-ssr-plus/Makefile
+++ b/package/lean/luci-app-ssr-plus/Makefile
@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=luci-app-ssr-plus
 PKG_VERSION:=182
-PKG_RELEASE:=4
+PKG_RELEASE:=5

 define Package/$(PKG_NAME)/conffiles
 /etc/config/shadowsocksr
--- a/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua
+++ b/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua
@ -21,6 +21,8 @@ function index()
 	entry({"admin", "services", "shadowsocksr", "run"}, call("act_status")).leaf = true
 	entry({"admin", "services", "shadowsocksr", "ping"}, call("act_ping")).leaf = true
 	entry({"admin", "services", "shadowsocksr", "reset"}, call("act_reset"))
+	entry({"admin", "services", "shadowsocksr", "restart"}, call("act_restart"))
+	entry({"admin", "services", "shadowsocksr", "delete"}, call("act_delete"))
 end

 function subscribe()
@ -109,7 +111,16 @@ function check_port()
 end

 function act_reset()
-	nixio.exec("/etc/init.d/shadowsocksr", "reset")
-	http.redirect(luci.dispatcher.build_url('admin/services/shadowsocksr'))
-	return
+	luci.sys.call("/etc/init.d/shadowsocksr reset &")
+	luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr"))
+end
+
+function act_restart()
+	luci.sys.call("/etc/init.d/shadowsocksr restart &")
+	luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr"))
+end
+
+function act_delete()
+	luci.sys.call("/etc/init.d/shadowsocksr restart &")
+	luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "servers"))
 end
--- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua
+++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua
@ -66,7 +66,8 @@ o.write = function()
 		end
 	end)
 	uci:save("shadowsocksr")
-	m.uci:commit("shadowsocksr")
+	uci:commit("shadowsocksr")
+	luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "delete"))
 	return
 end

@ -113,7 +114,8 @@ node.inputstyle = "apply"
 node.write = function(self, section)
 	uci:set("shadowsocksr", '@global[0]', 'global_server', section)
 	uci:save("shadowsocksr")
-	m.uci:commit("shadowsocksr")
+	uci:commit("shadowsocksr")
+	luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "restart"))
 end

 o = s:option(Flag, "switch_enable", translate("Auto Switch"))
--- a/package/lean/luci-app-ssr-plus/root/etc/ssrplus/china_ssr.txt
+++ b/package/lean/luci-app-ssr-plus/root/etc/ssrplus/china_ssr.txt
@ -4114,6 +4114,7 @@
 103.160.244.0/23
 103.160.254.0/23
 103.161.14.0/23
+103.161.102.0/23
 103.192.0.0/22
 103.192.4.0/22
 103.192.8.0/22
--- a/package/lean/luci-app-ssr-plus/root/etc/ssrplus/gfw_list.conf
+++ b/package/lean/luci-app-ssr-plus/root/etc/ssrplus/gfw_list.conf
--- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
+++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
@ -457,9 +457,15 @@ local execute = function()
 				end
 			else
 				if not old.alias then
-					old.alias = old.server .. ':' .. old.server_port
+					if not old.server or old.server_port then
+						ucic:delete(name, old['.name'])
+					else
+						old.alias = old.server .. ':' .. old.server_port
+						log('忽略手动添加的节点: ' .. old.alias)
+					end
+				else
+					log('忽略手动添加的节点: ' .. old.alias)
 				end
-				log('忽略手动添加的节点: ' .. old.alias)
 			end
 		end)
 		for k, v in ipairs(nodeResult) do
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@ -21,7 +21,10 @@ PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=gpl-2.0.txt
 PKG_CPE_ID:=cpe:/a:arm:mbed_tls

-PKG_CONFIG_DEPENDS:=CONFIG_LIBMBEDTLS_HAVE_SSE2
+PKG_CONFIG_DEPENDS := \
+	CONFIG_LIBMBEDTLS_DEBUG_C \
+	CONFIG_LIBMBEDTLS_HAVE_SSE2 \
+	CONFIG_LIBMBEDTLS_HKDF_C

 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@ -46,6 +49,18 @@ $(call Package/mbedtls/Default)
 endef

 define Package/libmbedtls/config
+config LIBMBEDTLS_DEBUG_C
+	depends on PACKAGE_libmbedtls
+	bool "Enable debug functions"
+	default n
+	help
+	 This option enables mbedtls library's debug functions.
+
+	 It increases the uncompressed libmbedtls binary size
+	 by around 60 KiB (for an ARMv5 platform).
+
+	 Usually, you don't need this, so don't select this if you're unsure.
+
 config LIBMBEDTLS_HAVE_SSE2
 	depends on PACKAGE_libmbedtls
 	bool
@ -59,6 +74,14 @@ config LIBMBEDTLS_HAVE_SSE2
 		support them, such as Geode GX and LX.  In this case you may
 		save 23KB by saying yes here.  AMD Geode NX, and Intel
 		Pentium 4 and above support SSE2.
+
+config LIBMBEDTLS_HKDF_C
+	depends on PACKAGE_libmbedtls
+	bool "Enable the HKDF algorithm (RFC 5869)"
+	default n
+	help
+	 This option adds support for the Hashed Message Authentication Code
+	 (HMAC)-based key derivation function (HKDF).
 endef

 define Package/mbedtls-util
@ -94,11 +117,19 @@ define Build/Configure
 	$(Build/Configure/Default)

 	awk 'BEGIN { rc = 1 } \
+	     /#define MBEDTLS_DEBUG_C/ { $$$$0 = "$(if $(CONFIG_LIBMBEDTLS_DEBUG_C),,// )#define MBEDTLS_DEBUG_C"; rc = 0 } \
 	     /#define MBEDTLS_HAVE_SSE2/ { $$$$0 = "$(if $(CONFIG_LIBMBEDTLS_HAVE_SSE2),,// )#define MBEDTLS_HAVE_SSE2"; rc = 0 } \
 	     { print } \
 	     END { exit(rc) }' $(PKG_BUILD_DIR)/include/mbedtls/config.h \
 	     >$(PKG_BUILD_DIR)/include/mbedtls/config.h.new && \
 	mv $(PKG_BUILD_DIR)/include/mbedtls/config.h.new $(PKG_BUILD_DIR)/include/mbedtls/config.h
+
+	awk 'BEGIN { rc = 1 } \
+	     /#define MBEDTLS_HKDF_C/ { $$$$0 = "$(if $(CONFIG_LIBMBEDTLS_HKDF_C),,// )#define MBEDTLS_HKDF_C"; rc = 0 } \
+	     { print } \
+	     END { exit(rc) }' $(PKG_BUILD_DIR)/include/mbedtls/config.h \
+	     >$(PKG_BUILD_DIR)/include/mbedtls/config.h.new && \
+	mv $(PKG_BUILD_DIR)/include/mbedtls/config.h.new $(PKG_BUILD_DIR)/include/mbedtls/config.h
 endef

 define Build/InstallDev