Commit graph

48 commits

Author SHA1 Message Date
Stan Grishin
fff884e67f simple-adblock: bugfix: add dnsmasq.nftset to uci_load_validate
* fixes https://github.com/openwrt/openwrt/issues/11481 thanks to:
* https://github.com/mistepien for reporting
* https://github.com/dave14305 for diagnosing

Signed-off-by: Stan Grishin <stangri@melmac.ca>
2022-12-12 21:43:09 +00:00
Stan Grishin
3950f0ce99 simple-adblock: support new OISD dnsmasq config
* OISD dnsmasq config files switched from using address= to server=

Signed-off-by: Stan Grishin <stangri@melmac.ca>
2022-12-10 01:57:37 +00:00
Stan Grishin
8047d2ccb7 simple-adblock: localizable error/warning messages
* store all error/warning messages with the error text id so that
  they can be made localizable for the luci app

Signed-off-by: Stan Grishin <stangri@melmac.ca>
2022-11-29 22:39:12 +00:00
Stan Grishin
cc10774e6e simple-adblock: bugfix: detect dnsmasq ipset support
* Fixes https://github.com/openwrt/packages/issues/19978, thank you
  @parona-source for the report/patch!

Signed-off-by: Stan Grishin <stangri@melmac.ca>
2022-11-28 21:20:43 +00:00
Stan Grishin
f11ce28baf simple-adblock: update to 1.9.3-1
* introduce the new curl_max_file_size option
* prevent warnings/errors to be displayed each time the load_environment
  is invoked
* better organize dl_command appendixes
* implement support for downloading/using external dnsmasq config file
* refactor adb_check and adb_allow for better readability
* update default values for some options in the uci_load_validate call
* update reload trigger to include curl options

Signed-off-by: Stan Grishin <stangri@melmac.ca>
2022-11-14 18:50:29 +00:00
Stan Grishin
7393b74457 simple-adblock: update to 1.9.2-4
* update default config file to list options alphabetically
* rearrange some of the init script code to support transition
  of WebUI to javascript
* rename wan6_trigger to procd_trigger_wan6 for readability

Signed-off-by: Stan Grishin <stangri@melmac.ca>
2022-11-04 00:58:40 +00:00
Stan Grishin
188d332840 simple-adblock: service_triggers improvements
Signed-off-by: Stan Grishin <stangri@melmac.ca>
2022-10-24 16:57:56 +00:00
Stan Grishin
ef067f6304 simple-adblock: remove unnecessary procd_add_reload_interface_trigger
Signed-off-by: Stan Grishin <stangri@melmac.ca>
2022-10-21 11:48:49 +00:00
Stan Grishin
3ba54553ca simple-adblock: update to 1.9.2-1
* make PKG_VERSION of the init script readonly to remove shellcheck
  exception
* replace exit with return in the the procd scripts per:
  https://github.com/openwrt/packages/pull/19617
* remove custom boot() function as it prevented creation of procd
  firewall object on start on boot
* improve performance of allowing domains code

Signed-off-by: Stan Grishin <stangri@melmac.ca>
2022-10-18 10:23:09 +00:00
Stan Grishin
9156ef6507 simple-adblock: allow domains bugfix & canary domains support
* fix bug in download_lists and adb_allow to prevent unintended exclisions from
  the block-lists of domains containing allowed domain. Fixes issue:
  https://github.com/stangri/source.openwrt.melmac.net/issues/160
* add support for returning NXDOMAIN/blocking iCloud & Mozilla canary domains,
  disabled by default

Signed-off-by: Stan Grishin <stangri@melmac.ca>
2022-10-01 23:11:38 +00:00
Stan Grishin
f8c5fd93e7 simple-adblock: update to 1.9.1-1
* remove obsolete block-lists from config
* add removal of obsolete lists to config-update
* add AdGuard team's block-list to config
* improve allow command
* improve nftset support
* move config load to uci_load_validate, which required some code refactoring which
  looks dramatic, but isn't
* always use dnsmasq_restart instead of dnsmasq_hup for all dns resolution options
  for dnsmasq

Signed-off-by: Stan Grishin <stangri@melmac.ca>
2022-09-25 12:25:40 +00:00
Stan Grishin
717499e62b simple-adblock: bugfix for allow command
Signed-off-by: Stan Grishin <stangri@melmac.ca>
2022-08-26 18:43:45 +00:00
Stan Grishin
3b686b08a5 simple-adblock: update to 1.9.0-1
* Update maintainer's email address
* Style Make and init file to OpenWrt standard
* Rename dnsmasq and unbound-related variables to better reflect
  their use
* New 'allow' CLI parameter to quickly unblock domain(s)
* Switch to uci wrappers
* Beautify the output of the 'check' CLI parameter
* Better handling of output files directory creation error
* Support for (upcoming) dnsmasq nftsets

Signed-off-by: Stan Grishin <stangri@melmac.ca>
2022-08-19 21:44:12 +00:00
Stan Grishin
d11f310230 simple-adblock: update to 1.8.8-1
* update 'check' function

Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-10-15 21:25:14 +00:00
Stan Grishin
94e53c0b3b simple-adblock: delete obsolete iptables-dependent function
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-10-06 22:40:00 +00:00
Jan Baier
ada9d25ef7 simple-adblock: Call killall with the -s
Some versions of killall do support the `killall -SIGNAL` syntax and
have only `-s SIGNAL` which should be supported everywhere.

I see the problem with *killall (PSmisc) 23.3* on latest TurrisOS 5.2

