adblock-fast: bugfix: unbound-related fixes
* include `server:` directive at the top of unbound file * update unbound-related outputGzip variable to include full path * return always_nxdomain for blocked domains * also update copyright stamp/license Signed-off-by: Stan Grishin <stangri@melmac.ca>
This commit is contained in:
parent
bf1b907d12
commit
474587a1f4
|
@ -1,14 +1,14 @@
|
||||||
# Copyright 2023 MOSSDeF, Stan Grishin (stangri@melmac.ca)
|
# Copyright 2023-2024 MOSSDeF, Stan Grishin (stangri@melmac.ca).
|
||||||
# TLD optimization written by Dirk Brenken (dev@brenken.org)
|
# TLD optimization written by Dirk Brenken (dev@brenken.org).
|
||||||
# This is free software, licensed under the GNU General Public License v3.
|
# This is free software, licensed under AGPL-3.0-or-later.
|
||||||
|
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=adblock-fast
|
PKG_NAME:=adblock-fast
|
||||||
PKG_VERSION:=1.1.1
|
PKG_VERSION:=1.1.1
|
||||||
PKG_RELEASE:=r8
|
PKG_RELEASE:=11
|
||||||
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
|
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
|
||||||
PKG_LICENSE:=GPL-3.0-or-later
|
PKG_LICENSE:=AGPL-3.0-or-later
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ readonly smartdnsNftsetFilter=';'
|
||||||
readonly unboundFile="/var/lib/unbound/adb_list.${packageName}"
|
readonly unboundFile="/var/lib/unbound/adb_list.${packageName}"
|
||||||
readonly unboundCache="/var/run/${packageName}/unbound.cache"
|
readonly unboundCache="/var/run/${packageName}/unbound.cache"
|
||||||
readonly unboundGzip="${packageName}.unbound.gz"
|
readonly unboundGzip="${packageName}.unbound.gz"
|
||||||
readonly unboundFilter='s|^|local-zone: "|;s|$|" static|'
|
readonly unboundFilter='s|^|local-zone: "|;s|$|." always_nxdomain|'
|
||||||
readonly A_TMP="/var/${packageName}.a.tmp"
|
readonly A_TMP="/var/${packageName}.a.tmp"
|
||||||
readonly B_TMP="/var/${packageName}.b.tmp"
|
readonly B_TMP="/var/${packageName}.b.tmp"
|
||||||
readonly SED_TMP="/var/${packageName}.sed.tmp"
|
readonly SED_TMP="/var/${packageName}.sed.tmp"
|
||||||
|
@ -267,7 +267,7 @@ dns_set_output_values() {
|
||||||
outputFilter="$unboundFilter"
|
outputFilter="$unboundFilter"
|
||||||
outputFile="$unboundFile"
|
outputFile="$unboundFile"
|
||||||
outputCache="$unboundCache"
|
outputCache="$unboundCache"
|
||||||
outputGzip="$unboundGzip"
|
outputGzip="${compressed_cache_dir}/${unboundGzip}"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
@ -757,7 +757,7 @@ load_environment() {
|
||||||
[ "$dns" = 'smartdns.domainset' ] || rm -f "$smartdnsDomainSetFile" "$smartdnsDomainSetCache" "${compressed_cache_dir}/${smartdnsDomainSetGzip}" "$smartdnsDomainSetConfig"
|
[ "$dns" = 'smartdns.domainset' ] || rm -f "$smartdnsDomainSetFile" "$smartdnsDomainSetCache" "${compressed_cache_dir}/${smartdnsDomainSetGzip}" "$smartdnsDomainSetConfig"
|
||||||
[ "$dns" = 'smartdns.ipset' ] || rm -f "$smartdnsIpsetFile" "$smartdnsIpsetCache" "${compressed_cache_dir}/${smartdnsIpsetGzip}" "$smartdnsIpsetConfig"
|
[ "$dns" = 'smartdns.ipset' ] || rm -f "$smartdnsIpsetFile" "$smartdnsIpsetCache" "${compressed_cache_dir}/${smartdnsIpsetGzip}" "$smartdnsIpsetConfig"
|
||||||
[ "$dns" = 'smartdns.nftset' ] || rm -f "$smartdnsNftsetFile" "$smartdnsNftsetCache" "${compressed_cache_dir}/${smartdnsNftsetGzip}" "$smartdnsNftsetConfig"
|
[ "$dns" = 'smartdns.nftset' ] || rm -f "$smartdnsNftsetFile" "$smartdnsNftsetCache" "${compressed_cache_dir}/${smartdnsNftsetGzip}" "$smartdnsNftsetConfig"
|
||||||
[ "$dns" = 'unbound.adb_list' ] || rm -f "$unboundFile" "$unboundCache" "$unboundGzip"
|
[ "$dns" = 'unbound.adb_list' ] || rm -f "$unboundFile" "$unboundCache" "${compressed_cache_dir}/${unboundGzip}"
|
||||||
|
|
||||||
for i in "$runningConfigFile" "$runningErrorFile" "$runningStatusFile" "$outputFile" "$outputCache" "$outputGzip" "$outputConfig"; do
|
for i in "$runningConfigFile" "$runningErrorFile" "$runningStatusFile" "$outputFile" "$outputCache" "$outputGzip" "$outputConfig"; do
|
||||||
[ -n "$i" ] || continue
|
[ -n "$i" ] || continue
|
||||||
|
@ -892,7 +892,7 @@ resolver() {
|
||||||
rm -f "$smartdnsDomainSetFile" "$smartdnsDomainSetCache" "${compressed_cache_dir}/${smartdnsDomainSetGzip}" "$smartdnsDomainSetConfig"
|
rm -f "$smartdnsDomainSetFile" "$smartdnsDomainSetCache" "${compressed_cache_dir}/${smartdnsDomainSetGzip}" "$smartdnsDomainSetConfig"
|
||||||
rm -f "$smartdnsIpsetFile" "$smartdnsIpsetCache" "${compressed_cache_dir}/${smartdnsIpsetGzip}" "$smartdnsIpsetConfig"
|
rm -f "$smartdnsIpsetFile" "$smartdnsIpsetCache" "${compressed_cache_dir}/${smartdnsIpsetGzip}" "$smartdnsIpsetConfig"
|
||||||
rm -f "$smartdnsNftsetFile" "$smartdnsNftsetCache" "${compressed_cache_dir}/${smartdnsNftsetGzip}" "$smartdnsNftsetConfig"
|
rm -f "$smartdnsNftsetFile" "$smartdnsNftsetCache" "${compressed_cache_dir}/${smartdnsNftsetGzip}" "$smartdnsNftsetConfig"
|
||||||
rm -f "$unboundFile" "$unboundCache" "$unboundGzip"
|
rm -f "$unboundFile" "$unboundCache" "${compressed_cache_dir}/${unboundGzip}"
|
||||||
if [ -s "/etc/config/dhcp" ]; then
|
if [ -s "/etc/config/dhcp" ]; then
|
||||||
config_load 'dhcp'
|
config_load 'dhcp'
|
||||||
config_foreach _dnsmasq_instance_config 'dnsmasq' 'cleanup'
|
config_foreach _dnsmasq_instance_config 'dnsmasq' 'cleanup'
|
||||||
|
@ -932,19 +932,19 @@ resolver() {
|
||||||
case "$dns" in
|
case "$dns" in
|
||||||
dnsmasq.*)
|
dnsmasq.*)
|
||||||
chmod 660 "$outputFile"
|
chmod 660 "$outputFile"
|
||||||
chown root:dnsmasq "$outputFile"
|
chown root:dnsmasq "$outputFile" >/dev/null 2>/dev/null
|
||||||
param='dnsmasq_restart'
|
param='dnsmasq_restart'
|
||||||
output_text='Restarting dnsmasq'
|
output_text='Restarting dnsmasq'
|
||||||
;;
|
;;
|
||||||
smartdns.*)
|
smartdns.*)
|
||||||
chmod 660 "$outputFile" "$outputConfig"
|
chmod 660 "$outputFile" "$outputConfig"
|
||||||
chown root:root "$outputFile" "$outputConfig"
|
chown root:root "$outputFile" "$outputConfig" >/dev/null 2>/dev/null
|
||||||
param='smartdns_restart'
|
param='smartdns_restart'
|
||||||
output_text='Restarting SmartDNS'
|
output_text='Restarting SmartDNS'
|
||||||
;;
|
;;
|
||||||
unbound.*)
|
unbound.*)
|
||||||
chmod 660 "$outputFile"
|
chmod 660 "$outputFile"
|
||||||
chown root:unbound "$outputFile"
|
chown root:unbound "$outputFile" >/dev/null 2>/dev/null
|
||||||
param='unbound_restart'
|
param='unbound_restart'
|
||||||
output_text='Restarting Unbound'
|
output_text='Restarting Unbound'
|
||||||
;;
|
;;
|
||||||
|
@ -1036,7 +1036,7 @@ cache() {
|
||||||
return $?
|
return $?
|
||||||
;;
|
;;
|
||||||
test_gzip)
|
test_gzip)
|
||||||
[ -s "$outputGzip" ] && gzip -t -c "$outputGzip"
|
[ -s "$outputGzip" ] && gzip -t -c "$outputGzip" >/dev/null 2>/dev/null
|
||||||
return $?
|
return $?
|
||||||
;;
|
;;
|
||||||
create_gzip)
|
create_gzip)
|
||||||
|
@ -1412,6 +1412,11 @@ $(sed '/^[[:space:]]*$/d' "$A_TMP")"
|
||||||
output_failn
|
output_failn
|
||||||
json add error 'errorMovingDataFile'
|
json add error 'errorMovingDataFile'
|
||||||
fi
|
fi
|
||||||
|
case "$dns" in
|
||||||
|
unbound.adb_list)
|
||||||
|
sed -i '1 i\server:' "$outputFile"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
if [ "$compressed_cache" -gt 0 ]; then
|
if [ "$compressed_cache" -gt 0 ]; then
|
||||||
output 2 'Creating compressed cache '
|
output 2 'Creating compressed cache '
|
||||||
json set message "$(get_text 'statusProcessing'): creating compressed cache"
|
json set message "$(get_text 'statusProcessing'): creating compressed cache"
|
||||||
|
@ -1596,7 +1601,7 @@ adb_check() {
|
||||||
smartdns.*)
|
smartdns.*)
|
||||||
grep "$string" "$outputFile";;
|
grep "$string" "$outputFile";;
|
||||||
unbound.adb_list)
|
unbound.adb_list)
|
||||||
grep "$string" "$outputFile" | sed 's|^local-zone: "||;s|" static$||;';;
|
grep "$string" "$outputFile" | sed 's|^local-zone: "||;s|." always_nxdomain$||;';;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue