Commit Graph

77 Commits

Author SHA1 Message Date
Dirk Brenken 52b51e30f4
adblock: update 4.4.1-2
* init improvements
* jail mode fixes and improvements
* small code cleanups
* update the readme

Signed-off-by: Dirk Brenken <dev@brenken.org>
2025-05-03 14:39:07 +02:00
Dirk Brenken d10813d62f
adblock: update 4.4.0-2
* minor ETAG fixes and improvements
* permanently set the addnmount option for dnsmasq
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
2025-04-13 21:41:56 +02:00
Dirk Brenken 4857db8e28
adblock: release 4.4.0-1
* added a 'DNS Shift' option, where the generated final DNS blocklist is moved to the backup directory and
   only a soft link to this file is set in memory. As long as your backup directory is located on an external drive,
   you should activate this option to save disk space
* added ETAG-Header support to make sure to download only feeds that has been changed,
   use backups otherwise (not supported by uclient-fetch)
* removed aria2 support
* added brave as a new safesearch provider
* removed the racist terminology from the local lists and renamed it to "allowlist" and "blocklist"
* removed the 'list' and 'timer' function from init, use the LuCI feed editor and the standard cron frontend instead
* various  code changes and improvements
* major LuCI frontend changes, incl. a custom feed editor (separate commit)
* partial readme update

Signed-off-by: Dirk Brenken <dev@brenken.org>
2025-04-10 23:39:30 +02:00
Dirk Brenken bf87a6dcec
adblock: release 4.2.7-1
* optimized uci config processing (list options)
* no longer set a hardcoded confdir in dhcp/dnsmasq config
* rework suspend/resume handling
* clean up download queue handling
* various small improvements & fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
2025-03-03 21:50:26 +01:00
Dirk Brenken 162b1e693e
adblock: release 4.2.5-1
* removed needless subshell calls
* add memory measurements:
   - size of the final blocklist in MB
   - free memory in MB (MemAvailable from /proc/meminfo)
   - script max. used RAM (VmHWM from /proc/$$/status)
* optimized restart logic
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
2025-02-17 21:58:24 +01:00
Dirk Brenken 8afc26fafb
adblock: release 4.2.3-1
* optimized procd settings for better performance
* reworked autodetection functions (still broken in master due to apk migration)
* made the tld function optional, set 'adb_tld' accordingly (enabled by default)
* reworked count function
* various code improvements

