Merge Mainline

package/ctcgfw/luci-app-openclash/files/etc/openclash/custom/openclash_custom_fake_filter.list

@@ -78,4 +78,5 @@ localhost.ptlogin2.qq.com
 *.*.stun.playstation.net
 #Microsoft Xbox
 xbox.*.*.microsoft.com
-*.*.xboxlive.com
+*.*.xboxlive.com
+proxy.golang.org

package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/rule-providers-manage.lua

@@ -107,7 +107,7 @@ Button.render(e,t,a)
 end
 btnrm.write=function(a,t)
 fs.unlink("/etc/openclash/rule_provider/"..e[t].filename)
-HTTP.redirect(DISP.build_url("admin", "services", "openclash", "game-rules-manage"))
+HTTP.redirect(DISP.build_url("admin", "services", "openclash", "rule-providers-manage"))
 end
 
 return m, form

package/ctcgfw/rapidjson/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rapidjson
 PKG_VERSION:=1.1.0-ce81bc9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/Tencent/rapidjson.git
@@ -30,6 +30,10 @@ PKG_BUILD_PARALLEL:=1
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
+CMAKE_OPTIONS+= -DRAPIDJSON_BUILD_DOC=OFF \
+	-DRAPIDJSON_BUILD_EXAMPLES=OFF \
+	-DRAPIDJSON_BUILD_TESTS=OFF
+
 define Package/$(PKG_NAME)
   SECTION:=lib
   CATEGORY:=Libraries

package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua

@@ -5,7 +5,8 @@
 local m, s, sec, o, kcp_enable
 local shadowsocksr = "shadowsocksr"
 local uci = luci.model.uci.cursor()
-m = Map(shadowsocksr, translate("ShadowSocksR Plus+ Settings"))
+m = Map(shadowsocksr, translate("ShadowSocksR Plus+ Settings"),
+	translate("<h3>Support SS/SSR/V2RAY/TROJAN/NAIVEPROXY/SOCKS5/TUN etc.</h3>"))
 
 m:section(SimpleSection).template = "shadowsocksr/status"
 

package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po

@@ -413,7 +413,10 @@ msgid "GFW List"
 msgstr "GFW列表"
 
 msgid "ShadowSocksR Plus+ Settings"
-msgstr "ShadowSocksR Plus+ 设置（支持SS/SSR/V2RAY/TROJAN/SOCKS5/TUN）"
+msgstr "ShadowSocksR Plus+ 设置"
+
+msgid "<h3>Support SS/SSR/V2RAY/TROJAN/NAIVEPROXY/SOCKS5/TUN etc.</h3>"
+msgstr "<h3>支持 SS/SSR/V2RAY/TROJAN/NAIVEPROXY/SOCKS5/TUN 等协议</h3>"
 
 msgid "Main Server"
 msgstr "主服务器"

package/lean/v2ray/Makefile

@@ -9,13 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2ray
-PKG_VERSION:=4.27.0
+PKG_VERSION:=4.27.4
 PKG_RELEASE:=1
 PKG_BUILD_DIR:=$(BUILD_DIR)/v2ray-core-$(PKG_VERSION)
 
 PKG_SOURCE:=v2ray-core-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=5e1b0146953398a5422611b20f5e62c3a9c3efd62cd42295762f6f39d8eff31e
+PKG_HASH:=4259e6b66b2c035054f4fe4416ba5109f3ac5f4bc82d42e6998e716f06ced531
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE

package/lean/verysync/Makefile

@@ -35,7 +35,7 @@ PKG_NAME:=verysync
 ifneq ($(LATEST_VERSION),)
 	PKG_VERSION:=$(LATEST_VERSION)
 else
-	PKG_VERSION:=v1.4.3
+	PKG_VERSION:=v1.5.5
 endif
 
 PKG_RELEASE:=1