Skip to content

Commit

Permalink
3.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
hectorm committed Oct 22, 2024
1 parent 9653391 commit e4af1b0
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 57 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5/hblock' \
&& echo '2db6f52a14a3b87ff86b0fde3583f1a635ff580d26b36f8a103997a614314c6f /tmp/hblock' | shasum -c \
curl -o /tmp/hblock 'https://raw.githubusercontent.com/hectorm/hblock/v3.5.0/hblock' \
&& echo 'bb8f632fcb101ea017fb00a8d02925dfc7d5a6d075e2cb30e4bc293e5c0628b1 /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
Expand Down
2 changes: 1 addition & 1 deletion hblock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -eu
export LC_ALL='C'

# Metadata.
if [ -z "${HBLOCK_VERSION+x}" ]; then HBLOCK_VERSION='3.4.5'; fi
if [ -z "${HBLOCK_VERSION+x}" ]; then HBLOCK_VERSION='3.5.0'; fi
if [ -z "${HBLOCK_AUTHOR+x}" ]; then HBLOCK_AUTHOR='Héctor Molinero Fernández <[email protected]>'; 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
Expand Down
10 changes: 8 additions & 2 deletions hblock.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH HBLOCK "1" "May 2024" "hBlock 3.4.5" "User Commands"
.TH HBLOCK "1" "October 2024" "hBlock 3.5.0" "User Commands"
.SH NAME
hBlock \- manual page for hBlock 3.4.5
hBlock \- manual page for hBlock 3.5.0
.SH SYNOPSIS
.B hblock
[\fI\,OPTION\/\fR]...
Expand Down Expand Up @@ -156,6 +156,12 @@ makes these subdomains redundant.
.IP
(default: false)
.HP
\fB\-n\fR, \fB\-\-retry\fR <NUMBER>, ${HBLOCK_RETRY}
.IP
Number of times to retry a failed download.
.IP
(default: 0)
.HP
\fB\-c\fR, \fB\-\-[no\-]continue\fR, ${HBLOCK_CONTINUE}
.IP
Do not abort if a download error occurs.
Expand Down
106 changes: 56 additions & 50 deletions hblock.1.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# NAME

hBlock - manual page for hBlock 3.4.5
hBlock - manual page for hBlock 3.5.0

# SYNOPSIS

Expand All @@ -18,178 +18,184 @@ from connecting to them.
**-O**, **--output** \<FILE\|-\>, \${HBLOCK_OUTPUT_FILE}

> Output file location.
>
> If equals "-", it is printed to stdout.
>
> (default: */etc/hosts*)
**-H**, **--header** \<FILE\|builtin\|none\|-\>, \${HBLOCK_HEADER_FILE}

> File to be included at the beginning of the output file.
>
> If equals "builtin", the built-in value is used.
>
> If equals "none", an empty value is used.
>
> If equals "-", the stdin content is used.
>
> If unspecified and any of the following files exists, its content is
> used.
>
> \${XDG_CONFIG_HOME}/hblock/header
>
> */etc/hblock/header*
>
> (default: builtin)
**-F**, **--footer** \<FILE\|builtin\|none\|-\>, \${HBLOCK_FOOTER_FILE}

> File to be included at the end of the output file.
>
> If equals "builtin", the built-in value is used.
>
> If equals "none", an empty value is used.
>
> If equals "-", the stdin content is used.
>
> If unspecified and any of the following files exists, its content is
> used.
>
> \${XDG_CONFIG_HOME}/hblock/footer
>
> */etc/hblock/footer*
>
> (default: builtin)
**-S**, **--sources** \<FILE\|builtin\|none\|-\>,
\${HBLOCK_SOURCES_FILE}

> File with line separated URLs used to generate the blocklist.
>
> If equals "builtin", the built-in value is used.
>
> If equals "none", an empty value is used.
>
> If equals "-", the stdin content is used.
>
> If unspecified and any of the following files exists, its content is
> used.
>
> \${XDG_CONFIG_HOME}/hblock/sources.list
>
> */etc/hblock/sources.list*
>
> (default: builtin)
**-A**, **--allowlist** \<FILE\|builtin\|none\|-\>,
\${HBLOCK_ALLOWLIST_FILE}

> File with line separated entries to be removed from the blocklist.
>
> If equals "builtin", the built-in value is used.
>
> If equals "none", an empty value is used.
>
> If equals "-", the stdin content is used.
>
> If unspecified and any of the following files exists, its content is
> used.
>
> \${XDG_CONFIG_HOME}/hblock/allow.list
>
> */etc/hblock/allow.list*
>
> (default: builtin)
**-D**, **--denylist** \<FILE\|builtin\|none\|-\>,
\${HBLOCK_DENYLIST_FILE}

> File with line separated entries to be added to the blocklist.
>
> If equals "builtin", the built-in value is used.
>
> If equals "none", an empty value is used.
>
> If equals "-", the stdin content is used.
>
> If unspecified and any of the following files exists, its content is
> used.
>
> \${XDG_CONFIG_HOME}/hblock/deny.list
>
> */etc/hblock/deny.list*
>
> (default: builtin)
**-R**, **--redirection** \<REDIRECTION\>, \${HBLOCK_REDIRECTION}

> Redirection for all entries in the blocklist.
>
> (default: 0.0.0.0)
**-W**, **--wrap** \<NUMBER\>, \${HBLOCK_WRAP}

> Break blocklist lines after this number of entries.
>
> (default: 1)
**-T**, **--template** \<TEMPLATE\>, \${HBLOCK_TEMPLATE}

> Template applied to each entry.
>
> %D = \<DOMAIN\>, %R = \<REDIRECTION\>
>
> (default: %R %D)
**-C**, **--comment** \<COMMENT\>, \${HBLOCK_COMMENT}

> Character used for comments.
>
> (default: \#)
**-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}

> Use POSIX BREs in the allowlist instead of fixed strings.
>
> (default: false)
**-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
> blocking makes these subdomains redundant.
>
> (default: false)
**-n**, **--retry** \<NUMBER\>, \${HBLOCK_RETRY}

> Number of times to retry a failed download.
> (default: 0)
**-c**, **--\[no-\]continue**, \${HBLOCK_CONTINUE}

> Do not abort if a download error occurs.
>
> (default: false)
**-p**, **--parallel**, \${HBLOCK_PARALLEL}

> Maximum concurrency for parallel downloads.
>
> (default: 4)
**-q**, **--\[no-\]quiet**, \${HBLOCK_QUIET}

> Suppress non-error messages.
>
> (default: false)
**-x**, **--color** \<auto\|true\|false\>, \${HBLOCK_COLOR}

> Colorize the output.
>
> (default: auto)
**-v**, **--version**
Expand Down
2 changes: 1 addition & 1 deletion hblock.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2db6f52a14a3b87ff86b0fde3583f1a635ff580d26b36f8a103997a614314c6f hblock
bb8f632fcb101ea017fb00a8d02925dfc7d5a6d075e2cb30e4bc293e5c0628b1 hblock
2 changes: 1 addition & 1 deletion resources/systemd/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5/resources/systemd/hblock.{service,timer}' \
curl -o '/tmp/hblock.#1' 'https://raw.githubusercontent.com/hectorm/hblock/v3.5.0/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/ \
Expand Down

0 comments on commit e4af1b0

Please sign in to comment.