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

Merge pull request #2909 from dibdot/adblock

Browse source 
adblock: update 1.3.1
This commit is contained in:
Ted Hess 2016-06-30 06:48:06 -04:00 committed by GitHub
commit 60422c0de4
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/adblock/Makefile
View file

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=adblock PKG_NAME:=adblock
PKG_VERSION:=1.3.0 PKG_VERSION:=1.3.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>

12
net/adblock/files/adblock-helper.sh
View file

@ -52,7 +52,7 @@ f_envload()
# check opkg availability # check opkg availability
# #
if [ -r "/var/lock/opkg.lock" ] if [ -f "/var/lock/opkg.lock" ]
then then
rc=-10 rc=-10
f_log "adblock installation finished successfully, 'opkg' currently locked by package installer" f_log "adblock installation finished successfully, 'opkg' currently locked by package installer"
@ -246,9 +246,13 @@ f_envcheck()
f_depend "libustream-polarssl" "true" f_depend "libustream-polarssl" "true"
if [ "${package_ok}" = "false" ] if [ "${package_ok}" = "false" ]
then then
adb_fetch="$(which uclient-fetch)" f_depend "libustream-\(mbedtls\|openssl\|cyassl\)" "true"
fetch_parm="-q --timeout=${adb_fetchttl}" if [ "${package_ok}" = "true" ]
response_parm="--spider" then
adb_fetch="$(which uclient-fetch)"
fetch_parm="-q --timeout=${adb_fetchttl}"
response_parm="--spider"
fi
fi fi
fi fi
if [ -z "${adb_fetch}" ] if [ -z "${adb_fetch}" ]

6
net/adblock/files/adblock-update.sh
View file

@ -10,7 +10,7 @@
# #
adb_pid="${$}" adb_pid="${$}"
adb_pidfile="/var/run/adblock.pid" adb_pidfile="/var/run/adblock.pid"
adb_scriptver="1.3.0" adb_scriptver="1.3.1"
adb_mincfgver="2.2" adb_mincfgver="2.2"
adb_scriptdir="${0%/*}" adb_scriptdir="${0%/*}"
if [ -r "${adb_pidfile}" ] if [ -r "${adb_pidfile}" ]
@ -227,7 +227,7 @@ then
# generate a unique overall block list # generate a unique overall block list
# #
sort -u "${adb_dnsdir}/${adb_dnsprefix}."* > "${adb_tmpdir}/blocklist.overall" sort -u "${adb_dnsdir}/${adb_dnsprefix}"* > "${adb_tmpdir}/blocklist.overall"
# loop through all separate lists, ordered by size (ascending) # loop through all separate lists, ordered by size (ascending)
# #
@ -250,7 +250,7 @@ fi
# restart & check dnsmasq with newly generated set of block lists # restart & check dnsmasq with newly generated set of block lists
# #
if [ -n "${adb_revsrclist}" ] || [ "${rm_done}" = "true" ] if [ -n "${adb_revsrclist}" ] || [ -n "${mv_done}" ] || [ "${rm_done}" = "true" ]
then then
"${adb_uci}" -q delete "adblock.global.adb_dnstoggle" "${adb_uci}" -q delete "adblock.global.adb_dnstoggle"
/etc/init.d/dnsmasq restart /etc/init.d/dnsmasq restart