3.1.0

README.md

@@ -33,8 +33,8 @@ hBlock is available in various package managers. Please check the [PACKAGES.md](
 The latest available version can also be installed manually by running the following commands:
 
 ```sh
-curl -o /tmp/hblock 'https://raw.githubusercontent.com/hectorm/hblock/v3.0.1/hblock' \
-  && echo '8fa1ecde0ae9fe082cf875100eda25abc66e3a5b32ffb2448f61d44c05f050eb  /tmp/hblock' | shasum -c \
+curl -o /tmp/hblock 'https://raw.githubusercontent.com/hectorm/hblock/v3.1.0/hblock' \
+  && echo '2ad4767e2e96213405e20fec15230b7f32eed239335873871d2f5ccab2ba11b5  /tmp/hblock' | shasum -c \
   && sudo mv /tmp/hblock /usr/local/bin/hblock \
   && sudo chown root:root /usr/local/bin/hblock \
   && sudo chmod 755 /usr/local/bin/hblock

SHA256SUMS

@@ -2,24 +2,24 @@ f085812d0e494f6c03035551806c7cc44d90c922dbe1e189b2fe2f85da16a492  ./BSDmakefile
 ef390c46c1e99baf156db9a342b71e64ec5f11c750b577d8717ea68ea60f083f  ./LICENSE.md
 a4d3fb77aec581c6dac489ab62c2e7dd6a662c0040d92a1cff86339acbaf93b1  ./Makefile
 c99a1b4763bb20fa974c56f121d5b99cebaa5abc720602d1c58ba81701650755  ./PACKAGES.md
-f1c99889366fccfbc1bc99d711ab5f4f2cf396f15b32faf0c3c2adcba21ee8ee  ./README.md
+b8023ba5d3bf207cfda60e9d3d3ded700219e16c6d29e210925d4bd87dd12587  ./README.md
 04f2b68ee78326f929f17b6b32862ea24a6539f6e46e95619cda4b1c437a22aa  ./SOURCES.md
-f60632b299be06996c11a3d7d27ff82767702dd211db86ac32672550a95936f9  ./dist/hosts
-8fc6bc53b384cbd176a14906a941c0d4e8eb28b9a668bb0f92abc315eb0d20cb  ./dist/hosts_adblock.txt
-7c808728282fab324790c9d744d384c7898ea57cf425f693714c55e6b078e375  ./dist/hosts_dnsmasq.conf
-3c8f7d3d2d046f45be01fa01ffef24cb77b8aa11eea484ca16ae0dab24621551  ./dist/hosts_domains.txt
-98002806c5d6549bc10814c6e8afcc890abd6942d51d00b8ccbad3ac7bddcfb4  ./dist/hosts_rpz.txt
-2721075b036a0af25d3745aae091dd6cbde9158f984c09dc41703cdf220eaebc  ./dist/hosts_unbound.conf
-268b68c8356e55bd832e73664fc35e05f0927240a46168e1a96898001258d1ba  ./dist/hosts_windows.ps1
-8fa1ecde0ae9fe082cf875100eda25abc66e3a5b32ffb2448f61d44c05f050eb  ./hblock
-836f17b25239edea065c6cd58d1616e6ff3e99e8e6d66f0b3e9f189b0973b5be  ./hblock.1
-db5cd52d669a9f885c17d614f309bf55c88ecb3635cc682c7d7dabd858db9c3d  ./hblock.1.md
-a6b4f3ed4bf8089ef4b5fbf5eb3197bd8e946e1dc8e573ae95b7a5a8155541f3  ./resources/alt-formats/adblock.txt.sh
-a93f58b8dcb94510f7b1134112e399ec30df0755042d50122a6006394c90d5f5  ./resources/alt-formats/dnsmasq.conf.sh
-a98474fd8f4bf11d977aa4ebdd2bc787b1a869a2166a250eec8cb222ad9e3736  ./resources/alt-formats/domains.txt.sh
-6ddf135eb802a6eb9cd425b46eaad38343dce2e6a2e0208f87b2b04d573809c2  ./resources/alt-formats/rpz.txt.sh
-c81e3233cdc57c871a2c1ea1385051b4009f7894e94c4ef42865a79d1734d543  ./resources/alt-formats/unbound.conf.sh
-68a3bdb971c646e6003e6d0effaf52acebcb7536fef8670e82cdded2fc8ada01  ./resources/alt-formats/windows.ps1.sh
+c7992361e67e1fb1907d7a43e333d6926963302dcfb8c0f165c8f8f5d1fe3a6a  ./dist/hosts
+c72169584416adb1983916169ddff9ca0fd0b213021f91ef6e9c5309b0aa1856  ./dist/hosts_adblock.txt
+2b819158d5c12e15904f53390693dd5d66008a66cc24f8fba54a882121c9897f  ./dist/hosts_dnsmasq.conf
+a63409e45db59278c0988ad9ab2003ed17b3c9ea918b405e58ab9a9308b5bf2d  ./dist/hosts_domains.txt
+d429f983ecff63555b401548d598801a62b7688652211e704a5e76c174225da5  ./dist/hosts_rpz.txt
+bf8d0f73e15e7ad5fe3f7f14c46ef55d40f5f105c5d0f1560d1afe14ab4c83a6  ./dist/hosts_unbound.conf
+302f139bdc8a38ce955a977b23f815f9ca27bcc2ad67ad6a66d45e933f16724a  ./dist/hosts_windows.ps1
+2ad4767e2e96213405e20fec15230b7f32eed239335873871d2f5ccab2ba11b5  ./hblock
+aeb83bb8bc47b26c7c9cd386197f1623c5a9bfcbcf21dbc4d057c12348bf7f0c  ./hblock.1
+ddcf2b30ff0d0c03d59cfd945e49fc5fe254eec53a29d4adf81ffa2030cd00e7  ./hblock.1.md
+15e21227cac4639a4e0b80cbff608a4233e497937f9a20de78c37fdd312dff3a  ./resources/alt-formats/adblock.txt.sh
+2e8e76cae31bcc230350eed5ad6a33c58ca10dac3091e42904b8ff05166980d8  ./resources/alt-formats/dnsmasq.conf.sh
+824ae2e55212d898fa59131184a8a66d5f84e76b6d7981a3328c581de57784c6  ./resources/alt-formats/domains.txt.sh
+57daf2e4def7e5ba52997e71d7dc9d879004bbde196b008a743bb078cb4ee7b9  ./resources/alt-formats/rpz.txt.sh
+8d1680bbdb9959d03e21ab357c72a267cf27cde8296de500b5c8540373564756  ./resources/alt-formats/unbound.conf.sh
+b6408f747c8f0628775d25afd568e22c89da13e44f0a57abd2a7eb0778f8ee3c  ./resources/alt-formats/windows.ps1.sh
 c1a8375d428594d512c7c28dc511ce04389be99195e6d07db3c24bbec1bbea8f  ./resources/index/index.sh
 85528af6d76a88c3d3e3d2c9995c96b0cda230103f518e78e0fe1b0cb91d6e93  ./resources/logo/bitmaps/logo-a-ffffff-h100.png
 f24d6b9b22570206b9fef0185584ddecce0648f997787d1b26a27ec5dc52972e  ./resources/logo/bitmaps/logo-a-ffffff-h125.png
@@ -111,38 +111,58 @@ cad7f22956ffdfa88dbd51ab7b59b22eb5abf188cb9ba114817da3148df991ba  ./resources/pa
 9eec6d7c0acd3bd2bdc8026e434b2033ec59ea5fd6ec7192e85b3bef162aa5cc  ./resources/packaging/pkgbuild.sh
 a1ffc87bd32faccd591894d51caabf0497059420bce80290d46783a4eaef21d5  ./resources/packaging/rpm/SPECS/hblock.spec.m4
 60b3447651458430a1f55be0283392ea69137f8f28328a28f4f3021e6efcde11  ./resources/packaging/rpm.sh
-1b5f9c9ac085c97bd98be4d7b3e9fb0f3842c2422b531d0371ad3695abf753ed  ./resources/stats/stats.sh
-45cbb63edc31640b6bfc0190bddaf33aeb4d2f6995577490b510861c28811ecc  ./resources/systemd/README.md
+50adc86cb600d4f63bf82570c58a754006bcfbe038dbe8dd057c4c5cc5a46f60  ./resources/stats/stats.sh
+54a9c066567bb5788261af8a7f27def2f5f255864d1ce8653532b777f5df5860  ./resources/systemd/README.md
 08b736382cb9dfd39df1207a3e90b068f5325a41dc8254d83fde5d4540ba8b5b  ./resources/systemd/hblock.service
 87a7ba5067d4c565aca96659b0dce230471a6ba35fbce1d3e9d02b264da4dc38  ./resources/systemd/hblock.timer
+c9a68d6ca6f5587ee067fb0adc63647d6706b631f933f21934b3dc11b85c3e7a  ./resources/tests/allowlist.txt
+2bb81762f47637e71432e9c3af56c14781257af62ca4b65845a74780903f1d25  ./resources/tests/denylist.txt
 459412137a4bb740d5bf7326290dc9bb247c73eb4fda8681c560c6c73e5c04c0  ./resources/tests/domains.txt
-326e64c245a0740f38afc460cc556e51498e91cd7ced5a8ac87551a1c7e5ac4e  ./resources/tests/env.sh
+c027aa84afb49f8518eec4a2d2c53cb98933604f624fd49cd01d7a184ec0506a  ./resources/tests/env.sh
+db291a8f8446627b69b23bb661fb80bd1cd2b1b775fc54ac82a36427c66462a2  ./resources/tests/footer.txt
+c82670a261e606bc0bd4af9dd2981ff97fc18b141ca20c5832f551b5e7ce8fc4  ./resources/tests/header.txt
 e6be083dcc0ffa74565447923c973efdc45a03636c8802c68be6d60321d67a41  ./resources/tests/psl.txt
 db8c6f455877d81007c9530a15f84b657a7d174db26ef4a4d999adc7eacd1f05  ./resources/tests/sources.txt
-385d16302250983ee0e37a72d9ce2abe63d9184572984652214a7b7c2eeb77f9  ./resources/tests/test-main-comment-opt.out
-08c91ee861cdb09d01520d99854e11ea4473b5ca8270a90dc2523e6f92f146af  ./resources/tests/test-main-comment-opt.sh
-fd154846a8af8fdade0ab9c3cfc7f7056889b81ce106937751e86e5bf73e5222  ./resources/tests/test-main-default-opts.out
-9c069d704d6d6aa3a22326f0445dae082e03cd4bc30deb7ab5150e60770fe370  ./resources/tests/test-main-default-opts.sh
-fd154846a8af8fdade0ab9c3cfc7f7056889b81ce106937751e86e5bf73e5222  ./resources/tests/test-main-double-dash-arg.out
-1707eab046e584c4f3e44b4ce7e38d2d7b447020bad451566ee22743293d12c4  ./resources/tests/test-main-double-dash-arg.sh
-c94e8cd5b2881503466cfbbb53a98fdccfff15757e958e2883e0301218267d66  ./resources/tests/test-main-invalid-long-opt.out
-8df2fd7b0857131557f40dd14c93a8561e3f2dc4b18eaf3933d4cae950f5c04d  ./resources/tests/test-main-invalid-long-opt.sh
-5ca056592b60332d788f1c08854c3ccffcc6b6c2a6b4cf1058181d957d5b8155  ./resources/tests/test-main-invalid-short-opt.out
-72354a5da2c00475f3da930e4d51db9b60618a826963f70daa046e562ae48e74  ./resources/tests/test-main-invalid-short-opt.sh
-091cc7fae3616a0df985a740a8779737dd67071425fc9c932317749e54f9fc42  ./resources/tests/test-main-lenient-opt.out
-3fa199fcfc487cddd0fa309989c9931b58d3c1c0a30068bfdb16ea8886a9404a  ./resources/tests/test-main-lenient-opt.sh
-fd154846a8af8fdade0ab9c3cfc7f7056889b81ce106937751e86e5bf73e5222  ./resources/tests/test-main-no-lenient-opt.out
-03d9263bc4be9fc965cd04e32d6cc78e6361dc231f99535894e72840b5fc7372  ./resources/tests/test-main-no-lenient-opt.sh
-5fdfb861639a5550e1fad21f1651d98508c8d9610a3487f2daf4955ca207cca5  ./resources/tests/test-main-no-regex-opt.out
-6e3c4baf3f704d3ae9a90b878eab0f3bea85b03e40ab396ccf893cb30b8e07c4  ./resources/tests/test-main-no-regex-opt.sh
-58a407ad80a44eee62725b0d0a47e816e947034f5031ba844c7ab9305b155f8a  ./resources/tests/test-main-redirection-opt.out
-d48ed36b455e1b8071293a207307183cdb321ebbea7c8ec01d0c38a158dd3963  ./resources/tests/test-main-redirection-opt.sh
-bc71f14aa14bba69825f2c889c61e8bd638e659f3d60d7c420ff4b7c4c19af32  ./resources/tests/test-main-regex-opt.out
-1de58a820551e554f6c481ffa0a355b5a67fcd073b818cdb61a63a3d36bf99bd  ./resources/tests/test-main-regex-opt.sh
-18fff8e51140f781814e52756bcf467625869d7c7799a23678a4c296c2aa2270  ./resources/tests/test-main-template-opt.out
-d100accba7d8920da2575acfe507246aea47fae074e2105aadf5068bea0eabe1  ./resources/tests/test-main-template-opt.sh
-e1d39314c6bb6bf0f7a4e37ac3fd99c7425338113f3689b3037e885c4280e54e  ./resources/tests/test-main-wrap-opt.out
-4b6896ee76e26ed858994734496dd0523ad33e120d2720396ad708d5adb48f5c  ./resources/tests/test-main-wrap-opt.sh
+fd154846a8af8fdade0ab9c3cfc7f7056889b81ce106937751e86e5bf73e5222  ./resources/tests/test-main-argument-double-dash-arg.out
+0984e7b8098d266b2565bcd83aa216c0b7830d182fcfb477718b2747cd525104  ./resources/tests/test-main-argument-double-dash-arg.sh
+c94e8cd5b2881503466cfbbb53a98fdccfff15757e958e2883e0301218267d66  ./resources/tests/test-main-argument-invalid-long-opt.out
+de2b1091737422b147d2c83653c23427ae61cb5c540205e907919c38bdeec861  ./resources/tests/test-main-argument-invalid-long-opt.sh
+5ca056592b60332d788f1c08854c3ccffcc6b6c2a6b4cf1058181d957d5b8155  ./resources/tests/test-main-argument-invalid-short-opt.out
+825d993b1edf919fc5ab48cc43a2df75da419b861fd7deddcd8e49e02831002d  ./resources/tests/test-main-argument-invalid-short-opt.sh
+fd154846a8af8fdade0ab9c3cfc7f7056889b81ce106937751e86e5bf73e5222  ./resources/tests/test-main-feature-allowlist-builtin.out
+e281142f635a199e02e901d81359680bda9d129a6702917a192e2f5cd0373b35  ./resources/tests/test-main-feature-allowlist-invalid.out
+fd154846a8af8fdade0ab9c3cfc7f7056889b81ce106937751e86e5bf73e5222  ./resources/tests/test-main-feature-allowlist-none.out
+1086992220d9a18ac6cd57f070243fdc3a51ed55e00baa388faa0052db1769f9  ./resources/tests/test-main-feature-allowlist.out
+24b399aec8a264857b7ca55e5e518dfcbfb349720ac719e634b78ca6c3309d3e  ./resources/tests/test-main-feature-allowlist.sh
+385d16302250983ee0e37a72d9ce2abe63d9184572984652214a7b7c2eeb77f9  ./resources/tests/test-main-feature-comment.out
+0917cc75c937c5f17f07878848411e82d5509b1882055c6c33b7cdd9a7631e29  ./resources/tests/test-main-feature-comment.sh
+fd154846a8af8fdade0ab9c3cfc7f7056889b81ce106937751e86e5bf73e5222  ./resources/tests/test-main-feature-denylist-builtin.out
+e281142f635a199e02e901d81359680bda9d129a6702917a192e2f5cd0373b35  ./resources/tests/test-main-feature-denylist-invalid.out
+94ef3cb63897ddd5dba36b1939e4f312d52a6eac424519fb0e70d8fa288c2bc6  ./resources/tests/test-main-feature-denylist-none.out
+093571a1473b237375c688124ce6519776e38d8aa6dbf1d71f9a63822594709c  ./resources/tests/test-main-feature-denylist.out
+25f96fa0f5e03a0bad99505d94d5152a870cac9ab13cd6e271f85debfdb198ec  ./resources/tests/test-main-feature-denylist.sh
+fd154846a8af8fdade0ab9c3cfc7f7056889b81ce106937751e86e5bf73e5222  ./resources/tests/test-main-feature-footer-builtin.out
+e281142f635a199e02e901d81359680bda9d129a6702917a192e2f5cd0373b35  ./resources/tests/test-main-feature-footer-invalid.out
+fd154846a8af8fdade0ab9c3cfc7f7056889b81ce106937751e86e5bf73e5222  ./resources/tests/test-main-feature-footer-none.out
+23e0cc65853defc0666315aca7a069e5d7a78b57ccdd2b9d7176c14278801770  ./resources/tests/test-main-feature-footer.out
+f487636b9da8b067fec86875545bf246e4d60c63331e49700d4d0c9ec66d838a  ./resources/tests/test-main-feature-footer.sh
+fd154846a8af8fdade0ab9c3cfc7f7056889b81ce106937751e86e5bf73e5222  ./resources/tests/test-main-feature-header-builtin.out
+e281142f635a199e02e901d81359680bda9d129a6702917a192e2f5cd0373b35  ./resources/tests/test-main-feature-header-invalid.out
+4cb2d814961fe877f211d35a2490bac4cc9894f15ab382b7b77c708eeb353c1e  ./resources/tests/test-main-feature-header-none.out
+bbff0642145aa0339c8118f8e25815bdf5bac86b904b2fa8eb94d11ca7292252  ./resources/tests/test-main-feature-header.out
+feb6f17430e9ee6a761ecd1e7d5e6fb007900332a42fd936b43d36aaa7a84721  ./resources/tests/test-main-feature-header.sh
+fd154846a8af8fdade0ab9c3cfc7f7056889b81ce106937751e86e5bf73e5222  ./resources/tests/test-main-feature-lenient-false.out
+091cc7fae3616a0df985a740a8779737dd67071425fc9c932317749e54f9fc42  ./resources/tests/test-main-feature-lenient-true.out
+d8d16c720f43d2766efb28aac8e302f140d1c63ff7cd7810e9b426dfaaff4cda  ./resources/tests/test-main-feature-lenient.sh
+58a407ad80a44eee62725b0d0a47e816e947034f5031ba844c7ab9305b155f8a  ./resources/tests/test-main-feature-redirection.out
+8070f407116a99853c6107a934e135dda9b0dd67cf56509df10cd40548174cbc  ./resources/tests/test-main-feature-redirection.sh
+5fdfb861639a5550e1fad21f1651d98508c8d9610a3487f2daf4955ca207cca5  ./resources/tests/test-main-feature-regex-false.out
+bc71f14aa14bba69825f2c889c61e8bd638e659f3d60d7c420ff4b7c4c19af32  ./resources/tests/test-main-feature-regex-true.out
+924ad64b4120416de82a91c50b507256ebb21a0bd14b4ff2c4725ac98022de74  ./resources/tests/test-main-feature-regex.sh
+18fff8e51140f781814e52756bcf467625869d7c7799a23678a4c296c2aa2270  ./resources/tests/test-main-feature-template.out
+2d2d7bdf32f06f6c3956c8edb9ab882f05ce9e8875f6f8b7ad52cbccdb9fdd29  ./resources/tests/test-main-feature-template.sh
+e1d39314c6bb6bf0f7a4e37ac3fd99c7425338113f3689b3037e885c4280e54e  ./resources/tests/test-main-feature-wrap.out
+b9c190fc25bdb1ecc61e44e1c11b7ab549ab1203bc3917524a9d97d0849bd4eb  ./resources/tests/test-main-feature-wrap.sh
 937c6a21c8a003ccac673466f13af5d4172137b9b47b00a88cfb425778f16a8c  ./resources/tests/test-stats-suffixes.out
 a0155bd2ad0e61aa7a045ff025a261bc74d05c3b08acbd43142894044b46bdf0  ./resources/tests/test-stats-suffixes.sh
 10c1f34b1c15190520b4bb97f019f37a17f31c3d51420b225cdbc541e9aa3f9c  ./resources/tests/test-stats-tlds.out

hblock

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Version:    3.0.1
+# Version:    3.1.0
 # Author:     Héctor Molinero Fernández <[email protected]>
 # License:    MIT, https://opensource.org/licenses/MIT
 # Repository: https://github.com/hectorm/hblock

hblock.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
-.TH HBLOCK "1" "November 2020" "hBlock 3.0.1" "User Commands"
+.TH HBLOCK "1" "November 2020" "hBlock 3.1.0" "User Commands"
 .SH NAME
-hBlock \- manual page for hBlock 3.0.1
+hBlock \- manual page for hBlock 3.1.0
 .SH SYNOPSIS
 .B hblock
 [\fI\,OPTION\/\fR]...

hblock.1.md

@@ -1,7 +1,7 @@
 NAME
 ====
 
-hBlock - manual page for hBlock 3.0.1
+hBlock - manual page for hBlock 3.1.0
 
 SYNOPSIS
 ========

resources/systemd/README.md

@@ -4,7 +4,7 @@ The following commands will schedule a daily update of the hosts file. See [this
 more information about systemd timers.
 
 ```sh
-curl -o '/tmp/hblock.#1' 'https://raw.githubusercontent.com/hectorm/hblock/v3.0.1/resources/systemd/hblock.{service,timer}' \
+curl -o '/tmp/hblock.#1' 'https://raw.githubusercontent.com/hectorm/hblock/v3.1.0/resources/systemd/hblock.{service,timer}' \
   && echo '08b736382cb9dfd39df1207a3e90b068f5325a41dc8254d83fde5d4540ba8b5b  /tmp/hblock.service' | shasum -c \
   && echo '87a7ba5067d4c565aca96659b0dce230471a6ba35fbce1d3e9d02b264da4dc38  /tmp/hblock.timer' | shasum -c \
   && sudo mv /tmp/hblock.{service,timer} /etc/systemd/system/ \