From ad1657d2c7fee57163570268595e871c805b8107 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 23 Aug 2020 03:20:20 +0800 Subject: [PATCH] luci-app-passwall: bump to 3.9-42 --- package/lienol/luci-app-passwall/Makefile | 4 +- .../luasrc/model/cbi/passwall/api/brook.lua | 1 - .../luasrc/model/cbi/passwall/client/rule.lua | 6 + .../view/passwall/rule/rule_version.htm | 14 + .../luci-app-passwall/po/zh-cn/passwall.po | 6 + .../root/etc/config/passwall | 3 + .../root/usr/share/passwall/app.sh | 1 + .../root/usr/share/passwall/iptables.sh | 9 + .../root/usr/share/passwall/rule_update.lua | 38 +- .../root/usr/share/passwall/rules/chnroute6 | 1884 +++++++++++++++++ 10 files changed, 1961 insertions(+), 5 deletions(-) create mode 100644 package/lienol/luci-app-passwall/root/usr/share/passwall/rules/chnroute6 diff --git a/package/lienol/luci-app-passwall/Makefile b/package/lienol/luci-app-passwall/Makefile index 77d2b0e823..a75c6b4c2f 100644 --- a/package/lienol/luci-app-passwall/Makefile +++ b/package/lienol/luci-app-passwall/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=3.9 -PKG_RELEASE:=41 -PKG_DATE:=20200820 +PKG_RELEASE:=42 +PKG_DATE:=20200822 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/brook.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/brook.lua index 05f716470b..3051858f9c 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/brook.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/brook.lua @@ -21,7 +21,6 @@ function to_check(arch) end file_tree = "_linux_" .. file_tree - if file_tree == "_linux_amd64" then file_tree = "" end local json = api.get_api_json(brook_api) diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua index 48c20cd890..d5fd1aa290 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua @@ -33,6 +33,12 @@ o:value("https://ispip.clang.cn/all_cn_cidr.txt", translate("Clang.CN.CIDR")) o.default = "https://ispip.clang.cn/all_cn.txt" --o:depends("enable_custom_url", 1) +----chnroute6 URL +o = s:option(Value, "chnroute6_url", translate("China IPv6s(chnroute6) Update URL")) +o:value("https://ispip.clang.cn/all_cn_ipv6.txt", translate("Clang.CN.IPv6")) +o.default = "https://ispip.clang.cn/all_cn_ipv6.txt" +--o:depends("enable_custom_url", 1) + ---- Auto Update o = s:option(Flag, "auto_update", translate("Enable auto update rules")) o.default = 0 diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm index eed99be396..ef59177e2a 100644 --- a/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm +++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm @@ -3,10 +3,12 @@ local api = require "luci.model.cbi.passwall.api.api" local gfwlist_version = api.uci_get_type("global_rules", "gfwlist_version") local chnroute_version = api.uci_get_type("global_rules", "chnroute_version") +local chnroute6_version = api.uci_get_type("global_rules", "chnroute6_version") local chnlist_version = api.uci_get_type("global_rules", "chnlist_version") local gfwlist_update = api.uci_get_type("global_rules", "gfwlist_update", "1") == "1" and "checked='checked'" or "" local chnroute_update = api.uci_get_type("global_rules", "chnroute_update", "1") == "1" and "checked='checked'" or "" +local chnroute6_update = api.uci_get_type("global_rules", "chnroute6_update", "1") == "1" and "checked='checked'" or "" local chnlist_update = api.uci_get_type("global_rules", "chnlist_update", "1") == "1" and "checked='checked'" or "" -%> @@ -66,6 +68,18 @@ local chnlist_update = api.uci_get_type("global_rules", "chnlist_update", "1") = + +
+ +
+
+ 【 <%=chnroute6_version%> 】 + /> +
+
+