Signed-off-by: Dirk Brenken <dev@brenken.org>
2024-11-23 22:15:24 +01:00
Dirk Brenken 1294b54471
adblock: update to 4.2.2-6
* fixed adblock status reporting
* optimized the mail template
* removed unanswered DNS requests from reporting
* various small fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
2024-10-10 19:00:33 +02:00
Dirk Brenken 875fcf3f12
adblock: update to 4.2.1
* added full 1Hosts feed support (4 categories)
* changed the OISD list sources to alternate wildcard domains syntax
* used only the adguard source in default config
* fixed a needless reload delay plus a few cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
2024-08-11 09:31:57 +02:00
Dirk Brenken 7b18f22e73
adblock: update to 4.2.0
* new gawk dependency
* full hagezi support (all 32 categories)
* refine Stevenblack support
* refine whitelist handling
* fixed tcpdump command line for ports other than 53 (see #24685)

Signed-off-by: Dirk Brenken <dev@brenken.org>
2024-08-09 17:16:46 +02:00
Dirk Brenken b76f6e1c16
adblock: update 4.1.5-11
* removed an accidentally commited flag of the upcoming adblock 5.x, this fixes a startup regression without trigger interface

Signed-off-by: Dirk Brenken <dev@brenken.org>
2024-06-30 19:30:11 +02:00
Dirk Brenken a029f01d81
adblock: update 4.1.5-10
* made the DNS Reporting / tcpdump parsing code more capable
* small init fixes
* update readme

Signed-off-by: Dirk Brenken <dev@brenken.org>
2024-06-27 07:47:10 +02:00
Dirk Brenken ca4c4d4fbc
adblock: update 4.1.5-3
* fixed search regression in DNS report
* removed last shallalist pointers in the init help

Signed-off-by: Dirk Brenken <dev@brenken.org>
2022-10-22 09:23:23 +02:00
Dirk Brenken f83baf221d
adblock: update 4.1.5-2
* fixed broken/blocked oisd download links (switched to the official github mirror)
* made sure that curl error out on http errors as well
* removed obsolete compatibility stuff from init script

Signed-off-by: Dirk Brenken <dev@brenken.org>
2022-10-20 11:46:47 +02:00
Dirk Brenken 0e19246d14
adblock: update 4.1.5
* made the reporting/top statistics flexible, see "top_count" parm in CLI or in LuCI (default 10), fixes #19622
* added the new blocklist source cpbl (provided by PascalCoffeeLake@gmail.com)
* added/separated Easylist/Easyprivacy blocklist sources (provided by PascalCoffeeLake@gmail.com)
* added reg_jp blocklist_source (provided by PascalCoffeeLake@gmail.com)
* removed the easylist addons from the other regional lists
* removed the second/obsolete pl regional list and renamed the first one to "reg_pl"
* updated the readme

Signed-off-by: Dirk Brenken <dev@brenken.org>
2022-10-18 13:15:26 +02:00
Dirk Brenken 54f493ed9d
adblock: update 4.1.4-2
* some more cleanups, forgotten with the last update
* optimized unbound syntax ('always_nxdomain' & 'always_transparent')
* optimized oisd download sources (use wilcard variants which are much smaller)
* removed superfluous version information/function

Signed-off-by: Dirk Brenken <dev@brenken.org>
2022-09-11 12:45:51 +02:00
Dirk Brenken 254b3d9380
adblock: update 4.1.4
* dnsmasq upstream has changed the code for domain handling
  and recommends the 'local' syntax for large blocklists
* remove pipefail command, see #19043 for reference
* removed the unused 'adb_dnsinotify' parameter
* removed the 'adb_maxqueue' parameter,
  the queue size will be automatically set by the number of cpu cores
* various cleanups, mostly shellcheck related

Signed-off-by: Dirk Brenken <dev@brenken.org>
2022-09-10 18:45:33 +02:00
Dirk Brenken 81d468489f
adblock: 4.1.3-6
* remove discontinued sources: shallalist, stalkerware
* fix a logical glitch in startup trigger handling

Signed-off-by: Dirk Brenken <dev@brenken.org>
2022-03-07 21:25:31 +01:00
Dirk Brenken c531b6daea
adblock: update to 4.1.1
* support the RPZ trigger 'RPZ-CLIENT-IP' to always allow/block certain
  clients based on their IP (currently only supported by bind!)
* avoid promiscuous mode in tcpdump setup for adblock reporting
* speed up dns report preparation
* support dns report mailing (/etc/init.d/adblock report mail)
* fix bind autodetection
* update LuCI-frontend (separate PR)
* update readme

Signed-off-by: Dirk Brenken <dev@brenken.org>
2021-04-17 16:53:30 +02:00
Dirk Brenken 215ffbe357
adblock: update 4.1.0
* major source changes:
  * split oisd.nl in basic and full variant
  * add swedish regional list
  * made archive categories for shallalist and utcapitole selectable
    via LuCI
  * made all list variants of energized and stevenblack selectable
    via LuCI
* removed dns filereset mode

Signed-off-by: Dirk Brenken <dev@brenken.org>
2021-02-26 20:52:55 +01:00
Thiago de Arruda Padilha 864092e073 adblock: fix when PROCD_RELOAD_DELAY is set
Move the "PROCD_RELOAD_DELAY" line to after the "delay" variable is set.

Signed-off-by: Thiago de Arruda Padilha <tpadilha84@gmail.com>
2020-12-23 16:59:32 -03:00
Dirk Brenken 9922c8e3e0
adblock: adapt openwrt rc.common changes
* since openwrt master has merged the depending P/R, the old
extra_help/extra_commands syntax is no longer working, see #13798 for
reference

* removed test.sh script from package

Signed-off-by: Dirk Brenken <dev@brenken.org>
2020-11-03 19:51:46 +01:00
Dirk Brenken d36fd57662
adblock: update 4.0.7
* fix aria2c download options
* fix report engine with empty domains
* fix safesearch ips of safe.duckduckgo.com (get ips dynamically)
* fix safesearch ips of safesearch.pixabay.com (get ips dynamically)
* add regional blocklist for italy
* shellcheck adjustments
* add test.sh for CI testing

Signed-off-by: Dirk Brenken <dev@brenken.org>
2020-10-18 17:06:32 +02:00
Dirk Brenken ab44d8146a
adblock: update 4.0.5-4
* remove dumb list cache
* start adblock processing after adding/removing
  list sources via CLI
* add regional list source for france

Signed-off-by: Dirk Brenken <dev@brenken.org>
2020-05-31 18:28:27 +02:00
Dirk Brenken c9f91ecc47
adblock: release 4.0.5
* update energized source urls, add ultimate variant
* switch shalla source to http (invalid server certificate)
* add another stevenblack source variant (normal / porn)
* small cornercase fixes
* update readme

Signed-off-by: Dirk Brenken <dev@brenken.org>
2020-05-23 21:15:52 +02:00
Dirk Brenken a721ef6f48 adblock: release 4.0.2
* removed 'hphosts' from sources (discontinued)
* fixed a "out of range" bug and another small issue
  in the f_dnsup function
* add three new sources: 'anudeep', 'stopforumspam' and 'youtube'
* changed 'list' behaviour, the source file has now
  a higher precedence than the archive file (see readme)
* update readme, added missing parameters & more

Signed-off-by: Dirk Brenken <dev@brenken.org>
2020-04-03 20:33:13 +02:00
Dirk Brenken b07aae26c1
adblock: release 4.0.0
* new package dependencies: coreultis-sort and
  a download util with SSL support
* focus on speed (multicore-support) to handle quite big lists
* include 38 pre-configured blocklist sources in a compressed
  json file (/etc/adblock/adblock.sources.gz)
* dynamic SafeSearch support for google, bing, duckduckgo,
  yandex, youtube and pixabay (CNAME (bind) & IP (dnsmaq, unbound))
* DNS backend autodetection
* Download Utility autodetection
* Report Interface autodetection
* Easy cron wrapper to set an adblock related auto-timer for
  automatic blocklist updates
* raw domain/blocklist support (e.g. for dnscrypt support)
* re-add restrictive Jaillist support
* rework online doc
* Complete LuCI rewrite (migrated to client side JS)

Signed-off-by: Dirk Brenken <dev@brenken.org>
2020-03-28 06:40:03 +01:00
Dirk Brenken bc299d03f2
adblock: update 3.8.11
* some more init tweaks
* update/cleanup readme

Signed-off-by: Dirk Brenken <dev@brenken.org>
2019-11-16 17:36:08 +01:00
Dirk Brenken be7a89cecb
adblock: update 3.8.10
* fix broken unbound integration

Signed-off-by: Dirk Brenken <dev@brenken.org>
2019-11-10 18:48:54 +01:00
Dirk Brenken 2c3cb6f1d1
adblock: update 3.8.9
* more startup tweaks
* re-use f_log function in helper scripts
* small fixes / polish up for forthcoming 19.07 release

Signed-off-by: Dirk Brenken <dev@brenken.org>
2019-11-06 20:29:48 +01:00
Dirk Brenken a9aae9095f
adblock: update 3.8.7
* prevent forced parallel adblock service starts
* refine service trigger

Signed-off-by: Dirk Brenken <dev@brenken.org>
2019-10-31 12:40:22 +01:00
Dirk Brenken a94610c88f
adblock: minor update 3.8.6-2
* fix service status message
* refine readme regarding reload cron job (provided by @novoid)

Signed-off-by: Dirk Brenken <dev@brenken.org>
2019-10-19 16:01:20 +02:00
Dirk Brenken 496d527080
adblock: update 3.8.6
* refine stop logic to prevent needless dns backend restarts
  and other oddities
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
2019-09-16 10:49:37 +02:00
Dirk Brenken 45cb0e1023
adblock: update 3.8.5
* use raw procd interface trigger as last resort, if the
  adblock config is not available during startup
* fix selective subdomain whitelisting for dnsmasq
* fix a kresd restart issue with 'DNS File Reset'
* fix a suspend/resume cornercase
* disable the tld compression, if the number of blocked domains
  is greater than 'adb_maxtld' (default: 100000)
* made the fw portlist configurable (default '53 853 5353')
* preliminary support for inotify-like autoload features
  of dns backends like kresd in future Turris OS. If 'adb_dnsinotify'
  is set to 'true', all adblock related restarts and the
  'DNS File Reset' will be disabled

Signed-off-by: Dirk Brenken <dev@brenken.org>
2019-09-06 11:08:07 +02:00
Dirk Brenken 504412ccdb
adblock: release 3.8.0
* add support for 'DNS File Reset', where the final DNS blockfile
  will be purged after DNS backend loading (save storage space).
  A small background service will be started to trace/handle
  dns backend reloads/restarts
* add support for the 'null' blocking variant in dnsmasq
  (via addn-hosts), which may provide better response times
  in dnsmasq
* enhance the report & search engine to support
  the new blocking variants. Search now includes
  backups & black-/whitelist as well
* compressed source list backups are now mandatory (default to '/tmp')
* speed up TLD compression
* E-Mail notification setup is now integrated in UCI/LuCI
* update the LuCI frontend to reflect all changes (separate PR)
* drop preliminary dnscrypt-proxy-support (use dnsmasq instead)
* drop additional 'dnsjail' blocklist support (not used by anyone)
* procd cleanups in init
* various shellcheck cleanups
* update readme

Signed-off-by: Dirk Brenken <dev@brenken.org>
2019-08-16 05:08:58 +02:00
Dirk Brenken 6216168262 adblock: release 3.6.3
* the DNS Report now displays the hostname, MAC-Address or
  client IP (CLI & LuCI)
* Filter the DNS Query result set for a particular domain, client or
  time frame (CLI & LuCI)
* remove needless XHR.Poll-Events from Reporting page in LuCI
* remove needless 'force sort' option in LuCI

Signed-off-by: Dirk Brenken <dev@brenken.org>
2019-01-14 15:58:13 +01:00
Dirk Brenken 4e8d22eced adblock: release 3.6.0
* add adblock dns query reporting via tcpdump (see readme for details)
* fix tld compression on low memory systems (< 64 MB)
* fix various small issues

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-12-19 17:32:29 +01:00
Dirk Brenken 4987f066f9 adblock: update 3.5.5
* accept only ascii aka punycode chars in blocklists to prevent possible
dns backend warnings
* fix cornercase issues in json parsing (backend & frontend)
* slightly optimize tld compression performance
* refine logging
* use uci wrapper where possible
* change indentation from spaces to tabs (saves 8kb)
* add experimental youtube blocklist source

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-09-01 08:35:35 +02:00
Dirk Brenken eb2891cd99 adblock: 3.5.4
backend:
* add low priority mode (nice level 10), disabled by default
* enhance 'Force DNS' to redirect ports 53, 853 and 5353

frontend:
* switch to dynamic XHR polling for runtime information and logfile
viewing
* add new 'Refresh' button to reload blocklists
* various cleanups & small fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-21 22:27:04 +02:00
Dirk Brenken ba6d67883a adblock: update 3.5.1
* maintenance update, just small backend bugfixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-02-20 15:30:52 +01:00
Dirk Brenken c3098f69d0 adblock: update 3.4.3
* add pidfile writing / check to prevent further race conditions
* ease the download utility selection: uclient-fetch (default),
  wget, curl, aria2c, wget-nossl, busybox-wget are pre-configured
* add debug download logging in case of an error, e.g. wrong url
* change 'malware' blocklist source url
* add logfile information to email template
* LuCI: add 'Download Utility' select box
* LuCI: add new "running" status

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-01-10 22:28:53 +01:00
Dirk Brenken 35234924cb adblock: update 3.4.1
* enable code to support Turris Omnia forthcoming upstream change
  (new kresd 'keep_cache' option) to preserve kresd DNS cache
* fix a 'status' race condition while the adblock process
  is running in parallel
* various small speed improvements
* rework debug output
* refine blacklist handling
* enable the (empty) blacklist source in the default config
* email notification supports mstmp, even without sendmail symlink
* email notification writes minimal status to log (one-liner)
* LuCI: refine logfile search term
* LuCI: Textarea 'autoscroll down' in logfile view
* LuCI: Left-align blocklist source table plus a more compact design

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-01-05 20:25:28 +01:00
Dirk Brenken d699afd7fe adblock: release 3.4.0
* preserve DNS cache after adblock processing,
  - 'unbound' and 'named' support this (please check readme)
  - 'dnsmasq' now uses the 'servers-file' directive
    to minimize the reload disruption,
    even though the dns cache will be cleared after SIGHUP
  - 'kresd' dns cache is persistent by upstream default, anyway
    Turris Omnia devices need a small upstream software change
    which is not accepted/implemented yet
* email notification in case of an error or domain count < n
  (default 0, check readme)
* removed securemecca from default config (service has been closed)
* new separate functions for hash compare and list/overall count
* add missing package dependencies
* various clean-ups
* update documentation

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-12-28 18:11:17 +01:00
Dirk Brenken 206c847bb5 adblock: release 3.0
* add kresd & turris omnia support
* add dnscrypt-proxy support
* change start priority to 30, to fix possible trigger issues on slow
booting hardware
* simplify suspend/resume handling (no longer use a hideout directory)
* enhanced LuCI frontend
* many small changes & improvements
* default config change (please update your config!), adblock is now
disabled by default
* documentation update

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-09-09 19:45:36 +02:00
Dirk Brenken 6ffae3bc1e adblock: maintenance update 2.6.3
backend:
* various small fixes & optimizations
 
LuCI frontend (see luci repo):
* Limit Blacklist/Whitelist Online editing to max. 512 KB, approx.
20.000 domains per list
* Automatically refresh the overview page after button onclick event,
e.g. 'Suspend/Resume' or 'Save & Apply'
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-05-08 11:19:57 +02:00
Dirk Brenken fcc91afc65 adblock: update 2.6.0-2
* change start priority to get all interface trigger events, even on
fast hardware
* made default trigger delay more conservative to fix possible start up
issues

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-04-17 17:54:37 +02:00
Dirk Brenken 45af003ba1 adblock: update 2.6.0
* no longer misuse ubus/procd service object for adblock runtime 
  information, now save all required information directly 
  in a JSON file/format (/tmp/adb_runtime.json)
* new 'status' init command to print runtime information
* add a configurable interface trigger timeout for 
  nested or slow modem/router setups,
  set 'adb_triggerdelay' accordingly (default 1 second)
* add support for pure http download utilities like wget-nossl 
  or uclient-fetch without libustream-ssl (http donwloads only!)
* fix stop action
* fix enabled/disabled action
* fix country code in regional list for china
* LuCI update to reflect all changes

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-04-12 15:54:11 +02:00
Dirk Brenken 1fdf5d1e7e adblock: update 2.5.1
* re-order all regional lists in adblocklist/easylist format
    * add polish blocklist
    * add chinese blocklist
    * lists called now 'reg_<ch|pl|ro|ru>'
* changed interface trigger default in config to 'wan' only
* update / sync LuCI frontend (see luci repo for details)
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-04-04 14:15:30 +02:00
Dirk Brenken 9e3f88916f adblock: update 2.5.0
* revamp LuCI GUI (see luci repo for details)
* integrated runtime statistics in normal adblock ubus service instance
(see readme)
* simplified boot/init
    * no longer use raw interface trigger
    * use only network interface trigger, pre-configured for
'wan/wwan/lan' interfaces (see readme)
    * fixed a reload issue
* removed switch to disable tld compression (seems to be pretty stable)
* muted awk parser if source list contains incorrect records
* raise dns backend timeout to 20 seconds
* documentation update
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-03-26 06:47:23 +02:00
Dirk Brenken ed470f0dcc adblock: release 2.4.0
* add tld compression,
  this new "top level domain compression" removes up to 40 thousand
  needless host entries from the block lists and
  lowers the memory footprint for the dns backends by 8-10 MByte
* optimize restart behavior in case of an error
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-02-28 16:52:10 +01:00
Dirk Brenken 5cf40c94ee adblock: update 2.3.1
* various optimizations & corner case fixes
* removed no longer needed debug information
* polished up for forthcoming LEDE release ;-)

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-02-16 15:18:41 +01:00