From b9cc436ce088a3101e304d0eaea4553158435654 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Tue, 10 Mar 2020 19:27:22 -0700 Subject: [PATCH 1/2] Version bump to R20.3.11 --- package/lean/default-settings/Makefile | 2 +- package/lean/default-settings/files/zzz-default-settings | 4 +++- package/lean/luci-app-adbyby-plus/Makefile | 2 +- package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile index 25da54c5ce..33675f24b3 100644 --- a/package/lean/default-settings/Makefile +++ b/package/lean/default-settings/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=default-settings PKG_VERSION:=1.1 -PKG_RELEASE:=53 +PKG_RELEASE:=55 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE diff --git a/package/lean/default-settings/files/zzz-default-settings b/package/lean/default-settings/files/zzz-default-settings index 23c92cd4ab..a73b29e1f9 100755 --- a/package/lean/default-settings/files/zzz-default-settings +++ b/package/lean/default-settings/files/zzz-default-settings @@ -43,7 +43,7 @@ sed -i '/option disabled/d' /etc/config/wireless sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release -echo "DISTRIB_REVISION='R20.3.8'" >> /etc/openwrt_release +echo "DISTRIB_REVISION='R20.3.11'" >> /etc/openwrt_release sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release @@ -52,6 +52,8 @@ echo "log-facility=/dev/null" >> /etc/dnsmasq.conf sed -i 's/cbi.submit\"] = true/cbi.submit\"] = \"1\"/g' /usr/lib/lua/luci/dispatcher.lua +echo 'hsts=0' > /root/.wgetrc + rm -rf /tmp/luci-modulecache/ rm -f /tmp/luci-indexcache diff --git a/package/lean/luci-app-adbyby-plus/Makefile b/package/lean/luci-app-adbyby-plus/Makefile index 08970b2639..0d212df29e 100644 --- a/package/lean/luci-app-adbyby-plus/Makefile +++ b/package/lean/luci-app-adbyby-plus/Makefile @@ -10,7 +10,7 @@ LUCI_DEPENDS:=+adbyby +wget +ipset +dnsmasq-full LUCI_PKGARCH:=all PKG_NAME:=luci-app-adbyby-plus PKG_VERSION:=2.0 -PKG_RELEASE:=61 +PKG_RELEASE:=62 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby b/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby index e0fb533adf..4a9dc56025 100755 --- a/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby +++ b/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby @@ -106,6 +106,7 @@ add_dns() { mkdir -p /var/etc/dnsmasq-adbyby.d mkdir -p /tmp/dnsmasq.d + mkdir -p /usr/share/adbyby/rules/host /usr/share/adbyby/rules/data awk '!/^$/&&!/^#/{printf("ipset=/%s/'"adbyby_esc"'\n",$0)}' $PROG_PATH/adesc.conf > /var/etc/dnsmasq-adbyby.d/06-dnsmasq.esc awk '!/^$/&&!/^#/{printf("address=/%s/'"0.0.0.0"'\n",$0)}' $PROG_PATH/adblack.conf > /var/etc/dnsmasq-adbyby.d/07-dnsmasq.black cat > /tmp/dnsmasq.d/dnsmasq-adbyby.conf < Date: Tue, 10 Mar 2020 19:50:23 -0700 Subject: [PATCH 2/2] luci-app-adbyby-plus: update adblock.sh --- package/lean/luci-app-adbyby-plus/Makefile | 2 +- .../root/usr/share/adbyby/adblock.sh | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/package/lean/luci-app-adbyby-plus/Makefile b/package/lean/luci-app-adbyby-plus/Makefile index 0d212df29e..dc615b6c70 100644 --- a/package/lean/luci-app-adbyby-plus/Makefile +++ b/package/lean/luci-app-adbyby-plus/Makefile @@ -10,7 +10,7 @@ LUCI_DEPENDS:=+adbyby +wget +ipset +dnsmasq-full LUCI_PKGARCH:=all PKG_NAME:=luci-app-adbyby-plus PKG_VERSION:=2.0 -PKG_RELEASE:=62 +PKG_RELEASE:=63 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adblock.sh b/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adblock.sh index 06788159ec..09832b5560 100755 --- a/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adblock.sh +++ b/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adblock.sh @@ -1,14 +1,8 @@ #!/bin/sh -rm -f /tmp/dnsmasq.adblock - -wget-ssl --no-check-certificate -O- https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt | grep ^\|\|[^\*]*\^$ | sed -e 's:||:address\=\/:' -e 's:\^:/0\.0\.0\.0:' > /tmp/dnsmasq.adblock -if [ -s "/tmp/dnsmasq.adblock" ];then - sed -i '/youku.com/d' /tmp/dnsmasq.adblock - if ( ! cmp -s /tmp/dnsmasq.adblock /usr/share/adbyby/dnsmasq.adblock );then - mv /tmp/dnsmasq.adblock /usr/share/adbyby/dnsmasq.adblock - fi +wget-ssl --no-check-certificate -O - 'https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt' > /tmp/adnew.conf +if [ -s "/tmp/adnew.conf" ];then + /usr/share/adbyby/ad-update fi -rm -rf /tmp/adbyby.updated && /etc/init.d/adbyby restart - +rm -f /tmp/adbyby.updated && /etc/init.d/adbyby restart