From 243fac7222db8f02ebb163e45d386c229b50830a Mon Sep 17 00:00:00 2001 From: babutree Date: Thu, 27 Aug 2020 16:14:06 +0800 Subject: [PATCH 1/5] Update to verysync 1.5.5 version --- package/zxlhhyccc/verysync/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zxlhhyccc/verysync/Makefile b/package/zxlhhyccc/verysync/Makefile index 35e22eca21..7e19efcb5b 100644 --- a/package/zxlhhyccc/verysync/Makefile +++ b/package/zxlhhyccc/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 From 6b59ce7fe6b760c4f0019f16348620631bd36c64 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 30 Aug 2020 04:31:20 +0800 Subject: [PATCH 2/5] luci-app-ssr-plus: improve translation --- .../luasrc/model/cbi/shadowsocksr/client.lua | 3 ++- package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua index f17415f957..b2e67608bb 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua +++ b/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("

Support SS/SSR/V2RAY/TROJAN/NAIVEPROXY/SOCKS5/TUN etc.

")) m:section(SimpleSection).template = "shadowsocksr/status" diff --git a/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po b/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po index f0602513b9..444dc8d48c 100644 --- a/package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.po +++ b/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 "

Support SS/SSR/V2RAY/TROJAN/NAIVEPROXY/SOCKS5/TUN etc.

" +msgstr "

支持 SS/SSR/V2RAY/TROJAN/NAIVEPROXY/SOCKS5/TUN 等协议

" msgid "Main Server" msgstr "主服务器" From 0e493653c3648811e1277ad4f4e0ef2b9c5dbcb9 Mon Sep 17 00:00:00 2001 From: zhusir Date: Sat, 29 Aug 2020 11:48:27 +0800 Subject: [PATCH 3/5] Update v2ray version to 4.27.4 --- package/lean/v2ray/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile index b656abad58..20aca3ae94 100644 --- a/package/lean/v2ray/Makefile +++ b/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 From 4dc55111a73c1804acfd751437bef56beb626467 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 30 Aug 2020 04:47:29 +0800 Subject: [PATCH 4/5] OpenClash: sync with upstream source --- .../etc/openclash/custom/openclash_custom_fake_filter.list | 3 ++- .../lib/lua/luci/model/cbi/openclash/rule-providers-manage.lua | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/custom/openclash_custom_fake_filter.list b/package/ctcgfw/luci-app-openclash/files/etc/openclash/custom/openclash_custom_fake_filter.list index 3e3eb30ef6..b7324f18a6 100644 --- a/package/ctcgfw/luci-app-openclash/files/etc/openclash/custom/openclash_custom_fake_filter.list +++ b/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 \ No newline at end of file +*.*.xboxlive.com +proxy.golang.org \ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/rule-providers-manage.lua b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/rule-providers-manage.lua index e63d7c6db3..50dbdaa65c 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/rule-providers-manage.lua +++ b/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 From 7a54edaa8afa80f43c9e45abb6fd83880638b994 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 30 Aug 2020 04:51:13 +0800 Subject: [PATCH 5/5] rapidjson: disable docs build --- package/ctcgfw/rapidjson/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/ctcgfw/rapidjson/Makefile b/package/ctcgfw/rapidjson/Makefile index 2faa9f3d6a..38ad944278 100644 --- a/package/ctcgfw/rapidjson/Makefile +++ b/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