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 B7CAD158086 for ; Thu, 16 Dec 2021 10:03:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D46F6E07B3; Thu, 16 Dec 2021 10:03:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 CDA07E07B3 for ; Thu, 16 Dec 2021 10:03:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 smtp.gentoo.org (Postfix) with ESMTPS id 00CB334337E for ; Thu, 16 Dec 2021 10:03:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 924BE14D for ; Thu, 16 Dec 2021 10:03:10 +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: <1639648980.7ce35657f269c3b7016e8940ad36e59cf06e12a4.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/pdnsd/, net-dns/pdnsd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/pdnsd/files/pdnsd-1.2.9a-linux-5.13_build_fix.patch net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild X-VCS-Directories: net-dns/pdnsd/ net-dns/pdnsd/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 7ce35657f269c3b7016e8940ad36e59cf06e12a4 X-VCS-Branch: master Date: Thu, 16 Dec 2021 10:03:10 +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: 70582fef-e32a-4018-bb22-f942ba9d8235 X-Archives-Hash: c137a368e6d6cfd0cc3fffb66b86f8d6 commit: 7ce35657f269c3b7016e8940ad36e59cf06e12a4 Author: Lars Wendler gentoo org> AuthorDate: Thu Dec 16 09:59:03 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Dec 16 10:03:00 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ce35657 net-dns/pdnsd: Fixed build with >=sys-kernel/linux-headers-5.13 update EAPI 7 -> 8 Thanks-to: Alexandros C. Couloumbis ozo.com> Closes: https://bugs.gentoo.org/801688 Signed-off-by: Lars Wendler gentoo.org> .../files/pdnsd-1.2.9a-linux-5.13_build_fix.patch | 39 ++++++++++++++++++++++ net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild | 6 +++- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/net-dns/pdnsd/files/pdnsd-1.2.9a-linux-5.13_build_fix.patch b/net-dns/pdnsd/files/pdnsd-1.2.9a-linux-5.13_build_fix.patch new file mode 100644 index 000000000000..fbc1e0bfd4ec --- /dev/null +++ b/net-dns/pdnsd/files/pdnsd-1.2.9a-linux-5.13_build_fix.patch @@ -0,0 +1,39 @@ +From 59859acf9083010639eb9bc0bf8cb5d03f03935f Mon Sep 17 00:00:00 2001 +From: SiYao Mo +Date: Fri, 16 Jul 2021 14:25:44 +0800 +Subject: [PATCH] pdnsd-alt: fix cmake error in kernel 5.13/5.14 Because of + redefinition of 'struct ifmap' & 'struct ifreq' & 'struct ifconf' in + linux/if.h (Linux Kernel above 5.13) Replace net/if.h with linux/if.h + +Signed-off-by: SiYao Mo +--- + src/conff.h | 2 +- + src/dns.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/conff.h b/src/conff.h +index a07b156..c66d210 100644 +--- a/src/conff.h ++++ b/src/conff.h +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + #include "ipvers.h" + #include "list.h" + +diff --git a/src/dns.h b/src/dns.h +index 0f6a4ac..ecc9680 100644 +--- a/src/dns.h ++++ b/src/dns.h +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include "rr_types.h" diff --git a/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild b/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild index 209fff4708a5..e22913999e9a 100644 --- a/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild +++ b/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd tmpfiles @@ -21,6 +21,10 @@ RDEPEND=" " DEPEND="test? ( net-dns/bind-tools )" +PATCHES=( + "${FILESDIR}/${P}-linux-5.13_build_fix.patch" #801688 +) + src_configure() { local myeconfargs=( --disable-isdn