Signed-off-by: Jan Baier <jan.baier@amagical.net>
2021-09-08 17:13:52 -04:00
Stan Grishin
699447cdb3 simple-adblock: update to 1.8.7-6
* supports newer shellcheck
* restore EXTRA_COMMANDS compatibility with 19.07
* move status display from various functions to status_service
* bugfix: status_service line break after output
* minor arythmetic fix in status_service

Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-08-02 07:03:36 +00:00
Stan Grishin
231d40053b simple-adblock: update to 1.8.7-3
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-04-10 17:08:51 -07:00
Stan Grishin
e695cc26b0 simple-adblock: jsonOps-related bugfixes
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-03-17 22:21:05 -10:00
Stan Grishin
36e2e3fce2 simple-adblock: update to 1.8.5-1
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-03-08 10:25:11 +00:00
Stan Grishin
182cc9920e simple-adblock: remove dependency on jsonfilter & old code
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-02-02 22:11:06 +00:00
Stan Grishin
95586689f5 simple-adblock: config update
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-12-18 22:04:59 -06:00
Stan Grishin
22722a8095 simple-adblock: bugfix - config update
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-12-12 15:58:21 -06:00
Florian Eckert
04e52a13c4 simple-adblock: use new extra_command function definition
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-11-04 08:50:34 +01:00
Stan Grishin
92e6b29920 simple-adblock: config update file fix
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-10-09 09:20:55 -10:00
Stan Grishin
d7de7813b4 simple-adblock: add config auto-update feature
Signed-off-by: Stan Grishin <stangri@melmac.net>

shellchecked

Signed-off-by: Stan Grishin <stangri@melmac.net>

shellchecked

Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-09-20 01:00:06 +00:00
Stan Grishin
492a49fcc5 simple-adblock: bugfix: update config; use command -v
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-08-21 23:29:02 +00:00
Stan Grishin
e7d2563c57 simple-adblock: README and config update
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-08-04 22:50:39 +00:00
Stan Grishin
3167c3c4c0 simple-adblock: racially-neutral names
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-06-13 20:39:00 +00:00
Stan Grishin
eb398862b5 simple-adblock: remove obsolete dshield.org links from config
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-06-08 17:35:32 +00:00
Stan Grishin
901159b8c7 simple-adblock: bugfix: proper error reporting on failed downloads; lists update script
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-05-27 00:25:57 +00:00
Stan Grishin
c805064a7d simple-adblock: bugfix: start downloads on cold boot
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-04-22 17:45:53 +00:00
Stan Grishin
5df3acdf10 simple-adblock: bugfixes: remove escape chars from log, restore from cache on boot
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-04-07 21:55:22 +00:00
Stan Grishin
49dbec35f6 simple-adblock: support multiple dnsmasq instances; rework communication between principal package and luci app
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-03-29 05:13:07 +00:00
Petr Štetiar
8383c19b90 treewide: fix service status command in procd compatible services
Fix breaking change introduced in the main tree with a commit
7519a36774ca ("base-files,procd: add generic service status") where the
old service `status` callback function doesn't work anymore and needs to
be renamed to `status_service`.  This name was chosen for consistency
with start and stop function callbacks, which are using `start_service`
and `stop_service` naming schemes.

While at it, fix whitespace issues in the status_service as well.

Ref: http://lists.infradead.org/pipermail/openwrt-devel/2019-September/019035.html
Reported-by: Dirk Brenken <dev@brenken.org>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
2019-11-18 06:28:57 +01:00
Stan Grishin
756bbb7afd simple-adblock: bugfix: proper dnsmasq reload on stop, rework start/stop logic
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-10-06 09:33:33 -07:00
Stan Grishin
54f4487af1 simple-adblock: bugfix and improvements (check description)
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-10-03 18:41:49 -07:00
Stan Grishin
c6beee74f9 simple-adblock: dnsmasq.ipset option support, better handling of IDNs, updated README
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-09-24 09:11:45 -07:00
Stan Grishin
eaab320a46 simple-adblock: move to POSIX compliance, better output on check, better bg process data collection.
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-08-22 21:14:42 -07:00
Stan Grishin
f7393b8813 simple-adblock: boot-up optimization
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-08-22 16:34:14 -07:00
Stan Grishin
b4d32b17fb simple-adblock: support for varios DNS resolvers/options
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-08-17 06:09:31 -07:00
Stan Grishin
79245d4552 simple-adblock: options to filter non-ASCII domains, local compressed storage
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-07-04 15:38:58 -07:00
Stan Grishin
ac34bf910e simple-adblock: better download processing, luci-app integration, lists optimization, firewall integration
Signed-off-by: Stan Grishin <stangri@melmac.net>
2018-07-16 17:41:39 -07:00
Stan Grishin
4c06b95a34 simple-adblock: better start/stop/reload/uninstall
Signed-off-by: Stan Grishin <stangri@melmac.net>
2018-01-25 19:35:52 -08:00
Stan Grishin
1897a04774 simple-adblock: new boot logic
Signed-off-by: Stan Grishin <stangri@melmac.net>
2017-12-26 14:13:38 -08:00
Stan Grishin
c398c0a768 simple-adblock: updated README, used stricter filters for domains and hosts lists, added debugging logging, removed PROCD instance.
Signed-off-by: Stan Grishin <stangri@melmac.net>
2017-05-08 03:57:04 +03:00
Stan Grishin
281c4f8ec9 simple-adblock: update domains/hosts filters, README. 2017-03-30 17:16:20 -07:00
Stan Grishin
7ac3fcd9fd simple-adblock: initial commit
simple-adblock: version 1.5 introduces background processing of downloaded list while the next list is being downloaded

Signed-off-by: Stan Grishin <stangri@melmac.net>
2017-03-14 21:33:16 -07:00