From e0d7863519fe68114da7337b87d3cca2b568838f Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Sun, 21 Apr 2024 13:43:06 +0000 Subject: [PATCH] unbound: pull in adblock-fast generated adb_list * adblock-fast can generate the compatible adb_list-file, but it's only pulled if net/adblock installed, this patch also pulls in the adb_list file if net/adblock-fast is installed. * also bump PKG_RELEASE Signed-off-by: Stan Grishin (cherry picked from commit d7d1743c834dffeb7e3ea0c9ee16ec587788f0ca) --- net/unbound/Makefile | 2 +- net/unbound/files/unbound.sh | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/net/unbound/Makefile b/net/unbound/Makefile index 830f60607c..06fd877edc 100644 --- a/net/unbound/Makefile +++ b/net/unbound/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=unbound PKG_VERSION:=1.19.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://nlnetlabs.nl/downloads/unbound diff --git a/net/unbound/files/unbound.sh b/net/unbound/files/unbound.sh index b9ff3d4e34..4ebbacd7b2 100644 --- a/net/unbound/files/unbound.sh +++ b/net/unbound/files/unbound.sh @@ -1477,14 +1477,16 @@ unbound_include() { fi - if [ -z "$adb_files" ] || [ ! -x /usr/bin/adblock.sh ] \ - || [ ! -x /etc/init.d/adblock ] ; then + if [ -z "$adb_files" ]; then adb_enabled=0 - elif /etc/init.d/adblock enabled ; then + elif { [ -x /etc/init.d/adblock-fast ] && /etc/init.d/adblock-fast enabled; } \ + || { [ -x /usr/bin/adblock.sh ] && [ -x /etc/init.d/adblock ] \ + && /etc/init.d/adblock enabled; }; then adb_enabled=1 { - # Pull in your selected openwrt/pacakges/net/adblock generated lists + # Pull in your selected openwrt/pacakges/net/adblock or + # openwrt/pacakges/net/adblock-fast generated lists echo "include: $UB_VARDIR/adb_list.*" echo } >> $UB_TOTAL_CONF -- 2.30.2