From 109c322692e4f8cabc23bbbb70b96dd8f0919161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Molinero=20Fern=C3=A1ndez?= Date: Sat, 1 Jan 2022 19:44:25 +0100 Subject: [PATCH] hBlock: bump (#6509) --- ...{hblock-3.2.3.recipe => hblock-3.3.1.recipe} | 2 +- ...ock-3.2.3.patchset => hblock-3.3.1.patchset} | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) rename net-firewall/hblock/{hblock-3.2.3.recipe => hblock-3.3.1.recipe} (93%) rename net-firewall/hblock/patches/{hblock-3.2.3.patchset => hblock-3.3.1.patchset} (65%) diff --git a/net-firewall/hblock/hblock-3.2.3.recipe b/net-firewall/hblock/hblock-3.3.1.recipe similarity index 93% rename from net-firewall/hblock/hblock-3.2.3.recipe rename to net-firewall/hblock/hblock-3.3.1.recipe index e5d77c0aa..fb680aa54 100644 --- a/net-firewall/hblock/hblock-3.2.3.recipe +++ b/net-firewall/hblock/hblock-3.3.1.recipe @@ -7,7 +7,7 @@ COPYRIGHT="2021 Héctor Molinero Fernández" LICENSE="MIT" REVISION="1" SOURCE_URI="https://github.com/hectorm/hblock/archive/v${portVersion:?}.tar.gz" -CHECKSUM_SHA256="1b8eb3c5cb074cbe7b0a8b5e040641c12b519bee21a4a879e1bdd328cd17aa60" +CHECKSUM_SHA256="649ef980871d4be467a43edfa99c636b95b5af38ee976985082a65c4989eac01" PATCHES="hblock-$portVersion.patchset" ARCHITECTURES="any" diff --git a/net-firewall/hblock/patches/hblock-3.2.3.patchset b/net-firewall/hblock/patches/hblock-3.3.1.patchset similarity index 65% rename from net-firewall/hblock/patches/hblock-3.2.3.patchset rename to net-firewall/hblock/patches/hblock-3.3.1.patchset index e70f368d1..7f9fae3a7 100644 --- a/net-firewall/hblock/patches/hblock-3.2.3.patchset +++ b/net-firewall/hblock/patches/hblock-3.3.1.patchset @@ -5,12 +5,10 @@ Subject: Haiku host file header diff --git a/hblock b/hblock -index 2404a72..136c188 100755 +index d0ba9fd..afeb70e 100755 --- a/hblock +++ b/hblock -@@ -22,15 +22,12 @@ cleanup() { ret="$?"; rm -f -- "${TMPDIR:-${TMP:-/tmp}}/hblock.${$}."*; trap - E - # Built-in header. - HOSTNAME="${HOSTNAME-"$(uname -n)"}" +@@ -25,11 +25,8 @@ HOSTNAME="${HOSTNAME-"$(uname -n)"}" HBLOCK_HEADER_BUILTIN="$(cat <<-EOF - 127.0.0.1 localhost ${HOSTNAME?} - 255.255.255.255 broadcasthost @@ -21,14 +19,13 @@ index 2404a72..136c188 100755 - ff02::1 ip6-allnodes - ff02::2 ip6-allrouters - ff02::3 ip6-allhosts -+# -+# Haiku's static hostname lookup table -+# ++ # ++ # Haiku's static hostname lookup table ++ # + -+127.0.0.1 localhost.localdomain localhost -+::1 localhost.localdomain localhost ++ 127.0.0.1 localhost.localdomain localhost ++ ::1 localhost.localdomain localhost EOF - )" -- 2.30.0