From e3de5402aed48ff09313e03039003c16c5cf9e3b Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 18 Jul 2020 22:04:13 +0800 Subject: [PATCH] OpenClash: bump to v0.39.4-beta --- package/ctcgfw/luci-app-openclash/Makefile | 2 +- .../files/etc/init.d/openclash | 30 ++++++++++--------- .../files/etc/openclash/openclash_version | 4 +-- .../files/etc/openclash/rule_providers.list | 11 ------- .../usr/share/openclash/openclash_version.sh | 2 +- .../usr/share/openclash/yml_rules_change.sh | 5 ---- package/lean/luci-app-turboacc/Makefile | 8 ++--- .../luasrc/model/cbi/turboacc.lua | 4 +-- .../luci-app-turboacc/po/zh-cn/turboacc.po | 10 +++---- 9 files changed, 31 insertions(+), 45 deletions(-) diff --git a/package/ctcgfw/luci-app-openclash/Makefile b/package/ctcgfw/luci-app-openclash/Makefile index 5206c25f62..f134389612 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.3 +PKG_VERSION:=0.39.4 PKG_RELEASE:=beta PKG_MAINTAINER:=vernesong diff --git a/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash b/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash index 8e08a647c2..344a6255d3 100755 --- a/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash +++ b/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash @@ -70,24 +70,26 @@ revert_dns() { [ "$1" -eq "0" ] && { if [ "$(uci get openclash.config.dns_revert 2>/dev/null)" != "1" ]; then uci del_list dhcp.@dnsmasq[0].server=127.0.0.1#"$3" >/dev/null 2>&1 - if [ -s "/tmp/resolv.conf.d/resolv.conf.auto" ]; then - uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto >/dev/null 2>&1 - elif [ -s "/tmp/resolv.conf.auto" ]; then - uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto >/dev/null 2>&1 - fi - uci set dhcp.@dnsmasq[0].noresolv=0 >/dev/null 2>&1 uci set openclash.config.dns_revert=1 2>/dev/null fi } + [ "$1" -eq "1" ] && { uci del_list dhcp.@dnsmasq[0].server=127.0.0.1#"$3" >/dev/null 2>&1 uci set openclash.config.dns_revert=0 2>/dev/null } - [ "$(uci get dhcp.@dnsmasq[0].cachesize 2>/dev/null)" -eq "0" ] && { + [ "$(uci get dhcp.@dnsmasq[0].cachesize 2>/dev/null)" = "0" ] && { uci delete dhcp.@dnsmasq[0].cachesize >/dev/null 2>&1 - } 2>/dev/null + } + if [ -s "/tmp/resolv.conf.d/resolv.conf.auto" ]; then + uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto >/dev/null 2>&1 + elif [ -s "/tmp/resolv.conf.auto" ]; then + uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto >/dev/null 2>&1 + fi + uci set dhcp.@dnsmasq[0].noresolv=0 >/dev/null 2>&1 + uci commit dhcp uci commit openclash rm -rf /tmp/dnsmasq.d/dnsmasq_openclash.conf >/dev/null 2>&1 @@ -1227,24 +1229,24 @@ revert_firewall() out_lines=$(iptables -nvL OUTPUT -t nat |sed 1,2d |sed -n '/openclash/=' 2>/dev/null |sort -rn) for out_line in $out_lines; do iptables -t nat -D OUTPUT "$out_line" >/dev/null 2>&1 - done + done >/dev/null 2>&1 iptables -t nat -D OUTPUT -p tcp -j openclash_output >/dev/null 2>&1 pre_lines=$(iptables -nvL PREROUTING -t nat |sed 1,2d |sed -n '/8\.8\./=' 2>/dev/null |sort -rn) for pre_line in $pre_lines; do iptables -t nat -D PREROUTING "$pre_line" >/dev/null 2>&1 - done + done >/dev/null 2>&1 pre_lines=$(iptables -nvL PREROUTING -t mangle |sed 1,2d |sed -n '/openclash/=' 2>/dev/null |sort -rn) for pre_line in $pre_lines; do iptables -t mangle -D PREROUTING "$pre_line" >/dev/null 2>&1 - done + done >/dev/null 2>&1 iptables -t mangle -D PREROUTING -p udp -j openclash >/dev/null 2>&1 pre_lines=$(iptables -nvL PREROUTING -t nat |sed 1,2d |sed -n '/openclash/=' 2>/dev/null |sort -rn) for pre_line in $pre_lines; do iptables -t nat -D PREROUTING "$pre_line" >/dev/null 2>&1 - done + done >/dev/null 2>&1 iptables -t nat -D PREROUTING -p tcp -j openclash >/dev/null 2>&1 #ipv6 @@ -1270,7 +1272,7 @@ revert_firewall() ip tuntap del clash0 mode tun >/dev/null 2>&1 iptables -t mangle -D OUTPUT -j openclash_output >/dev/null 2>&1 - iptables -t mangle -D PREROUTING -j openclash + iptables -t mangle -D PREROUTING -j openclash >/dev/null 2>&1 iptables -t mangle -F openclash >/dev/null 2>&1 iptables -t mangle -X openclash >/dev/null 2>&1 iptables -t mangle -F openclash_output >/dev/null 2>&1 @@ -1517,7 +1519,7 @@ stop() if [ "$enable" -eq 0 ]; then kill_clash fi - + echo "第五步: 重启 Dnsmasq 程序..." >$START_LOG dns_port=$(uci get openclash.config.dns_port 2>/dev/null) redirect_dns=$(uci get openclash.config.redirect_dns 2>/dev/null) diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version b/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version index ea79ace438..a95046e87a 100644 --- a/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version +++ b/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version @@ -1,2 +1,2 @@ -v0.39.3-beta -data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXMAAAAqCAMAAAB2kksrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjc2NjhFNjBBQzFERTExRUE5ODFDRUFEQTU3Rjg2M0NFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjc2NjhFNjBCQzFERTExRUE5ODFDRUFEQTU3Rjg2M0NFIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NzY2OEU2MDhDMURFMTFFQTk4MUNFQURBNTdGODYzQ0UiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NzY2OEU2MDlDMURFMTFFQTk4MUNFQURBNTdGODYzQ0UiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4d9ffWAAADAFBMVEVISEiCqcAGcKxFmsrR0dFJns7B1eBtbW09PT2Gv9+EvN2EhIS6uroHXpEkhLsGVYKStcmTu9OUxeFYpdIJeLiCgoJlnr6enp7a2tokapKlpaV4eHgJdbTf399jlLHR5vLn5+c/Pz/GxsYIXIyhoaHOzs45lclpaWkIca0FbamRkZEEXI5mrdWizOVxcXG/v79FRUWsrKw0dJp2ttq1tbUKaqEwk8vR4uwFYJWy1urKysoEU4BiYmJGirFFgKIXYo02kcVkq9NLS0tDQ0Pg4ODC2eaLi4sIZJkGdLKDs86iwNEEWIh2dnbAwMCcnJzCwsJBQUFFkbyx0ePw9fcXgL0neKZXlbkFaaJCQkImcJuDrcW2trajx9yXl5dHnMwHbKVlZWUnicGNjY2yytgJaJ4FcrAJWIVzobuxzdwJbqgHZ51yn7ikzuavr6+hv9B0p8RgYGCiyd8rjsc1hrQZdaqUlJQJYZMGZJpGg6YEYph0dHQdh8NVjKtSiagJcKuJweJ0sdUahMFDfqEHV4cRgsMCc7QBcrNRUVFUVFRVVVVSUlILfL1WVlYFdrcKe7wHeLkOgMAEdrYDdLUOf8ADdbUEdbYDdLQSg8MSg8RXV1cShMQThMUAcrIGd7gOf78Nfr8Nfr4Mfb4Mfb0IebkJe7sJersJero6OjqqqqrU1NTV1dWrq6upqak7OzuAgIB+fn7w9/sHVoTC3u6BgYHq6upMTEzh7/f19fXz8/P09PSDvNzA1N9/f3/v9Pfg6u+Fvt7g6vDB3e3B3e50s9iJiYno6OgLerkUXomErMIFZZsFZ5+EtNCEvd3W1tbB3u4Fa6bC3+/g7vbD3+8LdK8FZ6Dg7/dGm8tVos+CutsEV4cZg8Dv9vqDr8gGdbTR3+gKeLcIWYjg7vcEVYMVaJdjpsxor9czeqNkmbc2g66ErcXP5PEmbZWyz+DB2+ujxdhTU1MPgMEQgcJZWVlaWlpfX19bW1tcXFxNTU1eXl5PT09QUFBYWFhdXV1OTk7///////90FWljAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADEJJREFUeNrsVwlUFOcdH0BgdUUQoousAiuCCKiLolEXrwUBNVaMJsRYr6diPHNqvBNjWxEI9m5pa9IEdLkMC3JKQLwhkmhiTnObtmlrm02tLYjhR//fN7O7MwsYXpPne7vP33vM9z9//5nfNzszCJ2d1ZtG3nAF/N4JMPEZc2en0Jm444Zr4HdOgYkhnUL1mDYXwW+dAxPNwiZXkbztN06CZ4Qx37gKfuQkmCh8c1fzOw0X0vxfzgLhvy6Du5rfeXztLBD+4zK4q/mdx0+dBcK/XQa/cBZ0q7k6NjY2yvv7V2WFWr3C5nir1b3p0aq1vWR/oSd8HTH+mfERXcI7A/r27etpc5/4s9yzwZOKAnY6Rvui7wv/N4TrjohfUg2OxKXx178j1LFqhV+NpTZ7Hqb0huJ1vN7LYS/2gJ1v8ct5a6ci+oQYRVWA6PuLnqeyd6NYZO7rwEma9zTuRc++ni/eFl0011YAgcUaTTiNUn9XzWMRK3ezxyLRtrVA1Per+R97wCXcO3jq4HtxSRH1BD5papqzEPBk7kYsfHTqg7Mkzwag0a/JrxE4oeQ84RjoZY5DuKVEfCJqvFUMRk3NoFvfEaS5wh8DeEvmUtRk9oZCr9L3cthL3SMGjdPT09OnL0SMPOw551o6CzdiIy9ayIrS56BK0ey1jUXTVzmEXyJdX+oJt8txCF1UqolXJQhGo16lyh7ZW221gxTbM2iQd/eaC6EYIZlFWNIhFWu7Z4x30NxbOSTeWmHFy91jMtb6rLu8zqcJk+Xhy+npWydMSP6sCZfIuwS/z5Zf3rOVdiZAXpWeHrZ6wuqwbYCSlHR9+eUnPCNkIU+rx3O2oKJGhKPm1dDo9nMr28iMIhzj3jEUSceliUDxrWIUxxfTY4hli9kLoLqY1wHx3C2K544IG/t+DSokAemOzyXh5rF8RdItBfmtERU8zCiLIRIn8dC8eKnSmzcukZ96loQAVElWFQKysszYdo7sc9tgzpLhcvKnbDk3EI/TArEoK9kL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 \ No newline at end of file +v0.39.4-beta +data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXMAAAAqCAMAAAB2kksrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJGMzk0NDY3Qzc3RDExRUE4OEE0Q0UzQTlCQzg5OURDIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJGMzk0NDY4Qzc3RDExRUE4OEE0Q0UzQTlCQzg5OURDIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkYzOTQ0NjVDNzdEMTFFQTg4QTRDRTNBOUJDODk5REMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkYzOTQ0NjZDNzdEMTFFQTg4QTRDRTNBOUJDODk5REMiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5EzkHVAAADAFBMVEVISEiTvNMHZ53R0dEGVYJJns9sbGwGcKw9PT1TiqqFhYW6urokhLsahMFknr5FmsqUxeGGv986lsphlLEGX5KCgoKenp5YpdLa2tqlpaV4eHgKbKLf39/n5+c/Pz/GxsahoaHOzs4kaZFpaWnR5vI0dJp2ttqRkZFmrdWizOVwcHAJdbS/v79FRUWsrKy1tbUFbakwk8vR4uxklrKStcjKysoJca5iYmLw9fdkq9MIZJkEU4CiwNFLS0tDQ0Pg4ODB2eeLi4sEYJWDs85GirGDrcVFkbx2dnYXYo2y1uoGdLLAwMCcnJwEWorDw8NBQUGx0OIXgL0neKZCQkJFgKImcJu2trajxdgrjseXl5fB1eBHnM0HXI0FaaJlZWUnicGNjY2yytgFZZtzobsEXI6xzdwFcrA2kcYHbKWkzuavr69hYWGiyN4Zdapyn7iUlJSDqsEJWIUIYZQEYph0dHQJcKuJweJ0sdU1hbJDfqEHWIcRgsMCc7QBcrNRUVFUVFRVVVVSUlIFdrcLfL1WVlYHeLkKe7wDdbUDdLQEdrYOgMAEdbYOf8ADdLUSg8NXV1cSg8QShMQAcrIThMUGd7gOf78Nfr8Nfr4Mfb4Mfb0Je7sJersIebkIeboJero6OjqqqqrU1NTV1dWrq6upqak7OzvC3u6AgIB+fn7w9/sHVoSBgYHq6upMTEzz8/P19fWEvN3h7/eEvd309PTB3u6Fvt5/f3+DvNzA1N/B3e3v9PeCqcDg6u/B3e6JiYno6Oh0s9gLernC3+8UXonW1taDq8KFvd7g6vChv9CEtNAJeLiErMLg7vYFa6aDu9zD3+/R3+gFZ58JaaALdK9Gm8vg7/cEWIjB1+MJWogLb6gIV4QGdbRGhKcKebjv9vpVos+Dr8gVaJcEVYOFvd11qMUHXo8mbZWAudnC2OSErcVkmbdor9fB2+vP5PEzeqNTU1MPgMEQgcJZWVlaWlpfX19bW1tcXFxNTU1eXl5PT09QUFBYWFhdXV1OTk7///////9pX66UAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADEJJREFUeNrsVwlUVNcZfirLiKKAMsBERlEQRAcwQVHGgaDGKLagiRpF0YrENXE3i22DhKVbWrqYtEXNsEkYZJHFiOBujHviFrMnxhTTpsuk1gbE8NH/3vdm5r1BDKfJ8ZyZ43cO7/7r99/33Zn3BqGjo3rlsJvOgD84AEY/Y+roEDriN950DvzOITA6uEOoDm91EvzWMTDaJKx0Fslbf+MgeEYI/8ZZ8GMHwWjhm/ua32s4keb/dhQIXzsN7mt+7/GVo0D4r9Pgvub3Hr90FAj/cRq85Ci4o+a+ERERPwr//lVZ6Ou70OqE+/p2p0fjq+km+8tdwme493Af++BXnn7e3t6uVn/u3+West91rl3EG94v/98QbtgjZk41OOLnxdz4jvCN8FX41ZhntadjTHco3sAb3Rz2ShfwfJvfztueL8mjc8UoavxE30v0XO9A4Ad424W8O0VscPV2feWu6KS5pgLwL1arg2gHvt9V8whEyN3sUYi3Hi0Q+v1q/scucBQP9pvc70EcVURdgfNnzkwYB7gydwXG/WXygL9KngI+JmCPXWxPp0j3chzCbSVi4lHlplURDOoq39vfEaS5wg8H3CRzHqoyu0OhU+m6OexPd0YYTkxdt27d1HEIk4ddJ1xfx8InsIIXjaOizZsnoMa+f64J47DHLrinU6R7OQ6hk0pVMao4wWDQqVTZw7qrrcZXcTy+vm531lwIxBDJLMKcdqlYc2fGGDvN3ZRDYiwVFvz5zpiGJc3vX3q/+QymycOX1q1rfuCB2PfO4Ch5RxH93gOXNq2nk/FTtnsG46EU7LEj3cMic119ZCFXi7dHVu3qqqgRYa95NdTaF7iVbWBGEXZxbxeKpOu8eKD4djGKY4rpMcSyxewFUF3M64AY7hbFcEeElf0FNSokAYHwbBJuOstXJNxWkN8eUsHDjLIYInECD02PkSrdeOMc+dazJPihRrJq4JeVZcJHR8g+8hFMWTJcij3NliM98BQtEIuyYkneLAVKMeGDd+2D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 \ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/rule_providers.list b/package/ctcgfw/luci-app-openclash/files/etc/openclash/rule_providers.list index 56ba77c028..4faf1334b3 100644 --- a/package/ctcgfw/luci-app-openclash/files/etc/openclash/rule_providers.list +++ b/package/ctcgfw/luci-app-openclash/files/etc/openclash/rule_providers.list @@ -1,23 +1,12 @@ 反劫持规则,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Guard/,Hijacking.yaml -国内IP合集,rixCloud-Inc,ipcidr,rixCloud-Inc/Clash-Ruleset/master/,Domestic_IP.rule,Domestic_IP.yaml 国内IP白名单,ConnersHua,ipcidr,DivineEngine/Profiles/master/Clash/RuleSet/Extra/,ChinaIP.yaml -国内常用域名,rixCloud-Inc,domain,rixCloud-Inc/Clash-Ruleset/master/,Domestic_Domain.rule,Domestic_Domain.yaml 国内域名白名单,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/,China.yaml 国内流媒体合集,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/,StreamingCN.yaml 国内流媒体国际版合集,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/,StreamingSE.yaml -国外IP代理合集,rixCloud-Inc,ipcidr,rixCloud-Inc/Clash-Ruleset/master/,Global_IP.rule,Global_IP.yaml -国外域名代理合集,rixCloud-Inc,domain,rixCloud-Inc/Clash-Ruleset/master/,Global_Domain.rule,Global_Domain.yaml 国外常用网站合集,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/,Global.yaml 国外流媒体合集,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/,Streaming.yaml -国外流媒体（IP）合集,rixCloud-Inc,ipcidr,rixCloud-Inc/Clash-Ruleset/master/,Stream_IP.rule,Stream_IP.yaml -国外流媒体（域名）合集,rixCloud-Inc,domain,rixCloud-Inc/Clash-Ruleset/master/,Stream_Domain.rule,Stream_Domain.yaml 学术网站,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/,Scholar.yaml -常用隐私规则,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/,Unbreak.yaml 广告规则,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Guard/,Advertising.yaml -广告（IP）合集,rixCloud-Inc,ipcidr,rixCloud-Inc/Clash-Ruleset/master/,Reject_IP.rule,Reject_IP.yaml -广告（域名）合集,rixCloud-Inc,domain,rixCloud-Inc/Clash-Ruleset/master/,Reject_Domain.rule,Reject_Domain.yaml -网易云音乐域名,rixCloud-Inc,domain,rixCloud-Inc/Clash-Ruleset/master/,Netease_Music_Domains.rule,Netease_Music_Domains.yaml -苹果服务合集,rixCloud-Inc,domain,rixCloud-Inc/Clash-Ruleset/master/,Apple_Domain.rule,Apple_Domain.yaml 隐私规则合集,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Guard/,Privacy.yaml AbemaTV,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,AbemaTV.yaml All-4,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,All-4.yaml diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_version.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_version.sh index b4358096c8..abacd38057 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_version.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_version.sh @@ -18,7 +18,7 @@ if [ "$CKTIME" != "$(grep "CheckTime" $LAST_OPVER 2>/dev/null |awk -F ':' '{prin curl -sL --connect-timeout 10 --retry 2 "$VERSION_URL" -o $LAST_OPVER >/dev/null 2>&1 fi if [ "$?" -eq "0" ] && [ -s "$LAST_OPVER" ]; then - OP_LV=$(sed -n 1p $LAST_OPVER 2>/dev/null |awk -F '-' '{print $1}' |awk -F 'v' '{print $2}' |awk -F '.' '{print $1"."$2$3}' 2>/dev/null) + OP_LV=$(sed -n 1p $LAST_OPVER 2>/dev/null |awk -F '-' '{print $1}' |awk -F 'v' '{print $2}' |awk -F '.' '{print $2$3}' 2>/dev/null) if [ "$(expr "$OP_CV" \>= "$OP_LV")" -eq 1 ]; then sed -i "/^https:/i\CheckTime:${CKTIME}" "$LAST_OPVER" 2>/dev/null sed -i '/^https:/,$d' $LAST_OPVER diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_rules_change.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_rules_change.sh index e42c108f45..5d5e000c90 100755 --- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_rules_change.sh +++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_rules_change.sh @@ -98,7 +98,6 @@ if [ "$2" != 0 ]; then if [ -z "$(grep "$GlobalTV" /tmp/Proxy_Group)" ]\ || [ -z "$(grep "$AsianTV" /tmp/Proxy_Group)" ]\ || [ -z "$(grep "$Proxy" /tmp/Proxy_Group)" ]\ -# || [ -z "$(grep "$AdBlock" /tmp/Proxy_Group)" ]\ || [ -z "$(grep "$Others" /tmp/Proxy_Group)" ]\ || [ -z "$(grep "$Domestic" /tmp/Proxy_Group)" ]; then echo "${1} Warning: Because of The Different Porxy-Group's Name, Stop Setting The Other Rules!" >>/tmp/openclash.log @@ -170,7 +169,6 @@ if [ "$2" != 0 ]; then if [ "$GlobalTV" != "$GlobalTV_YAML" ]\ || [ "$AsianTV" != "$AsianTV_YAML" ]\ || [ "$Proxy" != "$Proxy_YAML" ]\ -# || [ "$AdBlock" != "$AdBlock_YAML" ]\ || [ "$Others" != "$Others_YAML" ]\ || [ "$Domestic" != "$Domestic_YAML" ]; then check_def=1 @@ -272,9 +270,6 @@ if [ "$2" != 0 ]; then sed -i "s/,CN,DIRECT$/,China,${Domestic}#d/g" "/tmp/other_rule.yaml" 2>/dev/null sed -i "s/,CN,DIRECT,no-resolve$/,China,${Domestic},no-resolve#d/g" "/tmp/other_rule.yaml" 2>/dev/null sed -i "/rules:/a\##Domestic:${Domestic}" "/tmp/other_rule.yaml" 2>/dev/null - #sed -i "s/,Unbreak,DIRECT$/,Unbreak,${AdBlock}#d/g" "/tmp/other_rule.yaml" 2>/dev/null - #sed -i "s/,Unbreak,DIRECT,no-resolve$/,Unbreak,${AdBlock},no-resolve#d/g" "/tmp/other_rule.yaml" 2>/dev/null - #sed -i "/rules:/a\##AdBlock:${AdBlock}" "/tmp/other_rule.yaml" 2>/dev/null sed -i "s/,MATCH$/,${Others}#d/g" "/tmp/other_rule.yaml" 2>/dev/null sed -i "s/,MATCH,no-resolve$/,${Others},no-resolve#d/g" "/tmp/other_rule.yaml" 2>/dev/null sed -i "/rules:/a\##Others:${Others}" "/tmp/other_rule.yaml" 2>/dev/null diff --git a/package/lean/luci-app-turboacc/Makefile b/package/lean/luci-app-turboacc/Makefile index e94cd1fa5c..3b146b6ec5 100644 --- a/package/lean/luci-app-turboacc/Makefile +++ b/package/lean/luci-app-turboacc/Makefile @@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for Flow Offload / Shortcut-FE LUCI_DEPENDS:=+pdnsd-alt \ +PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe:kmod-fast-classifier \ +PACKAGE_luci-app-turboacc_INCLUDE_flow-offload:kmod-ipt-offload \ - +PACKAGE_luci-app-turboacc_INCLUDE_bbr:kmod-tcp-bbr \ + +PACKAGE_luci-app-turboacc_INCLUDE_bbr-cca:kmod-tcp-bbr \ +PACKAGE_luci-app-turboacc_INCLUDE_adguardhome:AdGuardHome \ +PACKAGE_luci-app-turboacc_INCLUDE_dnsforwarder:dnsforwarder LUCI_PKGARCH:=all @@ -32,8 +32,8 @@ config PACKAGE_luci-app-turboacc_INCLUDE_flow-offload depends on !LINUX_4_9 default y -config PACKAGE_luci-app-turboacc_INCLUDE_bbr - bool "Include BBR" +config PACKAGE_luci-app-turboacc_INCLUDE_bbr-cca + bool "Include BBR CCA" default n if LINUX_4_9 default y @@ -42,7 +42,7 @@ config PACKAGE_luci-app-turboacc_INCLUDE_adguardhome default n config PACKAGE_luci-app-turboacc_INCLUDE_dnsforwarder - bool "Include DnsForwarder" + bool "Include DNSForwarder" default n endef include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-turboacc/luasrc/model/cbi/turboacc.lua b/package/lean/luci-app-turboacc/luasrc/model/cbi/turboacc.lua index 1ab6e66363..cd3ddf5c87 100644 --- a/package/lean/luci-app-turboacc/luasrc/model/cbi/turboacc.lua +++ b/package/lean/luci-app-turboacc/luasrc/model/cbi/turboacc.lua @@ -44,14 +44,14 @@ sfe_ipv6:depends("sfe_flow", 1) end if nixio.fs.access("/lib/modules/" .. kernel_version .. "/tcp_bbr.ko") then -bbr_cca = s:option(Flag, "bbr_cca", translate("Enable BBR CCA")) +bbr_cca = s:option(Flag, "bbr_cca", translate("BBR CCA")) bbr_cca.default = 0 bbr_cca.rmempty = false bbr_cca.description = translate("Using BBR CCA can improve TCP network performance effectively") end if nixio.fs.access("/lib/modules/" .. kernel_version .. "/xt_FULLCONENAT.ko") then -fullcone_nat = s:option(Flag, "fullcone_nat", translate("Enable FullCone NAT")) +fullcone_nat = s:option(Flag, "fullcone_nat", translate("FullCone NAT")) fullcone_nat.default = 0 fullcone_nat.rmempty = false fullcone_nat.description = translate("Using FullCone NAT can improve gaming performance effectively") diff --git a/package/lean/luci-app-turboacc/po/zh-cn/turboacc.po b/package/lean/luci-app-turboacc/po/zh-cn/turboacc.po index 7727448e8f..d274f98e29 100644 --- a/package/lean/luci-app-turboacc/po/zh-cn/turboacc.po +++ b/package/lean/luci-app-turboacc/po/zh-cn/turboacc.po @@ -40,14 +40,14 @@ msgstr "IPv6 加速" msgid "Enable IPv6 Acceleration" msgstr "启用 IPv6 加速" -msgid "Enable BBR CCA" -msgstr "启用 BBR 拥塞控制算法" +msgid "BBR CCA" +msgstr "BBR 拥塞控制算法" msgid "Using BBR CCA can improve TCP network performance effectively" msgstr "使用 BBR 拥塞控制算法可以有效提升 TCP 网络性能" -msgid "Enable FullCone NAT" -msgstr "启用全锥形 NAT" +msgid "FullCone NAT" +msgstr "全锥形 NAT" msgid "Using FullCone NAT can improve gaming performance effectively" msgstr "使用全锥形 NAT 可以有效提升游戏体验" @@ -107,4 +107,4 @@ msgid "AdGuardHome Anti-AD" msgstr "AdGuardHome 去广告" msgid "Open Web Interface" -msgstr "打开 Web 界面" \ No newline at end of file +msgstr "打开 Web 界面"