From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CD1221382C5 for ; Tue, 26 Jan 2021 10:06:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 029F0E0CCE; Tue, 26 Jan 2021 10:06:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DA98CE0CCE for ; Tue, 26 Jan 2021 10:06:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1BDD340917 for ; Tue, 26 Jan 2021 10:06:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 379D64C for ; Tue, 26 Jan 2021 10:06:14 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1611655562.f6f7bed96eeccdf23e006fe89f8c1306877bc8b6.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/bind/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/bind/files/bind-9.16.6-bug-741162.patch X-VCS-Directories: net-dns/bind/files/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: f6f7bed96eeccdf23e006fe89f8c1306877bc8b6 X-VCS-Branch: master Date: Tue, 26 Jan 2021 10:06:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bad9d06b-98c1-4225-b887-af302c36ed0e X-Archives-Hash: 0c308dae79fa158fcd2b5ec055e3c7c9 commit: f6f7bed96eeccdf23e006fe89f8c1306877bc8b6 Author: Michael Mair-Keimberger gmail com> AuthorDate: Tue Jan 26 07:13:11 2021 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Tue Jan 26 10:06:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6f7bed9 net-dns/bind: remove unused patch Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/19221 Signed-off-by: Mikle Kolyada gentoo.org> net-dns/bind/files/bind-9.16.6-bug-741162.patch | 31 ------------------------- 1 file changed, 31 deletions(-) diff --git a/net-dns/bind/files/bind-9.16.6-bug-741162.patch b/net-dns/bind/files/bind-9.16.6-bug-741162.patch deleted file mode 100644 index 9cc030c82b3..00000000000 --- a/net-dns/bind/files/bind-9.16.6-bug-741162.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 56d2cf6f1ef008ab6cb50545af9b1d8a5c1ece81 -Author: Ondřej Surý -Date: Mon Aug 24 10:15:07 2020 +0200 - - Print diagnostics on dns_name_issubdomain() failure in fctx_create() - - Log diagnostic message when dns_name_issubdomain() in the fctx_create() - when the resolver is qname minimizing and forwarding at the same time. - - (cherry picked from commit 0a22024c270a38a54f0d51621a046b726df158c0) - -diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c -index 8a36693a9a..b37e756c53 100644 ---- a/lib/dns/resolver.c -+++ b/lib/dns/resolver.c -@@ -5122,7 +5122,14 @@ fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type, - - log_ns_ttl(fctx, "fctx_create"); - -- INSIST(dns_name_issubdomain(&fctx->name, &fctx->domain)); -+ if (!dns_name_issubdomain(&fctx->name, &fctx->domain)) { -+ dns_name_format(&fctx->domain, buf, sizeof(buf)); -+ UNEXPECTED_ERROR(__FILE__, __LINE__, -+ "'%s' is not subdomain of '%s'", fctx->info, -+ buf); -+ result = ISC_R_UNEXPECTED; -+ goto cleanup_fcount; -+ } - - fctx->qmessage = NULL; - result = dns_message_create(mctx, DNS_MESSAGE_INTENTRENDER,