From 2411859afeae640a90804d2aeccf85c19fb3c729 Mon Sep 17 00:00:00 2001
From: Teaffanie <70811472+Teaffanie@users.noreply.github.com>
Date: Fri, 11 Sep 2020 20:11:49 +0800
Subject: [PATCH] luci-app-openclash: bump to v0.40.2-beta
---
package/ctcgfw/luci-app-openclash/Makefile | 2 +-
.../files/etc/init.d/openclash | 98 +-
.../files/etc/openclash/china_ip_route.ipset | 5971 ++++++++
.../files/etc/openclash/default.yaml | 20 +-
.../files/etc/openclash/lhie1.yaml | 11205 +---------------
.../files/etc/openclash/openclash_version | 4 +-
.../etc/openclash/rule_provider/ChinaIP.yaml | 172 +-
.../usr/lib/lua/luci/controller/openclash.lua | 54 +-
.../lua/luci/model/cbi/openclash/client.lua | 3 +
.../lua/luci/model/cbi/openclash/config.lua | 153 +-
.../model/cbi/openclash/groups-config.lua | 7 +-
.../openclash/proxy-provider-file-manage.lua | 114 +
.../cbi/openclash/rule-providers-config.lua | 2 +-
.../openclash/rule-providers-file-manage.lua | 114 +
.../lua/luci/model/cbi/openclash/settings.lua | 46 +-
.../usr/lib/lua/luci/view/openclash/state.htm | 19 +-
.../lib/lua/luci/view/openclash/status.htm | 41 +
.../lib/lua/luci/view/openclash/update.htm | 44 +-
.../cfg_servers_address_fake_filter.sh | 3 +-
.../share/openclash/cfg_unused_servers_del.sh | 3 +-
.../usr/share/openclash/clash_version.sh | 3 +-
.../files/usr/share/openclash/openclash.sh | 12 +-
.../usr/share/openclash/openclash_chnroute.sh | 57 +
.../usr/share/openclash/openclash_core.sh | 50 +-
.../openclash/openclash_custom_domain_dns.sh | 3 +-
.../usr/share/openclash/openclash_debug.sh | 3 +-
.../share/openclash/openclash_fake_filter.sh | 10 +-
.../share/openclash/openclash_history_get.sh | 3 +-
.../share/openclash/openclash_history_set.sh | 10 +-
.../usr/share/openclash/openclash_ipdb.sh | 8 +-
.../files/usr/share/openclash/openclash_ps.sh | 33 +
.../usr/share/openclash/openclash_rule.sh | 69 +-
.../usr/share/openclash/openclash_update.sh | 34 +-
.../usr/share/openclash/openclash_version.sh | 4 +-
.../openclash/yacd/14.2b1ab3375a2b9a48edab.js | 3 +-
.../yacd/14.2b1ab3375a2b9a48edab.js.map | 1 +
.../yacd/app.57466da82c6534ab0c59.js | 3 +
...> app.57466da82c6534ab0c59.js.LICENSE.txt} | 0
.../yacd/app.57466da82c6534ab0c59.js.map | 1 +
.../yacd/app.9446db28fec78551ca86.js | 2 -
...dc36a.css => app.cf6b34db68df27895b0a.css} | 8 +-
.../yacd/app.cf6b34db68df27895b0a.css.map | 1 +
.../yacd/config.185469682369eea7ed5e.js | 3 +-
.../yacd/config.185469682369eea7ed5e.js.map | 1 +
...bd.css => config.f4c2f06f01d16464ea49.css} | 2 +
.../yacd/config.f4c2f06f01d16464ea49.css.map | 1 +
.../yacd/conns.a55d943aa09565fccb1a.js | 1 -
.../yacd/conns.ac1318f4c605f341f4a1.js | 2 +
.../yacd/conns.ac1318f4c605f341f4a1.js.map | 1 +
...54d.css => conns.c9072a30fa369846711d.css} | 2 +
.../yacd/conns.c9072a30fa369846711d.css.map | 1 +
.../yacd/core-js~app.33c5cdecfc11e62e3415.js | 2 +
.../core-js~app.33c5cdecfc11e62e3415.js.map | 1 +
.../yacd/core-js~app.d6acbd497dd781bcb87a.js | 1 -
.../files/usr/share/openclash/yacd/index.html | 2 +-
.../yacd/logs.367e6b30d27de1213a87.js | 1 -
...5c12.css => logs.9c919d1590eed02bc4b6.css} | 2 +
.../yacd/logs.9c919d1590eed02bc4b6.css.map | 1 +
.../yacd/logs.dca8fd31fe2ece5617ba.js | 2 +
.../yacd/logs.dca8fd31fe2ece5617ba.js.map | 1 +
...3.css => proxies.0fea71f33a1333d027ad.css} | 2 +
.../yacd/proxies.0fea71f33a1333d027ad.css.map | 1 +
.../yacd/proxies.f9db39b6b9f59e944a16.js | 2 +
.../yacd/proxies.f9db39b6b9f59e944a16.js.map | 1 +
.../yacd/proxies.fe3172e32076eb8749e4.js | 1 -
.../yacd/react~app.85a6af7ab221658559e3.js | 3 +-
.../react~app.85a6af7ab221658559e3.js.map | 1 +
.../usr/share/openclash/yacd/report.html | 4 +-
...7f8.css => rules.86d27ed35189095cbd2d.css} | 2 +
.../yacd/rules.86d27ed35189095cbd2d.css.map | 1 +
...11d1e.js => rules.c6d8e4559779501d90c2.js} | 3 +-
.../yacd/rules.c6d8e4559779501d90c2.js.map | 1 +
...9e2.js => runtime.0ec94503bb844bc8ee38.js} | 3 +-
.../yacd/runtime.0ec94503bb844bc8ee38.js.map | 1 +
.../vendors~chartjs.c749992ca47ba67623b4.js | 3 +-
...endors~chartjs.c749992ca47ba67623b4.js.map | 1 +
.../vendors~conns.2d8ba1925a9d128867eb.js | 1 -
.../vendors~conns.9d08041ab4f217cf48cb.js | 2 +
.../vendors~conns.9d08041ab4f217cf48cb.js.map | 1 +
...onns~proxies~rules.3bbf7c997e35c27e0e09.js | 2 +
...~proxies~rules.3bbf7c997e35c27e0e09.js.map | 1 +
...onns~proxies~rules.99b1a71b3d76d3035e41.js | 1 -
...vendors~logs~rules.1b69c8ae2dc5929cac38.js | 3 +-
...ors~logs~rules.1b69c8ae2dc5929cac38.js.map | 1 +
.../vendors~proxies.5afec5e5759a23a386fc.js | 2 +
...endors~proxies.5afec5e5759a23a386fc.js.map | 1 +
.../vendors~proxies.8fcc0e726f340a602edf.js | 1 -
.../files/usr/share/openclash/yml_change.sh | 8 +-
.../usr/share/openclash/yml_field_name_ch.sh | 3 -
.../usr/share/openclash/yml_groups_get.sh | 7 +-
.../usr/share/openclash/yml_groups_name_ch.sh | 24 +-
.../usr/share/openclash/yml_groups_set.sh | 7 +-
.../usr/share/openclash/yml_proxys_get.sh | 4 +-
.../usr/share/openclash/yml_proxys_set.sh | 31 +-
.../usr/share/openclash/yml_rules_change.sh | 161 +-
.../i18n/zh-cn/openclash.zh-cn.po | 27 +-
96 files changed, 7545 insertions(+), 11193 deletions(-)
create mode 100644 package/ctcgfw/luci-app-openclash/files/etc/openclash/china_ip_route.ipset
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/proxy-provider-file-manage.lua
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/rule-providers-file-manage.lua
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_chnroute.sh
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_ps.sh
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/14.2b1ab3375a2b9a48edab.js.map
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/app.57466da82c6534ab0c59.js
rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{app.9446db28fec78551ca86.js.LICENSE.txt => app.57466da82c6534ab0c59.js.LICENSE.txt} (100%)
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/app.57466da82c6534ab0c59.js.map
delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/app.9446db28fec78551ca86.js
rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{app.5f32612351603f3dc36a.css => app.cf6b34db68df27895b0a.css} (86%)
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/app.cf6b34db68df27895b0a.css.map
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/config.185469682369eea7ed5e.js.map
rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{config.683c5e4f78100df80abd.css => config.f4c2f06f01d16464ea49.css} (90%)
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/config.f4c2f06f01d16464ea49.css.map
delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/conns.a55d943aa09565fccb1a.js
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/conns.ac1318f4c605f341f4a1.js
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/conns.ac1318f4c605f341f4a1.js.map
rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{conns.a8987b95653cf010754d.css => conns.c9072a30fa369846711d.css} (99%)
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/conns.c9072a30fa369846711d.css.map
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/core-js~app.33c5cdecfc11e62e3415.js
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/core-js~app.33c5cdecfc11e62e3415.js.map
delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/core-js~app.d6acbd497dd781bcb87a.js
delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/logs.367e6b30d27de1213a87.js
rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{logs.bf8d3190ebe74f5f5c12.css => logs.9c919d1590eed02bc4b6.css} (96%)
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/logs.9c919d1590eed02bc4b6.css.map
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/logs.dca8fd31fe2ece5617ba.js
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/logs.dca8fd31fe2ece5617ba.js.map
rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{proxies.2054c162aeb581d56063.css => proxies.0fea71f33a1333d027ad.css} (99%)
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/proxies.0fea71f33a1333d027ad.css.map
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/proxies.f9db39b6b9f59e944a16.js
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/proxies.f9db39b6b9f59e944a16.js.map
delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/proxies.fe3172e32076eb8749e4.js
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/react~app.85a6af7ab221658559e3.js.map
rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{rules.ebacd344d22f80adb7f8.css => rules.86d27ed35189095cbd2d.css} (99%)
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/rules.86d27ed35189095cbd2d.css.map
rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{rules.fe5dbfb2f26ad4211d1e.js => rules.c6d8e4559779501d90c2.js} (87%)
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/rules.c6d8e4559779501d90c2.js.map
rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{runtime.184b22669d1e3f4e39e2.js => runtime.0ec94503bb844bc8ee38.js} (51%)
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/runtime.0ec94503bb844bc8ee38.js.map
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~chartjs.c749992ca47ba67623b4.js.map
delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~conns.2d8ba1925a9d128867eb.js
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~conns.9d08041ab4f217cf48cb.js
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~conns.9d08041ab4f217cf48cb.js.map
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~conns~proxies~rules.3bbf7c997e35c27e0e09.js
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~conns~proxies~rules.3bbf7c997e35c27e0e09.js.map
delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~conns~proxies~rules.99b1a71b3d76d3035e41.js
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~logs~rules.1b69c8ae2dc5929cac38.js.map
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~proxies.5afec5e5759a23a386fc.js
create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~proxies.5afec5e5759a23a386fc.js.map
delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~proxies.8fcc0e726f340a602edf.js
diff --git a/package/ctcgfw/luci-app-openclash/Makefile b/package/ctcgfw/luci-app-openclash/Makefile
index d30fd11c7a..f6c409d155 100644
--- a/package/ctcgfw/luci-app-openclash/Makefile
+++ b/package/ctcgfw/luci-app-openclash/Makefile
@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-openclash
-PKG_VERSION:=0.39.8
+PKG_VERSION:=0.40.2
PKG_RELEASE:=beta
PKG_MAINTAINER:=vernesong
{detail}
: null}\n\n \n