This commit is contained in:
Héctor Molinero Fernández 2023-01-29 19:23:12 +01:00
commit 759a7b842f
6 changed files with 32 additions and 31 deletions

View file

@ -35,8 +35,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.4.0/hblock' \
&& echo '4031d86cd04fd7c6cb1b7e9acb1ffdbe9a3f84f693bfb287c68e1f1fa2c14c3b /tmp/hblock' | shasum -c \
curl -o /tmp/hblock 'https://raw.githubusercontent.com/hectorm/hblock/v3.4.1/hblock' \
&& echo 'bb1f6fcafdcba6f7bd9e12613fc92b02a0a0da1263b0e44d209cb40d8715d647 /tmp/hblock' | shasum -c \
&& sudo mv /tmp/hblock /usr/local/bin/hblock \
&& sudo chown 0:0 /usr/local/bin/hblock \
&& sudo chmod 755 /usr/local/bin/hblock

2
hblock
View file

@ -4,7 +4,7 @@ set -eu
export LC_ALL='C'
# Metadata.
if [ -z "${HBLOCK_VERSION+x}" ]; then HBLOCK_VERSION='3.4.0'; fi
if [ -z "${HBLOCK_VERSION+x}" ]; then HBLOCK_VERSION='3.4.1'; fi
if [ -z "${HBLOCK_AUTHOR+x}" ]; then HBLOCK_AUTHOR='Héctor Molinero Fernández <hector@molinero.dev>'; fi
if [ -z "${HBLOCK_LICENSE+x}" ]; then HBLOCK_LICENSE='MIT, https://opensource.org/licenses/MIT'; fi
if [ -z "${HBLOCK_REPOSITORY+x}" ]; then HBLOCK_REPOSITORY='https://github.com/hectorm/hblock'; fi

View file

@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2.
.TH HBLOCK "1" "June 2022" "hBlock 3.4.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH HBLOCK "1" "January 2023" "hBlock 3.4.1" "User Commands"
.SH NAME
hBlock \- manual page for hBlock 3.4.0
hBlock \- manual page for hBlock 3.4.1
.SH SYNOPSIS
.B hblock
[\fI\,OPTION\/\fR]...

View file

