From nobody Sat Dec 11 09:51:50 2021 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 8A5A018CB8E5; Sat, 11 Dec 2021 09:51:51 +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 4JB32b10Fgz4Qpd; Sat, 11 Dec 2021 09:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 02A1137F6; Sat, 11 Dec 2021 09:51:51 +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 1BB9poR8075848; Sat, 11 Dec 2021 09:51:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BB9poaU075847; Sat, 11 Dec 2021 09:51:50 GMT (envelope-from git) Date: Sat, 11 Dec 2021 09:51:50 GMT Message-Id: <202112110951.1BB9poaU075847@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 1f05895ca06e - main - dns/dnsmasq: fix error "config error is REFUSED (EDE: not ready)" 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: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f05895ca06edbf6ba8bdf7e221c8a1057c0fd71 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639216311; 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=VTgGzG6k4eWRvd2rietMeO02ZUS67mONhL7djYsVq6k=; b=na/qIpuvgFxOVB8ZYoazuWkZ31nGsY0wpL7nfFxfCfyxhuEP+z/G50yEe5ooMjEdtEL1v0 y1HYhGVDCXhlFsNVPn0JbQPwBAULds30f0XvbshZ+ljWQT3xvvvivK2lWGjGAR47/w2Q8Y 8zMBdmHFFEyMf/5OErVU7+EZZF7KK8rA458OkCtye15+isVN/YFDzeVqBCuOlmPYa7lFsn TeKlsOKKGfkojsfRzEFJClsYckAO+2Z7yMvHFQk3taS1kcBVNgNYhVbj8qN6MMx5QuBEIu LZNc11tVTqytgPPwTFmTUzmEhge/CWBpf0MiRSfp31QTSnNe4pjWzPvYD28vMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639216311; a=rsa-sha256; cv=none; b=nW/uNXZzWQ1WHFeDnf/6Jk0n+Efcj9s3EMKeS7CGxG0kDGmlUIroSoyzvEa6zcQhFTgskt sYdsttCTZwXQrHYOs3A46HqFOp2qJV4CKJDEdfI8oSsqgxD5w2Lo0lBeVe0l21szmCb1L2 Tk0HHwhoxaV6MfoW5hdDOklG+DWGk45tye3iBUJDDnvOiSS1BQNU39U6jEmxxPdZamup0W HFc2pC5SVjBPBzbePNQcT7Fy/zOk53FL80nh2qxDFaH4rY7sUVjdq/WEInLy8F85xg1y/M CwNdeii9+X7TBowTSinbWkrJqGyN2hOrOtugdv6rbsJSnbnTNrtRVaQqbXMHtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f05895ca06edbf6ba8bdf7e221c8a1057c0fd71 commit 1f05895ca06edbf6ba8bdf7e221c8a1057c0fd71 Author: Olivier Cochard AuthorDate: 2021-12-11 02:14:09 +0000 Commit: Matthias Andree CommitDate: 2021-12-11 09:51:28 +0000 dns/dnsmasq: fix error "config error is REFUSED (EDE: not ready)" Fix --address=/#/...... which was lost in 2.86 ML message: https://www.mail-archive.com/dnsmasq-discuss@lists.thekelleys.org.uk/msg15508.html Git commit: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=26bbf5a314d833beaf0f147d24409969f05f3dba PR: 260331 Obtained from: Simon Kelley (upstream maintainer) --- dns/dnsmasq/Makefile | 2 +- dns/dnsmasq/files/patch-src_network.c | 81 +++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-) diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile index 477980deff20..844e485854c7 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= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= dns MASTER_SITES= https://www.thekelleys.org.uk/dnsmasq/ \ diff --git a/dns/dnsmasq/files/patch-src_network.c b/dns/dnsmasq/files/patch-src_network.c new file mode 100644 index 000000000000..53b6545ddff4 --- /dev/null +++ b/dns/dnsmasq/files/patch-src_network.c @@ -0,0 +1,81 @@ +From 26bbf5a314d833beaf0f147d24409969f05f3dba Mon Sep 17 00:00:00 2001 +From: Simon Kelley +Date: Thu, 23 Sep 2021 10:54:46 +0100 +Subject: [PATCH] Fix --address=/#/...... which was lost in 2.86 + +A victim of the domain-search rewrite. Apologies. +--- + CHANGELOG | 8 ++++++++ + src/network.c | 3 ++- + src/option.c | 17 ++++++++++++----- + 3 files changed, 22 insertions(+), 6 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index 5e54df9..8652dd8 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,11 @@ ++version 2.87 ++ Allow arbitrary prefix lengths in --rev-server and ++ --domain=....,local ++ ++ Replace --address=/#/..... functionality which got ++ missed in the 2.86 domain search rewrite. ++ ++ + version 2.86 + Handle DHCPREBIND requests in the DHCPv6 server code. + Thanks to Aichun Li for spotting this omission, and the initial +diff --git a/src/network.c b/src/network.c +index 296c7bd..3c1c176 100644 +--- a/src/network.c ++++ b/src/network.c +@@ -1626,7 +1626,8 @@ void check_servers(int no_loop_check) + continue; + + if ((serv->flags & SERV_LITERAL_ADDRESS) && +- !(serv->flags & (SERV_6ADDR | SERV_4ADDR | SERV_ALL_ZEROS))) ++ !(serv->flags & (SERV_6ADDR | SERV_4ADDR | SERV_ALL_ZEROS)) && ++ strlen(serv->domain)) + { + count--; + if (++locals <= LOCALS_LOGGED) +diff --git a/src/option.c b/src/option.c +index e64c3ab..54d89aa 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -2764,7 +2764,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + + if (!arg || !*arg) + flags = SERV_LITERAL_ADDRESS; +- else if (option == 'A') ++ else if (option != 'S') + { + /* # as literal address means return zero address for 4 and 6 */ + if (strcmp(arg, "#") == 0) +@@ -2788,11 +2788,18 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + while (1) + { + /* server=//1.2.3.4 is special. */ +- if (strlen(domain) == 0 && lastdomain) +- flags |= SERV_FOR_NODOTS; +- else +- flags &= ~SERV_FOR_NODOTS; ++ if (lastdomain) ++ { ++ if (strlen(domain) == 0) ++ flags |= SERV_FOR_NODOTS; ++ else ++ flags &= ~SERV_FOR_NODOTS; + ++ /* address=/#/ matches the same as without domain */ ++ if (option != 'S' && domain[0] == '#' && domain[1] == 0) ++ domain[0] = 0; ++ } ++ + if (!add_update_server(flags, &serv_addr, &source_addr, interface, domain, &addr)) + ret_err(gen_err); + +-- +2.20.1 +