From 23997a8165fd5f47724dbd962ec33ce4aafb83bd Mon Sep 17 00:00:00 2001 From: actions-user Date: Thu, 13 Jun 2024 02:08:02 +0800 Subject: [PATCH] update 2024-06-13 02:08:02 --- luci-app-ikoolproxy/{luci-app-ikoolproxy => }/Makefile | 0 luci-app-ikoolproxy/README.md | 4 ++-- luci-app-ikoolproxy/change.log | 1 - .../{luci-app-ikoolproxy => }/luasrc/controller/koolproxy.lua | 0 .../luasrc/model/cbi/koolproxy/add_rule.lua | 0 .../luasrc/model/cbi/koolproxy/basic.lua | 0 .../luasrc/model/cbi/koolproxy/black_list.lua | 0 .../luasrc/model/cbi/koolproxy/cert.lua | 0 .../luasrc/model/cbi/koolproxy/control.lua | 0 .../luasrc/model/cbi/koolproxy/custom_rule.lua | 0 .../luasrc/model/cbi/koolproxy/ip_black_list.lua | 0 .../luasrc/model/cbi/koolproxy/ip_white_list.lua | 0 .../luasrc/model/cbi/koolproxy/rss_rule.lua | 0 .../luasrc/model/cbi/koolproxy/tips.lua | 0 .../luasrc/model/cbi/koolproxy/update_log.lua | 0 .../luasrc/model/cbi/koolproxy/white_list.lua | 0 .../luasrc/view/koolproxy/cadvalue.htm | 0 .../luasrc/view/koolproxy/caupload.htm | 0 .../luasrc/view/koolproxy/koolproxy_status.htm | 0 .../{luci-app-ikoolproxy => }/luasrc/view/koolproxy/tips.htm | 0 .../{luci-app-ikoolproxy => }/root/etc/adblocklist/adblock | 0 .../{luci-app-ikoolproxy => }/root/etc/adblocklist/adblockip | 0 .../{luci-app-ikoolproxy => }/root/etc/adblocklist/adbypass | 0 .../{luci-app-ikoolproxy => }/root/etc/adblocklist/adbypassip | 0 .../{luci-app-ikoolproxy => }/root/etc/config/koolproxy | 0 .../{luci-app-ikoolproxy => }/root/etc/init.d/koolproxy | 1 + .../root/etc/uci-defaults/luci-koolproxy | 0 .../root/lib/upgrade/keep.d/koolproxy | 0 .../{luci-app-ikoolproxy => }/root/usr/sbin/adblockplus | 0 .../root/usr/share/koolproxy/adblock.conf | 0 .../root/usr/share/koolproxy/camanagement | 0 .../root/usr/share/koolproxy/data/gen_ca.sh | 0 .../root/usr/share/koolproxy/data/openssl.cnf | 0 .../root/usr/share/koolproxy/data/rules/user.txt | 0 .../root/usr/share/koolproxy/data/source.list | 0 .../root/usr/share/koolproxy/data/user.txt | 0 .../root/usr/share/koolproxy/dnsmasq.adblock | 0 .../root/usr/share/koolproxy/koolproxy_ipset.conf | 0 .../root/usr/share/koolproxy/kpupdate | 0 .../root/usr/share/rpcd/acl.d/luci-app-ikoolproxy.json | 0 smartdns/Makefile | 4 ++-- 41 files changed, 5 insertions(+), 5 deletions(-) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/Makefile (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/luasrc/controller/koolproxy.lua (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/luasrc/model/cbi/koolproxy/add_rule.lua (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/luasrc/model/cbi/koolproxy/basic.lua (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/luasrc/model/cbi/koolproxy/black_list.lua (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/luasrc/model/cbi/koolproxy/cert.lua (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/luasrc/model/cbi/koolproxy/control.lua (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/luasrc/model/cbi/koolproxy/custom_rule.lua (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/luasrc/model/cbi/koolproxy/ip_black_list.lua (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/luasrc/model/cbi/koolproxy/ip_white_list.lua (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/luasrc/model/cbi/koolproxy/rss_rule.lua (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/luasrc/model/cbi/koolproxy/tips.lua (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/luasrc/model/cbi/koolproxy/update_log.lua (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/luasrc/model/cbi/koolproxy/white_list.lua (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/luasrc/view/koolproxy/cadvalue.htm (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/luasrc/view/koolproxy/caupload.htm (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/luasrc/view/koolproxy/koolproxy_status.htm (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/luasrc/view/koolproxy/tips.htm (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/etc/adblocklist/adblock (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/etc/adblocklist/adblockip (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/etc/adblocklist/adbypass (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/etc/adblocklist/adbypassip (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/etc/config/koolproxy (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/etc/init.d/koolproxy (99%) mode change 100644 => 100755 rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/etc/uci-defaults/luci-koolproxy (100%) mode change 100644 => 100755 rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/lib/upgrade/keep.d/koolproxy (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/usr/sbin/adblockplus (100%) mode change 100644 => 100755 rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/usr/share/koolproxy/adblock.conf (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/usr/share/koolproxy/camanagement (100%) mode change 100644 => 100755 rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/usr/share/koolproxy/data/gen_ca.sh (100%) mode change 100644 => 100755 rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/usr/share/koolproxy/data/openssl.cnf (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/usr/share/koolproxy/data/rules/user.txt (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/usr/share/koolproxy/data/source.list (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/usr/share/koolproxy/data/user.txt (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/usr/share/koolproxy/dnsmasq.adblock (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/usr/share/koolproxy/koolproxy_ipset.conf (100%) rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/usr/share/koolproxy/kpupdate (100%) mode change 100644 => 100755 rename luci-app-ikoolproxy/{luci-app-ikoolproxy => }/root/usr/share/rpcd/acl.d/luci-app-ikoolproxy.json (100%) diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/Makefile b/luci-app-ikoolproxy/Makefile similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/Makefile rename to luci-app-ikoolproxy/Makefile diff --git a/luci-app-ikoolproxy/README.md b/luci-app-ikoolproxy/README.md index a882cd9e..d5070022 100644 --- a/luci-app-ikoolproxy/README.md +++ b/luci-app-ikoolproxy/README.md @@ -1,5 +1,5 @@ ## How to build -git clone -b main --single-branch https://github.com/ilxp/luci-app-ikoolproxy.git package/diy/ikoolproxy +git clone -b main https://github.com/ilxp/luci-app-ikoolproxy.git package/diy/luci-app-ikoolproxy ## 无法下载证书声明（2024.06.10版本已经解决此问题，感谢[Black-Steel](https://github.com/Black-Steel)）： 目前因为openwrt的openssl升级为3.0了。导致ikoolproxy无法下载证书。lean大佬的lede可以回退。openwrt则不行。 @@ -74,7 +74,7 @@ CONFIG_PACKAGE_lua-openssl=y 此文件为 UCI 配置文件, 配置方式可参考 Wiki -> Use-UCI-system 和 OpenWrt Wiki ## 6、编译 -git clone https://github.com/1wrt/luci-app-ikoolproxy.git package/luci-app-ikoolproxy +git clone -b main https://github.com/ilxp/luci-app-ikoolproxy.git package/diy/luci-app-ikoolproxy make && sudo make install diff --git a/luci-app-ikoolproxy/change.log b/luci-app-ikoolproxy/change.log index 9e182de6..065c2c39 100644 --- a/luci-app-ikoolproxy/change.log +++ b/luci-app-ikoolproxy/change.log @@ -1,7 +1,6 @@ ## 更新：2024年6月10日： 1、修复openssl3.0无法下载证书问题，感谢[Black-Steel](https://github.com/Black-Steel) 2、修复init.d目录下的脚本有stop实现，但是没定义停止编号。会导致一些异常。感谢[lnc1995](https://github.com/lnc1995) -3、重新移动目录，方便编译ipk。 ## 更新：2024年1月24日： 1、支持5.10以及以上内核。但是因为openssl升级可能会导致证书无法下载。目前lean的openssl可以回退到老的版本即可。 diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/controller/koolproxy.lua b/luci-app-ikoolproxy/luasrc/controller/koolproxy.lua similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/controller/koolproxy.lua rename to luci-app-ikoolproxy/luasrc/controller/koolproxy.lua diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/add_rule.lua b/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/add_rule.lua similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/add_rule.lua rename to luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/add_rule.lua diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/basic.lua b/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/basic.lua similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/basic.lua rename to luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/basic.lua diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/black_list.lua b/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/black_list.lua similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/black_list.lua rename to luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/black_list.lua diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/cert.lua b/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/cert.lua similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/cert.lua rename to luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/cert.lua diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/control.lua b/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/control.lua similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/control.lua rename to luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/control.lua diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/custom_rule.lua b/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/custom_rule.lua similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/custom_rule.lua rename to luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/custom_rule.lua diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/ip_black_list.lua b/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/ip_black_list.lua similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/ip_black_list.lua rename to luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/ip_black_list.lua diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/ip_white_list.lua b/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/ip_white_list.lua similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/ip_white_list.lua rename to luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/ip_white_list.lua diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/rss_rule.lua b/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/rss_rule.lua similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/rss_rule.lua rename to luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/rss_rule.lua diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/tips.lua b/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/tips.lua similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/tips.lua rename to luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/tips.lua diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/update_log.lua b/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/update_log.lua similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/update_log.lua rename to luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/update_log.lua diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/white_list.lua b/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/white_list.lua similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/white_list.lua rename to luci-app-ikoolproxy/luasrc/model/cbi/koolproxy/white_list.lua diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/view/koolproxy/cadvalue.htm b/luci-app-ikoolproxy/luasrc/view/koolproxy/cadvalue.htm similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/view/koolproxy/cadvalue.htm rename to luci-app-ikoolproxy/luasrc/view/koolproxy/cadvalue.htm diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/view/koolproxy/caupload.htm b/luci-app-ikoolproxy/luasrc/view/koolproxy/caupload.htm similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/view/koolproxy/caupload.htm rename to luci-app-ikoolproxy/luasrc/view/koolproxy/caupload.htm diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/view/koolproxy/koolproxy_status.htm b/luci-app-ikoolproxy/luasrc/view/koolproxy/koolproxy_status.htm similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/view/koolproxy/koolproxy_status.htm rename to luci-app-ikoolproxy/luasrc/view/koolproxy/koolproxy_status.htm diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/view/koolproxy/tips.htm b/luci-app-ikoolproxy/luasrc/view/koolproxy/tips.htm similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/luasrc/view/koolproxy/tips.htm rename to luci-app-ikoolproxy/luasrc/view/koolproxy/tips.htm diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/etc/adblocklist/adblock b/luci-app-ikoolproxy/root/etc/adblocklist/adblock similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/etc/adblocklist/adblock rename to luci-app-ikoolproxy/root/etc/adblocklist/adblock diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/etc/adblocklist/adblockip b/luci-app-ikoolproxy/root/etc/adblocklist/adblockip similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/etc/adblocklist/adblockip rename to luci-app-ikoolproxy/root/etc/adblocklist/adblockip diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/etc/adblocklist/adbypass b/luci-app-ikoolproxy/root/etc/adblocklist/adbypass similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/etc/adblocklist/adbypass rename to luci-app-ikoolproxy/root/etc/adblocklist/adbypass diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/etc/adblocklist/adbypassip b/luci-app-ikoolproxy/root/etc/adblocklist/adbypassip similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/etc/adblocklist/adbypassip rename to luci-app-ikoolproxy/root/etc/adblocklist/adbypassip diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/etc/config/koolproxy b/luci-app-ikoolproxy/root/etc/config/koolproxy similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/etc/config/koolproxy rename to luci-app-ikoolproxy/root/etc/config/koolproxy diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/etc/init.d/koolproxy b/luci-app-ikoolproxy/root/etc/init.d/koolproxy old mode 100644 new mode 100755 similarity index 99% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/etc/init.d/koolproxy rename to luci-app-ikoolproxy/root/etc/init.d/koolproxy index fe2635b7..6e615f6c --- a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/etc/init.d/koolproxy +++ b/luci-app-ikoolproxy/root/etc/init.d/koolproxy @@ -8,6 +8,7 @@ # START=99 +STOP=99 USE_PROCD=1 CONFIG=koolproxy diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/etc/uci-defaults/luci-koolproxy b/luci-app-ikoolproxy/root/etc/uci-defaults/luci-koolproxy old mode 100644 new mode 100755 similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/etc/uci-defaults/luci-koolproxy rename to luci-app-ikoolproxy/root/etc/uci-defaults/luci-koolproxy diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/lib/upgrade/keep.d/koolproxy b/luci-app-ikoolproxy/root/lib/upgrade/keep.d/koolproxy similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/lib/upgrade/keep.d/koolproxy rename to luci-app-ikoolproxy/root/lib/upgrade/keep.d/koolproxy diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/sbin/adblockplus b/luci-app-ikoolproxy/root/usr/sbin/adblockplus old mode 100644 new mode 100755 similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/sbin/adblockplus rename to luci-app-ikoolproxy/root/usr/sbin/adblockplus diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/adblock.conf b/luci-app-ikoolproxy/root/usr/share/koolproxy/adblock.conf similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/adblock.conf rename to luci-app-ikoolproxy/root/usr/share/koolproxy/adblock.conf diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/camanagement b/luci-app-ikoolproxy/root/usr/share/koolproxy/camanagement old mode 100644 new mode 100755 similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/camanagement rename to luci-app-ikoolproxy/root/usr/share/koolproxy/camanagement diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/data/gen_ca.sh b/luci-app-ikoolproxy/root/usr/share/koolproxy/data/gen_ca.sh old mode 100644 new mode 100755 similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/data/gen_ca.sh rename to luci-app-ikoolproxy/root/usr/share/koolproxy/data/gen_ca.sh diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/data/openssl.cnf b/luci-app-ikoolproxy/root/usr/share/koolproxy/data/openssl.cnf similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/data/openssl.cnf rename to luci-app-ikoolproxy/root/usr/share/koolproxy/data/openssl.cnf diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/data/rules/user.txt b/luci-app-ikoolproxy/root/usr/share/koolproxy/data/rules/user.txt similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/data/rules/user.txt rename to luci-app-ikoolproxy/root/usr/share/koolproxy/data/rules/user.txt diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/data/source.list b/luci-app-ikoolproxy/root/usr/share/koolproxy/data/source.list similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/data/source.list rename to luci-app-ikoolproxy/root/usr/share/koolproxy/data/source.list diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/data/user.txt b/luci-app-ikoolproxy/root/usr/share/koolproxy/data/user.txt similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/data/user.txt rename to luci-app-ikoolproxy/root/usr/share/koolproxy/data/user.txt diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/dnsmasq.adblock b/luci-app-ikoolproxy/root/usr/share/koolproxy/dnsmasq.adblock similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/dnsmasq.adblock rename to luci-app-ikoolproxy/root/usr/share/koolproxy/dnsmasq.adblock diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/koolproxy_ipset.conf b/luci-app-ikoolproxy/root/usr/share/koolproxy/koolproxy_ipset.conf similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/koolproxy_ipset.conf rename to luci-app-ikoolproxy/root/usr/share/koolproxy/koolproxy_ipset.conf diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/kpupdate b/luci-app-ikoolproxy/root/usr/share/koolproxy/kpupdate old mode 100644 new mode 100755 similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/koolproxy/kpupdate rename to luci-app-ikoolproxy/root/usr/share/koolproxy/kpupdate diff --git a/luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/rpcd/acl.d/luci-app-ikoolproxy.json b/luci-app-ikoolproxy/root/usr/share/rpcd/acl.d/luci-app-ikoolproxy.json similarity index 100% rename from luci-app-ikoolproxy/luci-app-ikoolproxy/root/usr/share/rpcd/acl.d/luci-app-ikoolproxy.json rename to luci-app-ikoolproxy/root/usr/share/rpcd/acl.d/luci-app-ikoolproxy.json diff --git a/smartdns/Makefile b/smartdns/Makefile index 90395bb9..5f3e09de 100644 --- a/smartdns/Makefile +++ b/smartdns/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=smartdns -PKG_VERSION:=45 +PKG_VERSION:=46 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/pymumu/smartdns/tar.gz/Release$(PKG_VERSION)? -PKG_HASH:=b17d82738f3ae73f5a60ad25c824e1000c05a6d060d08ebd1ec295a2caa5b495 +PKG_MIRROR_HASH:=6594d21c0e354b67d4b5918e11eff21e6314e247b9e6e28be1ece4168c368fc1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-Release$(PKG_VERSION) PKG_MAINTAINER:=Nick Peng