diff options
| author | Dirk Brenken <dev@brenken.org> | 2017-06-09 20:19:56 +0200 |
|---|---|---|
| committer | Dirk Brenken <dev@brenken.org> | 2017-06-09 20:19:56 +0200 |
| commit | 88be3d2d494b7ac7559db12a524a271afd5b50c8 (patch) | |
| tree | a826526965bc44f180086563872c5c081e5e53fc /net/adblock | |
| parent | 617448dc9339bd9e90c90cbe1ae8b6aad96814bd (diff) | |
adblock: update 2.7.1
backend:
* cosmetics
frontend:
* "Save & Reply" now distinguish between normal and manual/backup mode
and triggers an appropriate reload or a start action
Signed-off-by: Dirk Brenken <dev@brenken.org>
Diffstat (limited to 'net/adblock')
| -rw-r--r-- | net/adblock/Makefile | 2 | ||||
| -rw-r--r-- | net/adblock/files/README.md | 4 | ||||
| -rwxr-xr-x | net/adblock/files/adblock.sh | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/net/adblock/Makefile b/net/adblock/Makefile index d409bcc10..e7bb701bb 100644 --- a/net/adblock/Makefile +++ b/net/adblock/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adblock -PKG_VERSION:=2.7.0 +PKG_VERSION:=2.7.1 PKG_RELEASE:=1 PKG_LICENSE:=GPL-3.0+ PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org> diff --git a/net/adblock/files/README.md b/net/adblock/files/README.md index 156d6f9ab..464a90a2f 100644 --- a/net/adblock/files/README.md +++ b/net/adblock/files/README.md @@ -135,7 +135,7 @@ If you use manual configuration for unbound, then just include the following lin <pre><code> wget (default): option adb_fetch="/usr/bin/wget" - option adb_fetchparm="--no-config --quiet --no-cache --no-cookies --max-redirect=0 --timeout=10 --no-check-certificate -O" + option adb_fetchparm="--quiet --no-cache --no-cookies --max-redirect=0 --timeout=10 --no-check-certificate -O" aria2c: option adb_fetch '/usr/bin/aria2c' @@ -165,7 +165,7 @@ root@blackhole:~# /etc/init.d/adblock status **cronjob for a regular block list update (/etc/crontabs/root):** <pre><code> -0 06 * * * /etc/init.d/adblock start +0 06 * * * /etc/init.d/adblock reload </code></pre> **blacklist entry (/etc/adblock/adblock.blacklist):** diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh index 5f52203de..41c1be737 100755 --- a/net/adblock/files/adblock.sh +++ b/net/adblock/files/adblock.sh @@ -10,7 +10,7 @@ # LC_ALL=C PATH="/usr/sbin:/usr/bin:/sbin:/bin" -adb_ver="2.7.0" +adb_ver="2.7.1" adb_sysver="$(ubus -S call system board | jsonfilter -e '@.release.description')" adb_enabled=1 adb_debug=0 @@ -486,7 +486,7 @@ f_main() elif [ "${src_name}" = "shalla" ] then shalla_archive="${adb_tmpdir}/shallalist.tar.gz" - "${adb_fetch}" ${adb_fetchparm} "${shalla_archive}" "${url}" + "${adb_fetch}" ${adb_fetchparm} "${shalla_archive}" "${url}" 2>/dev/null adb_rc=${?} if [ ${adb_rc} -eq 0 ] then @@ -503,7 +503,7 @@ f_main() rm -f "${shalla_archive}" rm -rf "${adb_tmpdir}/BL" else - "${adb_fetch}" ${adb_fetchparm} "${adb_tmpload}" "${url}" + "${adb_fetch}" ${adb_fetchparm} "${adb_tmpload}" "${url}" 2>/dev/null adb_rc=${?} fi |