From nobody Mon Feb 7 00:41:15 2022 X-Original-To: dev-commits-ports-branches@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 23C0819BCF00; Mon, 7 Feb 2022 00:41:16 +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 4JsS4X0XK7z4tFc; Mon, 7 Feb 2022 00:41:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644194476; 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=MjG6vJUCn1DG1i+WkDNX1SOLTmeRk9iLrA3pGUK3fyY=; b=A+9RVNTXmx903yPPsMvPngUOys27anst5614+I66t0G1sNPSZoK8x9n32BXYKS9RHBVs0u ghdOvXeT8BhwacBmzcB84q/VvwV37xVaxc5JJEw7qV5HFpXrawwtc+ebB6LxgL+KqK9Q/H /aekAt/fuHQjZIqGeMYPCafal9aXSozF1BRbvwkhP+o6x/YpMBhVjOg3FtD6lstYAgY1x/ 0zksCSD2FR7bANEpKzpPKy3ETmG9u6A2iVstFuUW9IfqpMMzDNVPyh4EcYuPly1j13p/x1 2vVRc5M6Lvyzc2qz63Ea9gKzucFUEyJ90aYH03Axwqp+4StOHGzvFrtfGkKDQQ== 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 E6EB01C2B6; Mon, 7 Feb 2022 00:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2170fFJB024867; Mon, 7 Feb 2022 00:41:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2170fFP9024866; Mon, 7 Feb 2022 00:41:15 GMT (envelope-from git) Date: Mon, 7 Feb 2022 00:41:15 GMT Message-Id: <202202070041.2170fFP9024866@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Andree Subject: git: 863231914d14 - 2022Q1 - dns/dnsmasq: cherry-pick 2.86-related man update List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: 863231914d1429b9072781b9e0ebda575e5632e2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644194476; 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=MjG6vJUCn1DG1i+WkDNX1SOLTmeRk9iLrA3pGUK3fyY=; b=uo3G1BrbM/EGTpSx/y9HiBVJWbERLd0oPL4+jzrWSN1upxqDiz6kvPOOimoJN47ubhgkp8 gyDtklnPXALacAYgNfFoQ0EDsm4P7uW6+uKtu/LfKtHzy7Q/ziVMs8hNGK2T/KFCKjkSOh r+W3OSCXmaGAeBFXRbgxuXq+XaQVod8Wuf3ppz5wT67dPksiZ9vewngHZzYRKbVsuX+VWH LSgBmghh50/hPsNm702h2cLb9mJX3uxuekbl/rX8Yq6kZquQNw+/Pe6F1tIxyOlcwFEbz+ pRKAv1jua49ArYUWUNLem+OMeJhWNT/QzQ42n3I0k+LdOUb/KDDynDw27sms0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644194476; a=rsa-sha256; cv=none; b=fcQ3fOW/3YvSa69oLCkIrbhOxO8PCVBnsLGRIL75md3ejZ+SLJz5qKdEAnepxndrZQkLWX dZugzL3oiSswsDkcDwS6xsgvkYmLMt8IVgzFLFNukZi78OVr5sANK9NYDLJiYIHxukDqfS 5NlfPT71DJgJGt2eca2Jot22J+Q4xduiYqgUhrUKWTwIFW8pgnv/4JZ8MgS/YVNNJXg8U0 YT1yZsbhFjVu+N0zr2HPE6OySGPi1PS0XT2Tu9z0iNyv8lRWlIZSqPlnYWf3o8YkfEvPr3 Yb1N7HmoRnJnQc0dqwJFtjciiEHDLNK/5/ipJmm65xEO0ufSU5pu/DqNUSv9BA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=863231914d1429b9072781b9e0ebda575e5632e2 commit 863231914d1429b9072781b9e0ebda575e5632e2 Author: Matthias Andree AuthorDate: 2022-02-06 11:13:36 +0000 Commit: Matthias Andree CommitDate: 2022-02-07 00:32:48 +0000 dns/dnsmasq: cherry-pick 2.86-related man update https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff;h=10cd342f5c847a5e0226d6f0f9ff4ca16db610a5 Obtained from: Simon Kelley's upstream git repository (cherry picked from commit 41b0378ad42663d34174e79f2fc0c5e091efabad) --- dns/dnsmasq/Makefile | 2 +- dns/dnsmasq/files/patch-ag-document-2.86--address | 40 +++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile index e1e27b455636..19958b46de17 100644 --- a/dns/dnsmasq/Makefile +++ b/dns/dnsmasq/Makefile @@ -3,7 +3,7 @@ PORTNAME= dnsmasq DISTVERSION= 2.86 # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps: -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= dns MASTER_SITES= https://www.thekelleys.org.uk/dnsmasq/ \ diff --git a/dns/dnsmasq/files/patch-ag-document-2.86--address b/dns/dnsmasq/files/patch-ag-document-2.86--address new file mode 100644 index 000000000000..a1bb3f6cc5a2 --- /dev/null +++ b/dns/dnsmasq/files/patch-ag-document-2.86--address @@ -0,0 +1,40 @@ +--- ./CHANGELOG.orig 2022-02-06 11:07:17 UTC ++++ ./CHANGELOG +@@ -5,6 +5,14 @@ version 2.87 + Replace --address=/#/..... functionality which got + missed in the 2.86 domain search rewrite. + ++ Note in manpage the change in behaviour of -address. This behaviour ++ actually changed in v2.86, but was undocumented there. From 2.86 on, ++ (eg) --address=/example.com/1.2.3.4 ONLY applies to A queries. All other ++ types of query will be sent upstream. Pre 2.86, that would catch the ++ whole example.com domain and queries for other types would get ++ a local NODATA answer. The pre-2.86 behaviour is still available, ++ by configuring --address=/example.com/1.2.3.4 --local=/example.com/ ++ + + version 2.86 + Handle DHCPREBIND requests in the DHCPv6 server code. +--- ./man/dnsmasq.8.orig 2021-09-08 20:21:22 UTC ++++ ./man/dnsmasq.8 +@@ -515,7 +515,7 @@ is exactly equivalent to + .TP + .B \-A, --address=/[/...]/[] + Specify an IP address to return for any host in the given domains. +-Queries in the domains are never forwarded and always replied to ++A (or AAAA) queries in the domains are never forwarded and always replied to + with the specified IP address which may be IPv4 or IPv6. To give + both IPv4 and IPv6 addresses for a domain, use repeated \fB--address\fP flags. + To include multiple IP addresses for a single query, use +@@ -537,6 +537,11 @@ address of 0.0.0.0 and its IPv6 equivalent of :: so + its subdomains. This is partly syntactic sugar for \fB--address=/example.com/0.0.0.0\fP + and \fB--address=/example.com/::\fP but is also more efficient than including both + as separate configuration lines. Note that NULL addresses normally work in the same way as localhost, so beware that clients looking up these names are likely to end up talking to themselves. ++ ++Note that the behaviour for queries which don't match the specified address literal changed in version 2.86. ++Previous versions, configured with (eg) --address=/example.com/1.2.3.4 and then queried for a RR type other than ++A would return a NoData answer. From 2.86, the query is sent upstream. To restore the pre-2.86 behaviour, ++use the configuration --address=/example.com/1.2.3.4 --local=/example.com/ + .TP + .B --ipset=/[/...]/[,...] + Places the resolved IP addresses of queries for one or more domains in