From nobody Sun Sep 24 18:59:00 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RtwK04cQyz4vKW4; Sun, 24 Sep 2023 18:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RtwK0404yz4F0J; Sun, 24 Sep 2023 18:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695581940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wJmKvzUJFlCeof5HhRNwFOaw5/RDOS2ugEv5ouaHU3s=; b=g6cIwicLFXhjyNmKU6bukjsXl2iEqhn8+GzXJVefmJDppBaB8c4Vn1d1QRqg9ARNpGmibC dUJMXuMolmSz7X9QqSqwOsw6YXg7SMKqVleJdH/UURBnJyNkz7ygXUgZuS5EAhEd0+pjZX xpoer5DF6z8b810fcFswEfbpnrO1AUcqA5QRXpogs46aZwBQIE4N/cWtcv35P7V7BNCPAm MnY2Qht+E9A3kc3W9VCn7DY7brvCiM/5zil4KldmkUE8pi6pjmjE2MB9Zx7Zxz9PR075qU r0H/VkwIBldHA3tnGWL7dr73OC0VmqZuJEyQArQNX7zZR40HFbp9Uyf+CH893A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695581940; a=rsa-sha256; cv=none; b=CXgN6bfOaAYdTJ9+cNadkTT6lNTno7b8uPg6651GXVCEmJO+h7tdB+syJeJ6rXvPGAuWKE NDSdl7psUEWJg2zMM20ic8EjxI9WJn+hXmwo0aLaFno/CG5YfGzqB+RQq757pfDDgk24ak L7+brVBGqoWO3EXG9nOalIWqPIHT3GrlsKkoqOdCLNiUKP2X1sAqP5RXyTeSvV+Tul1lcy vvffHJ1hSfyB0ewk8b7QNpctEN3Y0d03cj39gnnXYGBNsguozWW92GkQ1CeLhOX4Hp9Y38 OO8ZqDIpXlLwMtDPT1RtZYToxtw4kN2UeSlRVpulBQitsxALFxc1EdWE75ATqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695581940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wJmKvzUJFlCeof5HhRNwFOaw5/RDOS2ugEv5ouaHU3s=; b=wulgNTwtQ0JsbpCEBT4fqW1HXjcKDRx4vE5jE3bhoVRClqLZxESHPViLL7xC6z8HklUtQh 7Kt6+7zypqXRmcpVQuQW6+BT8JXiQGvy5wRyzFaxVZe20CXvmF/TSI98ioDYSem8RR4eFb KwvlOfG8ar/TnXsiqOhUnVd5oCn96g0zr3tOJQHXdL+SHt3G0T2+a3sFAy7/BhjqqddHNg aYeglBJtNkmINS0LDJAWyG9jay1xqJbksMDPlb4CBsnaVKdrI88CG0XYtRe6dYJSmYavNY HYQqJ2NXs84VpYcSGAOCzqK9sJ8zZb3KMLFb5GU8iAp0WDvIS7RBaupfHpVLdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RtwK034hYzy24; Sun, 24 Sep 2023 18:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38OIx0I2046072; Sun, 24 Sep 2023 18:59:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38OIx0Xu046069; Sun, 24 Sep 2023 18:59:00 GMT (envelope-from git) Date: Sun, 24 Sep 2023 18:59:00 GMT Message-Id: <202309241859.38OIx0Xu046069@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 27c31c5386f1 - main - dns/void-zones-tools: fix unbound-killing bug List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27c31c5386f115976bd436e42566539e42be2b21 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=27c31c5386f115976bd436e42566539e42be2b21 commit 27c31c5386f115976bd436e42566539e42be2b21 Author: Vidar Karlsen AuthorDate: 2023-09-22 20:30:36 +0000 Commit: Robert Clausecker CommitDate: 2023-09-24 18:57:16 +0000 dns/void-zones-tools: fix unbound-killing bug void-zones-tools downloads a set of pre-defined lists of undesirable domains and creates "voided" dns zones for Unbound, blocking access to these domains via dns. One of the default lists is no longer maintained, and was removed from the upstream code. However, there hasn't been released a new version after the change was made, thus the port has not been updated. This has not been a problem up until now because the update script has been downloading an empty file, essentially a no-op in the zone creation/loading, but at some point today it started serving a domain parking page, and the HTML of that page is being dumped into the dns zone file resulting in parse errors and Unbound cannot start. While waiting for upstream to tag a new version, I changed the port to track the latest GitHub commit. This fixes the issue for now. PR: 274027 Upstream issue: https://github.com/cyclaero/void-zones-tools/issues/12 Reported by: Robert William Vesterman MFH: 2023Q3 --- dns/void-zones-tools/Makefile | 4 +- dns/void-zones-tools/distinfo | 6 +-- dns/void-zones-tools/files/patch-Makefile | 24 ++++------ .../files/patch-void-zones-update.sh | 54 ---------------------- 4 files changed, 14 insertions(+), 74 deletions(-) diff --git a/dns/void-zones-tools/Makefile b/dns/void-zones-tools/Makefile index 3e61be67540c..aa43a50a11b3 100644 --- a/dns/void-zones-tools/Makefile +++ b/dns/void-zones-tools/Makefile @@ -1,7 +1,7 @@ PORTNAME= void-zones-tools DISTVERSIONPREFIX= v -DISTVERSION= 1.0.2 -PORTREVISION= 7 +DISTVERSION= 1.0.2-18 +DISTVERSIONSUFFIX= -g204634a CATEGORIES= dns MAINTAINER= vidar@karlsen.tech diff --git a/dns/void-zones-tools/distinfo b/dns/void-zones-tools/distinfo index 5760c8265575..66380716b2fc 100644 --- a/dns/void-zones-tools/distinfo +++ b/dns/void-zones-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1503447553 -SHA256 (cyclaero-void-zones-tools-v1.0.2_GH0.tar.gz) = 5d276049372825c359fd281e1eee94a7771c2649f03e23796a55d7c959043510 -SIZE (cyclaero-void-zones-tools-v1.0.2_GH0.tar.gz) = 16201 +TIMESTAMP = 1695518114 +SHA256 (cyclaero-void-zones-tools-v1.0.2-18-g204634a_GH0.tar.gz) = 38d364fc8850c86d4fc31a73c19dfc140e5ca992258cb7a5fad4ce267b433419 +SIZE (cyclaero-void-zones-tools-v1.0.2-18-g204634a_GH0.tar.gz) = 16872 diff --git a/dns/void-zones-tools/files/patch-Makefile b/dns/void-zones-tools/files/patch-Makefile index 453666088597..eff508c7c245 100644 --- a/dns/void-zones-tools/files/patch-Makefile +++ b/dns/void-zones-tools/files/patch-Makefile @@ -1,19 +1,13 @@ ---- Makefile.orig 2018-08-26 02:54:47 UTC +--- Makefile.orig 2023-08-28 22:28:23 UTC +++ Makefile -@@ -25,15 +25,7 @@ - - CC ?= clang +@@ -26,9 +26,7 @@ + CC ?= clang + DV != $(CC) -dumpversion -.if $(MACHINE) == "i386" || $(MACHINE) == "amd64" || $(MACHINE) == "x86_64" --CFLAGS = $(CDEFS) -march=native -mssse3 -ffast-math +-CFLAGS = $(CDEFS) -march=native -mssse3 -.elif $(MACHINE) == "arm" --CFLAGS = $(CDEFS) -fsigned-char --.else --CFLAGS = $(CDEFS) --.endif -- --CFLAGS += -std=c11 -g0 -Ofast -fstrict-aliasing -Wno-parentheses -+CFLAGS += -std=c11 -fstrict-aliasing -Wno-parentheses - PREFIX ?= /usr/local - - HEADERS = binutils.h store.h ++.if $(MACHINE) == "arm" + CFLAGS = $(CDEFS) -fsigned-char + .else + CFLAGS = $(CDEFS) diff --git a/dns/void-zones-tools/files/patch-void-zones-update.sh b/dns/void-zones-tools/files/patch-void-zones-update.sh deleted file mode 100644 index 767cde956493..000000000000 --- a/dns/void-zones-tools/files/patch-void-zones-update.sh +++ /dev/null @@ -1,54 +0,0 @@ ---- void-zones-update.sh.orig 2017-08-22 12:36:14 UTC -+++ void-zones-update.sh -@@ -47,6 +47,8 @@ fi - ZONES_DIR="/usr/local/etc/void-zones" - if [ ! -d "$ZONES_DIR" ]; then - mkdir -p "$ZONES_DIR" -+fi -+if [ ! -f "$ZONES_DIR/my_void_hosts.txt" ]; then - echo "# white list" > "$ZONES_DIR/my_void_hosts.txt" - echo "1.1.1.1 my.white.dom" >> "$ZONES_DIR/my_void_hosts.txt" - echo "" >> "$ZONES_DIR/my_void_hosts.txt" -@@ -63,9 +65,8 @@ $FETCH -o "$ZONES_DIR/mdl_void_hosts.txt - $FETCH -o "$ZONES_DIR/away_void_hosts.txt" "https://adaway.org/hosts.txt" - $FETCH -o "$ZONES_DIR/jdom_void_list.txt" "http://mirror1.malwaredomains.com/files/justdomains" - $FETCH -o "$ZONES_DIR/ucky_void_host.txt" "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts" --$FETCH -o "$ZONES_DIR/w10telm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/win10/spy.txt" --$FETCH -o "$ZONES_DIR/w81telm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/win81/spy.txt" --$FETCH -o "$ZONES_DIR/w7telm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/win7/spy.txt" -+$FETCH -o "$ZONES_DIR/wintelm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt" -+ - - if [ ! -f "$ZONES_DIR/pgl_void_hosts.txt" ] ; then - echo "# No hosts from pgl." > "$ZONES_DIR/pgl_void_hosts.txt" -@@ -95,17 +96,10 @@ if [ ! -f "$ZONES_DIR/ucky_void_host.txt - echo "# No hosts from FadeMind/unchecky." > "$ZONES_DIR/ucky_void_host.txt" - fi - --if [ ! -f "$ZONES_DIR/w10telm_void_hosts.txt" ] ; then -- echo "# No hosts from WindowsSpyBlocker/win10/spy." > "$ZONES_DIR/w10telm_void_hosts.txt" --fi -- --if [ ! -f "$ZONES_DIR/w81telm_void_hosts.txt" ] ; then -- echo "# No hosts from WindowsSpyBlocker/win81/spy." > "$ZONES_DIR/w81telm_void_hosts.txt" -+if [ ! -f "$ZONES_DIR/wintelm_void_hosts.txt" ] ; then -+ echo "# No hosts from WindowsSpyBlocker/hosts/spy." > "$ZONES_DIR/wintelm_void_hosts.txt" - fi - --if [ ! -f "$ZONES_DIR/w7telm_void_hosts.txt" ] ; then -- echo "# No hosts from WindowsSpyBlocker/win7/spy." > "$ZONES_DIR/w7telm_void_hosts.txt" --fi - - /usr/local/bin/hosts2zones /tmp/local-void.zones \ - "$ZONES_DIR/my_void_hosts.txt" \ -@@ -116,9 +110,7 @@ fi - "$ZONES_DIR/away_void_hosts.txt" \ - "$ZONES_DIR/jdom_void_list.txt" \ - "$ZONES_DIR/ucky_void_host.txt" \ -- "$ZONES_DIR/w10telm_void_hosts.txt" \ -- "$ZONES_DIR/w81telm_void_hosts.txt" \ -- "$ZONES_DIR/w7telm_void_hosts.txt" \ -+ "$ZONES_DIR/wintelm_void_hosts.txt" \ - "$ZONES_DIR/x_void_list.txt" \ - "$ZONES_DIR/y_void_list.txt" \ - "$ZONES_DIR/z_void_list.txt" \