From: Lars Wendler <polynomial-c@gentoo.org>
Date: Wed, 5 Dec 2018 10:24:20 +0000 (+0100)
Subject: net-dns/nsd: Added upstream fix for USE="dnstap -ipv6" failure
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=bf7c8daa7389acb3e77f1539ebe45f295af76544;p=gentoo.git

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 <polynomial-c@gentoo.org>
---

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 000000000000..be19e337f3d9
--- /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 5fe276b04a99..2d738583621d 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() {