Browse Source

Merge pull request #4267 from dibdot/package-adblock

adblock: update 2.6.0-2
lilik-openwrt-22.03
Hannu Nyman 8 years ago
committed by GitHub
parent
commit
6b8eb9557e
4 changed files with 6 additions and 5 deletions
  1. +1
    -1
      net/adblock/Makefile
  2. +1
    -1
      net/adblock/files/adblock.conf
  3. +3
    -2
      net/adblock/files/adblock.init
  4. +1
    -1
      net/adblock/files/adblock.sh

+ 1
- 1
net/adblock/Makefile View File

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


+ 1
- 1
net/adblock/files/adblock.conf View File

@ -5,7 +5,7 @@ config adblock 'global'
option adb_enabled '1'
option adb_debug '0'
option adb_iface 'wan'
option adb_triggerdelay '1'
option adb_triggerdelay '2'
option adb_whitelist '/etc/adblock/adblock.whitelist'
option adb_whitelist_rset '\$1 ~/^([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\"^\"\$1\"\\\|[.]\"\$1)}'
option adb_backup '0'


+ 3
- 2
net/adblock/files/adblock.init View File

@ -1,7 +1,7 @@
#!/bin/sh /etc/rc.common
#
START=90
START=50
USE_PROCD=1
EXTRA_COMMANDS="suspend resume query status"
@ -72,10 +72,11 @@ service_triggers()
local iface="$(uci -q get adblock.global.adb_iface)"
local delay="$(uci -q get adblock.global.adb_triggerdelay)"
PROCD_RELOAD_DELAY=$((${delay:=1} * 1000))
PROCD_RELOAD_DELAY=$((${delay:=2} * 1000))
for name in ${iface}
do
procd_add_interface_trigger "interface.*.up" "${name}" "${adb_init}" start
done
PROCD_RELOAD_DELAY=1000
procd_add_config_trigger "config.change" "adblock" "${adb_init}" start
}

+ 1
- 1
net/adblock/files/adblock.sh View File

@ -10,7 +10,7 @@
#
LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin"
adb_ver="2.6.0"
adb_ver="2.6.0-2"
adb_sysver="$(ubus -S call system board | jsonfilter -e '@.release.description')"
adb_enabled=1
adb_debug=0


Loading…
Cancel
Save