@ -1,6 +1,6 @@
# NAME
hBlock - manual page for hBlock 3.4.0
hBlock - manual page for hBlock 3.4.1
# SYNOPSIS
@ -15,7 +15,7 @@ from connecting to them.
# OPTIONS
**-O**, **--output** \<FILE\|-\>, ${HBLOCK_OUTPUT_FILE}
**-O**, **--output** \<FILE\|-\>, \${HBLOCK_OUTPUT_FILE}
> Output file location.
>
@ -23,7 +23,7 @@ from connecting to them.
>
> (default: */etc/hosts*)
**-H**, **--header** \<FILE\|builtin\|none\|-\>, ${HBLOCK_HEADER_FILE}
**-H**, **--header** \<FILE\|builtin\|none\|-\>, \${HBLOCK_HEADER_FILE}
> File to be included at the beginning of the output file.
>
@ -36,13 +36,13 @@ from connecting to them.
> If unspecified and any of the following files exists, its content is
> used.
>
> ${XDG_CONFIG_HOME}/hblock/header
> \${XDG_CONFIG_HOME}/hblock/header
>
> */etc/hblock/header*
>
> (default: builtin)
**-F**, **--footer** \<FILE\|builtin\|none\|-\>, ${HBLOCK_FOOTER_FILE}
**-F**, **--footer** \<FILE\|builtin\|none\|-\>, \${HBLOCK_FOOTER_FILE}
> File to be included at the end of the output file.
>
@ -55,13 +55,14 @@ from connecting to them.
> If unspecified and any of the following files exists, its content is
> used.
>
> ${XDG_CONFIG_HOME}/hblock/footer
> \${XDG_CONFIG_HOME}/hblock/footer
>
> */etc/hblock/footer*
>
> (default: builtin)
**-S**, **--sources** \<FILE\|builtin\|none\|-\>, ${HBLOCK_SOURCES_FILE}
**-S**, **--sources** \<FILE\|builtin\|none\|-\>,
\${HBLOCK_SOURCES_FILE}
> File with line separated URLs used to generate the blocklist.
>
@ -74,14 +75,14 @@ from connecting to them.
> If unspecified and any of the following files exists, its content is
> used.
>
> ${XDG_CONFIG_HOME}/hblock/sources.list
> \${XDG_CONFIG_HOME}/hblock/sources.list
>
> */etc/hblock/sources.list*
>
> (default: builtin)
**-A**, **--allowlist** \<FILE\|builtin\|none\|-\>,
${HBLOCK_ALLOWLIST_FILE}
\${HBLOCK_ALLOWLIST_FILE}
> File with line separated entries to be removed from the blocklist.
>
@ -94,14 +95,14 @@ ${HBLOCK_ALLOWLIST_FILE}
> If unspecified and any of the following files exists, its content is
> used.
>
> ${XDG_CONFIG_HOME}/hblock/allow.list
> \${XDG_CONFIG_HOME}/hblock/allow.list
>
> */etc/hblock/allow.list*
>
> (default: builtin)
**-D**, **--denylist** \<FILE\|builtin\|none\|-\>,
${HBLOCK_DENYLIST_FILE}
\${HBLOCK_DENYLIST_FILE}
> File with line separated entries to be added to the blocklist.
>
@ -114,25 +115,25 @@ ${HBLOCK_DENYLIST_FILE}
> If unspecified and any of the following files exists, its content is
> used.
>
> ${XDG_CONFIG_HOME}/hblock/deny.list
> \${XDG_CONFIG_HOME}/hblock/deny.list
>
> */etc/hblock/deny.list*
>
> (default: builtin)
**-R**, **--redirection** \<REDIRECTION\>, ${HBLOCK_REDIRECTION}
**-R**, **--redirection** \<REDIRECTION\>, \${HBLOCK_REDIRECTION}
> Redirection for all entries in the blocklist.
>
> (default: 0.0.0.0)
**-W**, **--wrap** \<NUMBER\>, ${HBLOCK_WRAP}
**-W**, **--wrap** \<NUMBER\>, \${HBLOCK_WRAP}
> Break blocklist lines after this number of entries.
>
> (default: 1)
**-T**, **--template** \<TEMPLATE\>, ${HBLOCK_TEMPLATE}
**-T**, **--template** \<TEMPLATE\>, \${HBLOCK_TEMPLATE}
> Template applied to each entry.
>
@ -140,26 +141,26 @@ ${HBLOCK_DENYLIST_FILE}
>
> (default: %R %D)
**-C**, **--comment** \<COMMENT\>, ${HBLOCK_COMMENT}
**-C**, **--comment** \<COMMENT\>, \${HBLOCK_COMMENT}
> Character used for comments.
>
> (default: \#)
**-l**, **--\[no-\]lenient**, ${HBLOCK_LENIENT}
**-l**, **--\[no-\]lenient**, \${HBLOCK_LENIENT}
> Match all entries from sources regardless of their IP, instead of
> 0.0.0.0, 127.0.0.1, ::, ::1 or nothing.
>
> (default: false)
**-r**, **--\[no-\]regex**, ${HBLOCK_REGEX}
**-r**, **--\[no-\]regex**, \${HBLOCK_REGEX}
> Use POSIX BREs in the allowlist instead of fixed strings.
>
> (default: false)
**-f**, **--\[no-\]filter-subdomains**, ${HBLOCK_FILTER_SUBDOMAINS}
**-f**, **--\[no-\]filter-subdomains**, \${HBLOCK_FILTER_SUBDOMAINS}
> Do not include subdomains when the parent domain is also blocked.
> Useful for reducing the blocklist size in cases such as when DNS
@ -167,25 +168,25 @@ ${HBLOCK_DENYLIST_FILE}
>
> (default: false)
**-c**, **--\[no-\]continue**, ${HBLOCK_CONTINUE}
**-c**, **--\[no-\]continue**, \${HBLOCK_CONTINUE}
> Do not abort if a download error occurs.
>
> (default: false)
**-p**, **--parallel**, ${HBLOCK_PARALLEL}
**-p**, **--parallel**, \${HBLOCK_PARALLEL}
> Maximum concurrency for parallel downloads.
>
> (default: 4)
**-q**, **--\[no-\]quiet**, ${HBLOCK_QUIET}
**-q**, **--\[no-\]quiet**, \${HBLOCK_QUIET}
> Suppress non-error messages.
>
> (default: false)
**-x**, **--color** \<auto\|true\|false\>, ${HBLOCK_COLOR}
**-x**, **--color** \<auto\|true\|false\>, \${HBLOCK_COLOR}
> Colorize the output.
>

View file

@ -1 +1 @@
4031d86cd04fd7c6cb1b7e9acb1ffdbe9a3f84f693bfb287c68e1f1fa2c14c3b hblock
bb1f6fcafdcba6f7bd9e12613fc92b02a0a0da1263b0e44d209cb40d8715d647 hblock

View file

@ -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.4.0/resources/systemd/hblock.{service,timer}' \
curl -o '/tmp/hblock.#1' 'https://raw.githubusercontent.com/hectorm/hblock/v3.4.1/resources/systemd/hblock.{service,timer}' \
&& echo '45980a80506df48cbfa6dd18d20f0ad4300744344408a0f87560b2be73b7c607 /tmp/hblock.service' | shasum -c \
&& echo '87a7ba5067d4c565aca96659b0dce230471a6ba35fbce1d3e9d02b264da4dc38 /tmp/hblock.timer' | shasum -c \
&& sudo mv /tmp/hblock.{service,timer} /etc/systemd/system/ \