commit: bf7c8daa7389acb3e77f1539ebe45f295af76544 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Dec 5 10:24:20 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> 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 <polynomial-c <AT> 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() {
