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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D7BDA15806E for ; Wed, 7 Jun 2023 11:30:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0CBFE083B; Wed, 7 Jun 2023 11:30:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 860C9E083B for ; Wed, 7 Jun 2023 11:30:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 78E7B335D8F for ; Wed, 7 Jun 2023 11:30:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD4F8A5A for ; Wed, 7 Jun 2023 11:30:04 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1686136812.6e9437e116b0186d464b1fe48f9ff7f0617e71fd.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/nsd/, net-dns/nsd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/nsd/files/nsd-4.7.0-no-bind8-stats-no-ssl.patch net-dns/nsd/nsd-4.7.0.ebuild X-VCS-Directories: net-dns/nsd/files/ net-dns/nsd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6e9437e116b0186d464b1fe48f9ff7f0617e71fd X-VCS-Branch: master Date: Wed, 7 Jun 2023 11:30:04 +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: f1e0b33e-367e-4c0d-91d6-afe639a0ff97 X-Archives-Hash: 2175cd1e33ddba60eb145e1ae4fcf6f1 commit: 6e9437e116b0186d464b1fe48f9ff7f0617e71fd Author: Sam James gentoo org> AuthorDate: Wed Jun 7 11:20:12 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jun 7 11:20:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e9437e1 net-dns/nsd: fix build w/ USE='-bind8-stats -ssl' Closes: https://bugs.gentoo.org/907997 Signed-off-by: Sam James gentoo.org> .../files/nsd-4.7.0-no-bind8-stats-no-ssl.patch | 23 ++++++++++++++++++++++ net-dns/nsd/nsd-4.7.0.ebuild | 2 ++ 2 files changed, 25 insertions(+) diff --git a/net-dns/nsd/files/nsd-4.7.0-no-bind8-stats-no-ssl.patch b/net-dns/nsd/files/nsd-4.7.0-no-bind8-stats-no-ssl.patch new file mode 100644 index 000000000000..402a42e19e0c --- /dev/null +++ b/net-dns/nsd/files/nsd-4.7.0-no-bind8-stats-no-ssl.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/907997 +https://github.com/NLnetLabs/nsd/issues/283 +https://github.com/NLnetLabs/nsd/commit/f31d31ab1d45d615ebd192beaacac66746e0ff80 + +From f31d31ab1d45d615ebd192beaacac66746e0ff80 Mon Sep 17 00:00:00 2001 +From: "W.C.A. Wijngaards" +Date: Wed, 7 Jun 2023 13:07:53 +0200 +Subject: [PATCH] - Fix #283: Compile failure in remote.c when + --disable-bind8-stats + +--- a/remote.c ++++ b/remote.c +@@ -1246,7 +1246,9 @@ do_stats(struct daemon_remote* rc, int peek, struct rc_state* rs) + xfrd_set_reload_now(xfrd); + #else + RES res; ++#ifdef HAVE_SSL + res.ssl = rs->ssl; ++#endif + res.fd = rs->fd; + (void)rc; (void)peek; + (void)ssl_printf(&res, "error no stats enabled at compile time\n"); + diff --git a/net-dns/nsd/nsd-4.7.0.ebuild b/net-dns/nsd/nsd-4.7.0.ebuild index d9028ba457da..6c6eb84db034 100644 --- a/net-dns/nsd/nsd-4.7.0.ebuild +++ b/net-dns/nsd/nsd-4.7.0.ebuild @@ -51,6 +51,8 @@ BDEPEND=" PATCHES=( # Fix the paths in the munin plugin to match our install "${FILESDIR}"/nsd_munin_.patch + # bug #907997 + "${FILESDIR}"/${P}-no-bind8-stats-no-ssl.patch ) src_prepare() {