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 33978138334 for ; Wed, 5 Dec 2018 10:24:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C372E0ABE; Wed, 5 Dec 2018 10:24:41 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 1E765E0ABE for ; Wed, 5 Dec 2018 10:24:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 6F4D0335CDD for ; Wed, 5 Dec 2018 10:24:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2FB51445 for ; Wed, 5 Dec 2018 10:24:36 +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: <1544005460.bf7c8daa7389acb3e77f1539ebe45f295af76544.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/nsd/files/, net-dns/nsd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/nsd/files/nsd-4.1.26-dnstap_noipv6_fix.patch net-dns/nsd/nsd-4.1.26.ebuild X-VCS-Directories: net-dns/nsd/ net-dns/nsd/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: bf7c8daa7389acb3e77f1539ebe45f295af76544 X-VCS-Branch: master Date: Wed, 5 Dec 2018 10:24:36 +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: 492d9d33-8acf-4575-a0eb-98ab5739cefa X-Archives-Hash: 0eb61b585197837570d024897840142c commit: bf7c8daa7389acb3e77f1539ebe45f295af76544 Author: Lars Wendler gentoo org> AuthorDate: Wed Dec 5 10:24:20 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Dec 5 10:24:20 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf7c8daa net-dns/nsd: Added upstream fix for USE="dnstap -ipv6" failure Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> net-dns/nsd/files/nsd-4.1.26-dnstap_noipv6_fix.patch | 13 +++++++++++++ net-dns/nsd/nsd-4.1.26.ebuild | 9 +++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/net-dns/nsd/files/nsd-4.1.26-dnstap_noipv6_fix.patch b/net-dns/nsd/files/nsd-4.1.26-dnstap_noipv6_fix.patch new file mode 100644 index 00000000000..be19e337f3d --- /dev/null +++ b/net-dns/nsd/files/nsd-4.1.26-dnstap_noipv6_fix.patch @@ -0,0 +1,13 @@ +https://www.nlnetlabs.nl/bugs-script/show_bug.cgi?id=4213 + +--- nsd-4.1.26/dnstap/dnstap.c ++++ nsd-4.1.26/dnstap/dnstap.c +@@ -319,7 +319,7 @@ + *has_port = 1; + } else if (ss->ss_family == AF_INET) { + #else +- if (ss->ss_family == AF_INET) { ++ if (ss->sin_family == AF_INET) { + #endif /* INET6 */ + struct sockaddr_in *s = (struct sockaddr_in *) ss; + diff --git a/net-dns/nsd/nsd-4.1.26.ebuild b/net-dns/nsd/nsd-4.1.26.ebuild index 5fe276b04a9..2d738583621 100644 --- a/net-dns/nsd/nsd-4.1.26.ebuild +++ b/net-dns/nsd/nsd-4.1.26.ebuild @@ -40,15 +40,12 @@ DEPEND=" systemd? ( virtual/pkgconfig ) " -# dnstap fails to build without ipv6 -# See https://www.nlnetlabs.nl/bugs-script/show_bug.cgi?id=4213 -REQUIRED_USE=" - dnstap? ( ipv6 ) -" - PATCHES=( # Fix the paths in the munin plugin to match our install "${FILESDIR}"/nsd_munin_.patch + + # https://www.nlnetlabs.nl/bugs-script/show_bug.cgi?id=4213 + "${FILESDIR}"/${P}-dnstap_noipv6_fix.patch ) src_prepare() {