From fb7ff5ad0ce1ef423ccd81b556c89755d37407b6 Mon Sep 17 00:00:00 2001 From: Hyy2001X <1804430051@qq.com> Date: Sat, 6 Nov 2021 16:40:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BD=AF=E4=BB=B6=E5=8C=85?= =?UTF-8?q?=20&=20=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configs/Common | 2 +- Configs/asus_rt-acrh17 | 1 - Configs/d-team_newifi-d2 | 1 - Configs/p2w_r619ac-128m | 1 - Configs/x86_64 | 2 -- Configs/xiaomi_redmi-router-ac2100 | 1 - Configs/xiaoyu_xy-c5 | 1 - Scripts/AutoBuild_ExtraPackages.sh | 1 - Scripts/AutoBuild_Function.sh | 4 ++-- 9 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Configs/Common b/Configs/Common index 6ba5c46..22c0176 100755 --- a/Configs/Common +++ b/Configs/Common @@ -3,7 +3,7 @@ CONFIG_PACKAGE_luci-theme-argon=y CONFIG_PACKAGE_luci-app-argon-config=y -CONFIG_PACKAGE_luci-app-adblock-plus=y +CONFIG_PACKAGE_luci-app-adbyby-plus=y CONFIG_PACKAGE_luci-app-adguardhome=y CONFIG_PACKAGE_luci-app-autoupdate=y CONFIG_PACKAGE_luci-app-ddns=y diff --git a/Configs/asus_rt-acrh17 b/Configs/asus_rt-acrh17 index 1960ec6..ce835aa 100755 --- a/Configs/asus_rt-acrh17 +++ b/Configs/asus_rt-acrh17 @@ -28,7 +28,6 @@ CONFIG_PACKAGE_luci-app-vsftpd=y # LUCI Appliciations CONFIG_PACKAGE_luci-app-accesscontrol=y -CONFIG_PACKAGE_luci-app-adbyby-plus=y CONFIG_PACKAGE_luci-app-aria2=y CONFIG_PACKAGE_luci-app-filetransfer=y CONFIG_PACKAGE_luci-app-mwan3=y diff --git a/Configs/d-team_newifi-d2 b/Configs/d-team_newifi-d2 index 56dad9f..248eb75 100755 --- a/Configs/d-team_newifi-d2 +++ b/Configs/d-team_newifi-d2 @@ -38,7 +38,6 @@ CONFIG_PACKAGE_luci-app-vsftpd=y # LUCI Appliciations CONFIG_PACKAGE_luci-app-accesscontrol=y -# CONFIG_PACKAGE_luci-app-adbyby-plus is not set CONFIG_PACKAGE_luci-app-aria2=y CONFIG_PACKAGE_luci-app-easymesh=y CONFIG_PACKAGE_luci-app-filetransfer=y diff --git a/Configs/p2w_r619ac-128m b/Configs/p2w_r619ac-128m index a2a0cc0..b99205c 100644 --- a/Configs/p2w_r619ac-128m +++ b/Configs/p2w_r619ac-128m @@ -39,7 +39,6 @@ CONFIG_PACKAGE_luci-app-vsftpd=y # LUCI Appliciations CONFIG_PACKAGE_luci-app-accesscontrol=y -CONFIG_PACKAGE_luci-app-adbyby-plus=y CONFIG_PACKAGE_luci-app-aria2=y CONFIG_PACKAGE_luci-app-aliyundrive-webdav=y CONFIG_PACKAGE_luci-app-cifs-mount=y diff --git a/Configs/x86_64 b/Configs/x86_64 index 17c1f7b..cff09c2 100755 --- a/Configs/x86_64 +++ b/Configs/x86_64 @@ -30,8 +30,6 @@ CONFIG_PACKAGE_kmod-usb-ohci-pci=y CONFIG_PACKAGE_kmod-usb2=y CONFIG_PACKAGE_kmod-usb3=y -# CONFIG_PACKAGE_luci-app-adbyby-plus is not set -# CONFIG_PACKAGE_luci-app-accesscontrol is not set CONFIG_PACKAGE_luci-app-aria2=y CONFIG_PACKAGE_luci-app-arpbind=y CONFIG_PACKAGE_luci-app-airplay2=y diff --git a/Configs/xiaomi_redmi-router-ac2100 b/Configs/xiaomi_redmi-router-ac2100 index 1052b05..9569b62 100755 --- a/Configs/xiaomi_redmi-router-ac2100 +++ b/Configs/xiaomi_redmi-router-ac2100 @@ -16,7 +16,6 @@ CONFIG_PACKAGE_kmod-mt7615e=y # LUCI Appliciations CONFIG_PACKAGE_luci-app-accesscontrol=y -CONFIG_PACKAGE_luci-app-adbyby-plus=y CONFIG_PACKAGE_luci-app-aliyundrive-webdav=y # CONFIG_PACKAGE_luci-app-aria2 is not set CONFIG_PACKAGE_luci-app-cifs-mount=y diff --git a/Configs/xiaoyu_xy-c5 b/Configs/xiaoyu_xy-c5 index 17cf7e4..855e7a5 100755 --- a/Configs/xiaoyu_xy-c5 +++ b/Configs/xiaoyu_xy-c5 @@ -28,7 +28,6 @@ CONFIG_PACKAGE_luci-app-vsftpd=y # LUCI Appliciations CONFIG_PACKAGE_luci-app-accesscontrol=y -# CONFIG_PACKAGE_luci-app-adbyby-plus is not set CONFIG_PACKAGE_luci-app-aria2=y CONFIG_PACKAGE_luci-app-filetransfer=y CONFIG_PACKAGE_luci-app-frpc=y diff --git a/Scripts/AutoBuild_ExtraPackages.sh b/Scripts/AutoBuild_ExtraPackages.sh index 3e46fcb..e454ade 100755 --- a/Scripts/AutoBuild_ExtraPackages.sh +++ b/Scripts/AutoBuild_ExtraPackages.sh @@ -20,7 +20,6 @@ coolsnowwolf/lede:master) AddPackage svn other luci-app-socat Lienol/openwrt-package/trunk AddPackage svn other luci-app-eqos kenzok8/openwrt-packages/trunk AddPackage git other OpenClash vernesong master - AddPackage git other luci-app-adblock-plus small-5 master # AddPackage git other OpenAppFilter destan19 master # AddPackage svn other luci-app-ddnsto linkease/nas-packages/trunk/luci # AddPackage svn other ddnsto linkease/nas-packages/trunk/network/services diff --git a/Scripts/AutoBuild_Function.sh b/Scripts/AutoBuild_Function.sh index f0bf8b3..7ed1701 100755 --- a/Scripts/AutoBuild_Function.sh +++ b/Scripts/AutoBuild_Function.sh @@ -145,8 +145,8 @@ if [ -z "$(grep "REDIRECT --to-ports 53" /etc/firewall.user)" ] then echo '#iptables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53' >> /etc/firewall.user echo '#iptables -t nat -A PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53' >> /etc/firewall.user - echo '#[ -n "$(command -v ip6tables)" ] && ip6tables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53' >> /etc/firewall.user - echo '#[ -n "$(command -v ip6tables)" ] && ip6tables -t nat -A PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53' >> /etc/firewall.user + echo '#[ -n '"$(command -v ip6tables)"' ] && ip6tables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53' >> /etc/firewall.user + echo '#[ -n '"$(command -v ip6tables)"' ] && ip6tables -t nat -A PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53' >> /etc/firewall.user fi exit 0 EOF