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

adblock: update 2.7.1

Browse source 
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>
This commit is contained in:
Dirk Brenken 2017-06-09 20:19:56 +02:00
parent 617448dc93
commit 88be3d2d49
3 changed files with 6 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:=2.7.0 PKG_VERSION:=2.7.1
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>

4
net/adblock/files/README.md
View file

@ -135,7 +135,7 @@ If you use manual configuration for unbound, then just include the following lin
<pre><code> <pre><code>
wget (default): wget (default):
option adb_fetch="/usr/bin/wget" 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: aria2c:
option adb_fetch '/usr/bin/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):** **cronjob for a regular block list update (/etc/crontabs/root):**
<pre><code> <pre><code>
0 06 * * * /etc/init.d/adblock start 0 06 * * * /etc/init.d/adblock reload
</code></pre> </code></pre>
**blacklist entry (/etc/adblock/adblock.blacklist):** **blacklist entry (/etc/adblock/adblock.blacklist):**

6
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="2.7.0" adb_ver="2.7.1"
adb_sysver="$(ubus -S call system board | jsonfilter -e '@.release.description')" adb_sysver="$(ubus -S call system board | jsonfilter -e '@.release.description')"
adb_enabled=1 adb_enabled=1
adb_debug=0 adb_debug=0
@ -486,7 +486,7 @@ f_main()
elif [ "${src_name}" = "shalla" ] elif [ "${src_name}" = "shalla" ]
then then
shalla_archive="${adb_tmpdir}/shallalist.tar.gz" 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=${?} adb_rc=${?}
if [ ${adb_rc} -eq 0 ] if [ ${adb_rc} -eq 0 ]
then then
@ -503,7 +503,7 @@ f_main()
rm -f "${shalla_archive}" rm -f "${shalla_archive}"
rm -rf "${adb_tmpdir}/BL" rm -rf "${adb_tmpdir}/BL"
else else
"${adb_fetch}" ${adb_fetchparm} "${adb_tmpload}" "${url}" "${adb_fetch}" ${adb_fetchparm} "${adb_tmpload}" "${url}" 2>/dev/null
adb_rc=${?} adb_rc=${?}
fi fi