From a6bbc6b2f88798ccf51baf65a55188b24f3de909 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Wed, 20 Dec 2023 00:48:52 +0800 Subject: [PATCH] adblock: add new style dnsmasq format --- net/adblock/Makefile | 2 +- net/adblock/files/adblock.sh | 6 +++--- net/sqm-scripts/Makefile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/adblock/Makefile b/net/adblock/Makefile index 3c5ee8ae..81e10743 100644 --- a/net/adblock/Makefile +++ b/net/adblock/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adblock PKG_VERSION:=4.1.5 -PKG_RELEASE:=8 +PKG_RELEASE:=9 PKG_LICENSE:=GPL-3.0+ PKG_MAINTAINER:=Dirk Brenken diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh index 3f17adea..cf416ffa 100755 --- a/net/adblock/files/adblock.sh +++ b/net/adblock/files/adblock.sh @@ -115,9 +115,9 @@ f_envload() adb_dnsuser="${adb_dnsuser:-"dnsmasq"}" adb_dnsdir="${adb_dnsdir:-"/tmp/dnsmasq.d"}" adb_dnsheader="" - adb_dnsdeny="awk '{print \"server=/\"\$0\"/\"}'" - adb_dnsallow="awk '{print \"server=/\"\$0\"/#\"}'" - adb_dnshalt="server=/#/" + adb_dnsdeny="awk '{print \"local=/\"\$0\"/\"}'" + adb_dnsallow="awk '{print \"local=/\"\$0\"/#\"}'" + adb_dnshalt="address=/#/" ;; unbound) adb_dnsinstance="${adb_dnsinstance:-"0"}" diff --git a/net/sqm-scripts/Makefile b/net/sqm-scripts/Makefile index 53171e94..15bade78 100644 --- a/net/sqm-scripts/Makefile +++ b/net/sqm-scripts/Makefile @@ -26,7 +26,7 @@ define Package/sqm-scripts CATEGORY:=Base system DEPENDS:=+tc +kmod-sched-core +kmod-ifb +iptables \ +iptables-mod-ipopt +iptables-mod-conntrack-extra \ - +kmod-sched-cake +TARGET_ipq806x:kmod-nss-ifb +TARGET_ipq806x:kmod-qca-nss-drv-qdisc + +kmod-sched-cake TITLE:=SQM Scripts (QoS) PKGARCH:=all endef