Version bump to R20.3.11

mfblog · Mar 11, 2020 · b9cc436 · b9cc436
1 parent f9cb999
commit b9cc436
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 <<EOF