From 2ee2d92de64c45640236e0aac7b4872855ad96ca Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Tue, 31 Mar 2020 20:09:17 +0800 Subject: [PATCH] luci-app-koolproxyR: sync with upstram source --- package/ctcgfw/luci-app-koolproxyR/Makefile | 2 +- .../ctcgfw/luci-app-koolproxyR/files/etc/config/koolproxy | 5 +---- .../files/usr/lib/lua/luci/model/cbi/koolproxy/global.lua | 3 --- .../luci-app-koolproxyR/files/usr/share/koolproxy/kpupdate | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/package/ctcgfw/luci-app-koolproxyR/Makefile b/package/ctcgfw/luci-app-koolproxyR/Makefile index d73a5ae723..49d16b5beb 100644 --- a/package/ctcgfw/luci-app-koolproxyR/Makefile +++ b/package/ctcgfw/luci-app-koolproxyR/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-koolproxyR PKG_VERSION:=3.8.4 -PKG_RELEASE:=5-20200330 +PKG_RELEASE:=5-20200331 PKG_MAINTAINER:=panda-mute PKG_LICENSE:=GPLv3 diff --git a/package/ctcgfw/luci-app-koolproxyR/files/etc/config/koolproxy b/package/ctcgfw/luci-app-koolproxyR/files/etc/config/koolproxy index f69a85a3b3..3bd60a52a9 100644 --- a/package/ctcgfw/luci-app-koolproxyR/files/etc/config/koolproxy +++ b/package/ctcgfw/luci-app-koolproxyR/files/etc/config/koolproxy @@ -9,9 +9,6 @@ config global option koolproxy_rules 'easylistchina.txt fanboy.txt yhosts.txt koolproxy.txt daily.txt kp.dat user.txt' option koolproxy_acl_default '3' -config rss_rules - option load '0' - option name '1' - option url '1' + diff --git a/package/ctcgfw/luci-app-koolproxyR/files/usr/lib/lua/luci/model/cbi/koolproxy/global.lua b/package/ctcgfw/luci-app-koolproxyR/files/usr/lib/lua/luci/model/cbi/koolproxy/global.lua index e20d1685d8..e1431f1964 100644 --- a/package/ctcgfw/luci-app-koolproxyR/files/usr/lib/lua/luci/model/cbi/koolproxy/global.lua +++ b/package/ctcgfw/luci-app-koolproxyR/files/usr/lib/lua/luci/model/cbi/koolproxy/global.lua @@ -391,7 +391,4 @@ function(o,a,i) end ) -t=o:section(TypedSection,"rss_rules",translate("技术支持"),translate("本软件由KPR提供技术支持")) -t.anonymous = true -t:append(Template("koolproxy/feedback")) return o diff --git a/package/ctcgfw/luci-app-koolproxyR/files/usr/share/koolproxy/kpupdate b/package/ctcgfw/luci-app-koolproxyR/files/usr/share/koolproxy/kpupdate index 7fc85d0e34..b21e44c98b 100755 --- a/package/ctcgfw/luci-app-koolproxyR/files/usr/share/koolproxy/kpupdate +++ b/package/ctcgfw/luci-app-koolproxyR/files/usr/share/koolproxy/kpupdate @@ -111,7 +111,7 @@ update_rss_rules() { update_rules() { echo $(date "+%F %T"): ------------------- 内置规则更新 ------------------- >>$LOGFILE - wget 'https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/master/kp.dat' -q -O $KP_DIR/data/rules/kp.dat + wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR_rule_list/master/kp.dat' -q -O $KP_DIR/data/rules/kp.dat wget 'https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/master/daily.txt' -q -O $KP_DIR/data/rules/daily.txt wget 'https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/master/koolproxy.txt' -q -O $KP_DIR/data/rules/koolproxy.txt wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR/master/koolproxyR/koolproxyR/data/rules/yhosts.txt' -q -O $KP_DIR/data/rules/yhosts.txt