Browse Source

Merge pull request #3262 from dibdot/adblock

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

+ 1
- 1
net/adblock/Makefile View File

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


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

@ -10,7 +10,7 @@
#
adb_pid="${$}"
adb_pidfile="/var/run/adblock.pid"
adb_scriptver="1.4.9"
adb_scriptver="1.4.10"
adb_mincfgver="2.5"
adb_scriptdir="${0%/*}"
if [ -r "${adb_pidfile}" ]


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

@ -91,10 +91,10 @@ config source 'ruadlist'
option adb_src_desc 'focus on russian ads plus generic easylist additions, weekly updates, approx. 2.000 entries'
config source 'securemecca'
option enabled '0'
option adb_src 'http://securemecca.com/Downloads/hosts.txt'
option adb_src_rset '\$0 ~/^127\.0\.0\.1[ \t]+([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$2)}'
option adb_src_desc 'broad blocklist, infrequent updates, approx. 25.000 entries'
option enabled '0'
option adb_src 'http://securemecca.com/Downloads/hosts.txt'
option adb_src_rset '\$0 ~/^127\.0\.0\.1[ \t]+([A-Za-z0-9_-]+\.){1,}[A-Za-z]+/{print tolower(\$2)}'
option adb_src_desc 'broad blocklist, infrequent updates, approx. 25.000 entries'
config source 'shalla'
option enabled '0'


+ 2
- 1
net/adblock/files/adblock.hotplug View File

@ -4,8 +4,9 @@
adb_pid="${$}"
adb_helper="/usr/bin/adblock-helper.sh"
adb_pidfile="/var/run/adblock.pid"
adb_enabled="$(/etc/init.d/adblock enabled; echo $?)"
if [ -f "${adb_pidfile}" ] || [ "${ACTION}" != "ifup" ]
if [ "${adb_enabled}" = "1" ] || [ -f "${adb_pidfile}" ] || [ "${ACTION}" != "ifup" ]
then
exit 0
fi


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

@ -1,7 +1,7 @@
#!/bin/sh /etc/rc.common
#
START=99
START=90
EXTRA_COMMANDS="toggle stats cfgup query"
EXTRA_HELP=" toggle Toggle adblock 'on' or 'off'
stats Update adblock statistics


Loading…
Cancel
Save