openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 21:24:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

unbound: pull in adblock-fast generated adb_list

Browse Source 
* 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 <stangri@melmac.ca>
This commit is contained in:
Stan Grishin
2024-04-21 13:43:06 +00:00
parent f28c81bae2
commit d7d1743c83
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/unbound/Makefile
View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=unbound PKG_NAME:=unbound
PKG_VERSION:=1.19.3 PKG_VERSION:=1.19.3
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://nlnetlabs.nl/downloads/unbound PKG_SOURCE_URL:=https://nlnetlabs.nl/downloads/unbound

10
net/unbound/files/unbound.sh
View File

@@ -1477,14 +1477,16 @@ unbound_include() {
fi fi
if [ -z "$adb_files" ] || [ ! -x /usr/bin/adblock.sh ] \ if [ -z "$adb_files" ]; then
|| [ ! -x /etc/init.d/adblock ] ; then
adb_enabled=0 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 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 "include: $UB_VARDIR/adb_list.*"
echo echo
} >> $UB_TOTAL_CONF } >> $UB_TOTAL_CONF