Browse Source

Merge pull request #3409 from dibdot/adblock

adblock: update 1.5.3
lilik-openwrt-22.03
Hannu Nyman 8 years ago
committed by GitHub
parent
commit
21af22a0a5
3 changed files with 8 additions and 4 deletions
  1. +1
    -1
      net/adblock/Makefile
  2. +5
    -3
      net/adblock/files/adblock-helper.sh
  3. +2
    -0
      net/adblock/files/adblock-update.sh

+ 1
- 1
net/adblock/Makefile View File

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


+ 5
- 3
net/adblock/files/adblock-helper.sh View File

@ -6,7 +6,7 @@
#
LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin"
adb_scriptver="1.5.2"
adb_scriptver="1.5.3"
adb_mincfgver="2.5"
adb_hotplugif=""
adb_lanif="lan"
@ -242,10 +242,12 @@ f_envcheck()
f_depend "wget -" "true"
if [ "${package_ok}" = "true" ]
then
adb_fetch="$(which wget)"
adb_fetch="$(which /usr/bin/wget* | head -1)"
fetch_parm="--no-config --quiet --tries=1 --no-cache --no-cookies --max-redirect=0 --dns-timeout=${adb_fetchttl} --connect-timeout=${adb_fetchttl} --read-timeout=${adb_fetchttl}"
response_parm="--spider --server-response"
else
fi
if [ -z "${adb_fetch}" ]
then
rc=-1
f_log "please install 'uclient-fetch' or 'wget' with ssl support to use adblock"
f_exit


+ 2
- 0
net/adblock/files/adblock-update.sh View File

@ -41,6 +41,8 @@ f_envcheck
# main loop for all block list sources
#
f_log "use '${adb_fetch}' for list downloads"
for src_name in ${adb_sources}
do
# check disabled sources


Loading…
Cancel
Save