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 E3C8C158088 for ; Fri, 28 Jan 2022 15:46:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB07D2BC019; Fri, 28 Jan 2022 15:46:48 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 85D9E2BC019 for ; Fri, 28 Jan 2022 15:46:48 +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 785F2342D03 for ; Fri, 28 Jan 2022 15:46:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9766624E for ; Fri, 28 Jan 2022 15:46:45 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1643384786.a27323c9c5ee56359c8a3418dd2b83df0ba4c896.polynomial-c@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.3.9-no_ssl.patch net-dns/nsd/nsd-4.3.9.ebuild X-VCS-Directories: net-dns/nsd/files/ net-dns/nsd/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: a27323c9c5ee56359c8a3418dd2b83df0ba4c896 X-VCS-Branch: master Date: Fri, 28 Jan 2022 15:46:45 +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: 6acf4f07-760c-4969-8022-6d558059fdb9 X-Archives-Hash: 9219186bc3c40c71e48a88647fedc0ea commit: a27323c9c5ee56359c8a3418dd2b83df0ba4c896 Author: Lars Wendler gentoo org> AuthorDate: Fri Jan 28 15:45:55 2022 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Jan 28 15:46:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a27323c9 net-dns/nsd: Fixed build with USE="-ssl" Closes: https://bugs.gentoo.org/832213 Signed-off-by: Lars Wendler gentoo.org> net-dns/nsd/files/nsd-4.3.9-no_ssl.patch | 22 ++++++++++++++++++++++ net-dns/nsd/nsd-4.3.9.ebuild | 4 +++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/net-dns/nsd/files/nsd-4.3.9-no_ssl.patch b/net-dns/nsd/files/nsd-4.3.9-no_ssl.patch new file mode 100644 index 000000000000..33553a0ec889 --- /dev/null +++ b/net-dns/nsd/files/nsd-4.3.9-no_ssl.patch @@ -0,0 +1,22 @@ +From c5e6a8e5e566380c8c6731e9feb7ac686a1c0735 Mon Sep 17 00:00:00 2001 +From: "W.C.A. Wijngaards" +Date: Fri, 28 Jan 2022 16:38:53 +0100 +Subject: [PATCH] - Fix #206: build with --without-ssl fails. + +diff --git a/edns.c b/edns.c +index c7fc39d9..478ec681 100644 +--- a/edns.c ++++ b/edns.c +@@ -21,6 +21,12 @@ + #include "nsd.h" + #include "query.h" + ++#if !defined(HAVE_SSL) || !defined(HAVE_CRYPTO_MEMCMP) ++/* we need fixed time compare, pull it in from tsig.c */ ++#define CRYPTO_memcmp memcmp_fixedtime ++int memcmp_fixedtime(const void *s1, const void *s2, size_t n); ++#endif ++ + void + edns_init_data(edns_data_type *data, uint16_t max_length) + { diff --git a/net-dns/nsd/nsd-4.3.9.ebuild b/net-dns/nsd/nsd-4.3.9.ebuild index 77567aaed614..e4f824b01061 100644 --- a/net-dns/nsd/nsd-4.3.9.ebuild +++ b/net-dns/nsd/nsd-4.3.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -45,6 +45,8 @@ BDEPEND=" PATCHES=( # Fix the paths in the munin plugin to match our install "${FILESDIR}"/nsd_munin_.patch + + "${FILESDIR}/${P}-no_ssl.patch" #832213 ) src_prepare() {