Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6532 from dibdot/adblock

Browse source 
adblock: 3.5.4
This commit is contained in:
Dirk Brenken 2018-07-22 21:08:30 +02:00 committed by GitHub
commit 7bbf84b441
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/adblock/Makefile
View file

@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=adblock PKG_NAME:=adblock
PKG_VERSION:=3.5.3 PKG_VERSION:=3.5.4
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0+ PKG_LICENSE:=GPL-3.0+
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org> PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

2
net/adblock/files/adblock.init
View file

@ -32,9 +32,11 @@ start_service()
return 0 return 0
fi fi
fi fi
local nice="$(uci_get adblock extra adb_nice)"
procd_open_instance "adblock" procd_open_instance "adblock"
procd_set_param command "${adb_script}" "${@}" procd_set_param command "${adb_script}" "${@}"
procd_set_param pidfile "${adb_pidfile}" procd_set_param pidfile "${adb_pidfile}"
procd_set_param nice ${nice:-0}
procd_set_param stdout 1 procd_set_param stdout 1
procd_set_param stderr 1 procd_set_param stderr 1
procd_close_instance procd_close_instance

10
net/adblock/files/adblock.sh
View file

@ -10,7 +10,7 @@
# #
LC_ALL=C LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin" PATH="/usr/sbin:/usr/bin:/sbin:/bin"
adb_ver="3.5.3" adb_ver="3.5.4"
adb_sysver="unknown" adb_sysver="unknown"
adb_enabled=0 adb_enabled=0
adb_debug=0 adb_debug=0
@ -263,7 +263,7 @@ f_envcheck()
f_log "info" "start adblock processing (${adb_action})" f_log "info" "start adblock processing (${adb_action})"
} }
# create temporay files and directories # create temporary files and directories
# #
f_temp() f_temp()
{ {
@ -279,7 +279,7 @@ f_temp()
fi fi
} }
# remove temporay files and directories # remove temporary files and directories
# #
f_rmtemp() f_rmtemp()
{ {
@ -402,8 +402,8 @@ f_extconf()
set firewall.adblock_dns.name="Adblock DNS" set firewall.adblock_dns.name="Adblock DNS"
set firewall.adblock_dns.src="lan" set firewall.adblock_dns.src="lan"
set firewall.adblock_dns.proto="tcp udp" set firewall.adblock_dns.proto="tcp udp"
set firewall.adblock_dns.src_dport="53" set firewall.adblock_dns.src_dport="53 853 5353"
set firewall.adblock_dns.dest_port="53" set firewall.adblock_dns.dest_port="53 853 5353"
set firewall.adblock_dns.target="DNAT" set firewall.adblock_dns.target="DNAT"
EOF EOF
elif [ -n "$(uci -q get firewall.adblock_dns)" ] && ([ ${adb_enabled} -eq 0 ] || [ ${adb_forcedns} -eq 0 ]) elif [ -n "$(uci -q get firewall.adblock_dns)" ] && ([ ${adb_enabled} -eq 0 ] || [ ${adb_forcedns} -eq 0 ])