diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-08-21 17:48:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 17:48:40 -0700 |
| commit | b2978d83db29693c00ed44547ab2967a764ef899 (patch) | |
| tree | b0d74bd236eb8e6f0a841422fc7051f2c88164b0 | |
| parent | 4c1293e3f899cde0edf9c4b8efbf93c3bd215783 (diff) | |
| parent | b3170384c16133042a504fa911189d80294f7b43 (diff) | |
Merge pull request #13188 from stangri/18.06-simple-adblock
[18.06] simple-adblock: bugfix: update config; use command -v
| -rw-r--r-- | net/simple-adblock/Makefile | 2 | ||||
| -rw-r--r-- | net/simple-adblock/files/simple-adblock.conf | 2 | ||||
| -rw-r--r-- | net/simple-adblock/files/simple-adblock.conf.update | 1 | ||||
| -rw-r--r-- | net/simple-adblock/files/simple-adblock.init | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/net/simple-adblock/Makefile b/net/simple-adblock/Makefile index 6cc7cf504..d917628ce 100644 --- a/net/simple-adblock/Makefile +++ b/net/simple-adblock/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=simple-adblock PKG_VERSION:=1.8.3 -PKG_RELEASE:=13 +PKG_RELEASE:=15 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net> PKG_LICENSE:=GPL-3.0-or-later diff --git a/net/simple-adblock/files/simple-adblock.conf b/net/simple-adblock/files/simple-adblock.conf index d38f337ec..726116f30 100644 --- a/net/simple-adblock/files/simple-adblock.conf +++ b/net/simple-adblock/files/simple-adblock.conf @@ -18,7 +18,7 @@ config simple-adblock 'config' list blocked_domains_url 'https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt' # File size: 12.0K - list blocked_domains_url 'https://ssl.bblck.me/blacklists/domain-list.txt' + list blocked_domains_url 'https://cdn.jsdelivr.net/gh/paulgb/BarbBlock/blacklists/domain-list.txt' # File size: 44.0K list blocked_domains_url 'https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt' diff --git a/net/simple-adblock/files/simple-adblock.conf.update b/net/simple-adblock/files/simple-adblock.conf.update index 80fcf2f20..d5d666e9d 100644 --- a/net/simple-adblock/files/simple-adblock.conf.update +++ b/net/simple-adblock/files/simple-adblock.conf.update @@ -3,6 +3,7 @@ s|whitelist_domain|allowed_domain|g s|blacklist_hosts_url|blocked_hosts_url|g s|blacklist_domains_url|blocked_domains_url|g s|blacklist_domain|blocked_domain|g +s|ssl.bblck.me|cdn.jsdelivr.net/gh/paulgb/BarbBlock|g s|dbl.oisd.nl|hosts.oisd.nl|g s|raw.githubusercontent.com/StevenBlack/hosts/|cdn.jsdelivr.net/gh/StevenBlack/hosts@|g s|raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/|cdn.jsdelivr.net/gh/hoshsadiq/adblock-nocoin-list@|g diff --git a/net/simple-adblock/files/simple-adblock.init b/net/simple-adblock/files/simple-adblock.init index 69a1ff6af..40e977ab0 100644 --- a/net/simple-adblock/files/simple-adblock.init +++ b/net/simple-adblock/files/simple-adblock.init @@ -247,10 +247,10 @@ load_package_config() { . /lib/functions/network.sh . /usr/share/libubox/jshn.sh # Prefer curl because it supports the file:// scheme. - if [ -x /usr/bin/curl ]; then + if command -v curl >/dev/null 2>&1; then dl_command="curl --insecure --retry $curlRetry --connect-timeout $dlTimeout --silent" dl_flag="-o" - elif wget --version 2>/dev/null | grep -q "+https"; then + elif command -v wget >/dev/null 2>&1 && wget --version 2>/dev/null | grep -q "+https"; then dl_command="wget --no-check-certificate --timeout $dlTimeout -q" dl_flag="-O" else |