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

Merge pull request #14212 from stangri/master-simple-adblock

Browse source 
simple-adblock: bugfix - config update
This commit is contained in:
Rosen Penev 2020-12-14 13:37:13 -08:00 committed by GitHub
commit f520c50585
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
net/simple-adblock/Makefile
View file

@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=simple-adblock
PKG_VERSION:=1.8.4
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
PKG_LICENSE:=GPL-3.0-or-later
@ -31,12 +31,6 @@ define Package/simple-adblock/conffiles
/etc/config/simple-adblock
endef
define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)/files/
$(CP) ./files/simple-adblock.init $(PKG_BUILD_DIR)/files/simple-adblock.init
sed -i "s|^\(PKG_VERSION\).*|\1='$(PKG_VERSION)-$(PKG_RELEASE)'|" $(PKG_BUILD_DIR)/files/simple-adblock.init
endef
define Build/Configure
endef
@ -45,7 +39,8 @@ endef
define Package/simple-adblock/install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/simple-adblock.init $(1)/etc/init.d/simple-adblock
$(INSTALL_BIN) ./files/simple-adblock.init $(1)/etc/init.d/simple-adblock
sed -i "s|^\(PKG_VERSION\).*|\1='$(PKG_VERSION)-$(PKG_RELEASE)'|" $(1)/etc/init.d/simple-adblock
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./files/simple-adblock.conf $(1)/etc/config/simple-adblock
$(INSTALL_DIR) $(1)/tmp

3
net/simple-adblock/files/simple-adblock.conf
View file

@ -38,9 +38,6 @@ config simple-adblock 'config'
# File size: 20.0K
list blocked_hosts_url 'https://cdn.jsdelivr.net/gh/hoshsadiq/adblock-nocoin-list/hosts.txt'
# File size: 36.0K
list blocked_hosts_url 'https://www.malwaredomainlist.com/hostslist/hosts.txt'
# File size: 80.0K
list blocked_hosts_url 'https://pgl.yoyo.org/as/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext'

3
net/simple-adblock/files/simple-adblock.conf.update
View file

@ -9,4 +9,5 @@ s|raw.githubusercontent.com/StevenBlack/hosts/|cdn.jsdelivr.net/gh/StevenBlack/h
s|raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/|cdn.jsdelivr.net/gh/hoshsadiq/adblock-nocoin-list@|g
s|raw.githubusercontent.com/jawz101/MobileAdTrackers/|cdn.jsdelivr.net/gh/jawz101/MobileAdTrackers@|g
s|http://winhelp2002.mvps.org/hosts.txt|https://winhelp2002.mvps.org/hosts.txt|g
/dshield.org/d
\|dshield.org|d
\|www.malwaredomainlist.com/hostslist/hosts.txt|d

29
net/simple-adblock/files/simple-adblock.init
View file

@ -9,12 +9,21 @@ START=94
USE_PROCD=1
LC_ALL=C
if type extra_command 1>/dev/null 2>&1; then
extra_command 'check' 'Checks if specified domain is found in current block-list'
extra_command 'dl' 'Force-downloads all enabled block-list'
extra_command 'sizes' 'Displays the file-sizes of enabled block-listo'
extra_command 'show' 'Shows the service last-run status'
extra_command 'version' 'Show version information'
else
# shellcheck disable=SC2034
extra_command "check" "Checks if specified domain is found in current block-list"
extra_command "dl" "Force-downloads all enabled block-list"
extra_command "sizes" "Displays the file-sizes of enabled block-listo"
extra_command "show" "Shows the service last-run status"
extra_command "version" "Show version"
EXTRA_COMMANDS='check dl killcache sizes show version'
# shellcheck disable=SC2034
EXTRA_HELP=' check Checks if specified domain is found in current block-list
dl Force-downloads all enabled block-list
sizes Displays the file-sizes of enabled block-lists
show Shows the service last-run status'
fi
readonly packageName='simple-adblock'
readonly serviceName="$packageName $PKG_VERSION"
@ -741,13 +750,13 @@ process_config_update() {
output 2 "[DL] Config Update: $label $__FAIL__\\n"
tmpfs add error "errorDownloadingConfigUpdate"
else
if ! sed -f "$R_TMP" -i /etc/config/simple-adblock; then
if [ -s "$R_TMP" ] && sed -f "$R_TMP" -i /etc/config/simple-adblock; then
output 1 "$_OK_"
output 2 "[DL] Config Update: $label $__OK__\\n"
else
output 1 "$_FAIL_"
output 2 "[DL] Config Update: $label $__FAIL__\\n"
tmpfs add error "errorParsingConfigUpdate"
else
output 1 "$_OK_"
output 2 "[DL] Config Update: $label $__OK__\\n"
fi
fi
rm -f "$R_TMP"
@ -1213,7 +1222,7 @@ stop_service() {
}
service_triggers() {
procd_add_reload_trigger 'simple-adblock'
procd_add_config_trigger "config.change" "$packageName" /etc/init.d/$packageName reload
}
check() {