diff options
Diffstat (limited to 'net-dns/nsd')
| -rw-r--r-- | net-dns/nsd/Manifest | 9 | ||||
| -rw-r--r-- | net-dns/nsd/files/nsd-4.1.26-dnstap_noipv6_fix.patch | 13 | ||||
| -rw-r--r-- | net-dns/nsd/metadata.xml | 1 | ||||
| -rw-r--r-- | net-dns/nsd/nsd-4.1.25.ebuild | 8 | ||||
| -rw-r--r-- | net-dns/nsd/nsd-4.1.26.ebuild (renamed from net-dns/nsd/nsd-4.1.24.ebuild) | 20 |
5 files changed, 37 insertions, 14 deletions
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest index e5ae46ad0be2..48f6a7a52a5b 100644 --- a/net-dns/nsd/Manifest +++ b/net-dns/nsd/Manifest @@ -1,9 +1,10 @@ +AUX nsd-4.1.26-dnstap_noipv6_fix.patch 352 BLAKE2B 69ce2000ddbe4b6767d702aa1759cae2b771aa637824781a9f756cf7663bca4e55bd552d1d98e78fca6c8a81f378937539d57228e53c73bce373dedfecf10b4c SHA512 a7d3f97962e824859268d9716705769dd264506b8723fa8128d66cbaa71bc2561526ae1699f347ee0896a7c30db8d76897451060999eb819cc8fdf218f6e1f53 AUX nsd.initd-r1 1386 BLAKE2B d3a5ca31ffd06d9cf4da09617f523f61e5b8aea4e3217bf11431f32b5e7e5b59c96de3c5e1806b3e2c74cc96527e41e609e693ad88dfbcf19262b7dc5d0369fc SHA512 a8dc5b4dd6b8d763f96e46bb9bc8a43ce7518455c6efaee7061b47b477b380f47d831b993966fc4fe253657f2a3d16077dfda5c900d5788d5b991f5f9d92e618 AUX nsd.munin-conf 23 BLAKE2B 0b08804b2218d77ea925d4c9e26e73649b453b923d6d7b1e1df39ceb58b92a44c48cb21583a480e622f72d07650f410f2e0703f1d16af08152aed16982ab8da2 SHA512 c06d0b035387e7be79cfa8fedf8afb3900772146c6d4090ac39ea2ef165772d875b222ef467bd73422078ef57818bcc931ca67fa290bd99a7a9456efa5448853 AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae690876a797ea0a4580b29892d91feba2785ea933a053f862e0d00f2c8a8c09ab907386c39a03c SHA512 fbca86887bfc36d61af06992cc98b3f3cb33c39274fbdc1e53d489bdcc767993911fab27a20244c3878b36bacbd1644a552364b2f7bf4d48e6eb247d0eecdf0f AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae -DIST nsd-4.1.24.tar.gz 1107574 BLAKE2B 9e22d6a07bc7c63efb41b0b4e1a0e1e36d94db9bf79f31a704bd1ec7ba371b059669feebca4b6ed9427ba41017f661ebd8a30a26ee433b45374df75d2c182cb2 SHA512 68f7f62c740e5a73d1b9da4b6d593ff1b728bc398ad126a75febaa523a2117c80315bf90ca6a60aabf38539181e00524cedb106a32b4883aa8ed021462d47762 DIST nsd-4.1.25.tar.gz 1108285 BLAKE2B 29428e59c0913e9eb6936b577c02b03136ae51e47d58f5d476368b4e6614e240a735a29ec5f224dbca6f76068fa81f0eed32fad75bf647673f35641ac414e3a6 SHA512 3a1de59d799a94aeb236139bf52f1d2e2139002ec8a033948a2324680df513e6c333e3564f526ca4fa106b42e50ae2bc67edadaeee72f608dabed962aacb5423 -EBUILD nsd-4.1.24.ebuild 2935 BLAKE2B d0b6febc24f042d518d85787cb107ccf84988c292ed35f09bc52a89c5e9282dff7ec49eb5fa8b7adee3fad4035d193654d982a33bd29108cb6bdeb03d01d0b22 SHA512 6e47eea4e97455959f5782652e0369e99eadf59fd18be8af5780d52039b1ae97dd5ac1bcd1c1767b1070e75a832ac3273f46d52e429f6b4fd8058d43afac38a5 -EBUILD nsd-4.1.25.ebuild 2937 BLAKE2B b167d5163b6ec650997b70b8b48d878164fba78aa7a09fac72c0cc9c7e92a7cc73b57c4a8fc48d26d6c11fc94f650121c4c374a66662c7d8f9134c1a7adca62a SHA512 de3629cd62543e497059c8e3d8fb24977895ff53709da9ead0d94a4a3e08d81fdc4d71a6b463851b8bbc7bfe02b2b47a6fc518901b90bfbbe89d6883f17971f9 -MISC metadata.xml 1013 BLAKE2B b989a1ccafac96d48d6f1b72bace164fcb1c04885ec9436e37fb29d94bf8c5feb4a02a1b4fc04241b6fa3c9d6d89ec993e3a06b6efc7ccd45d4ace3fad16cb18 SHA512 e7c0d6a267fd06546ac58278ffb75280aa0c0ed55ddf0097614906c1863e55cf572ff7660e021ac8861c506ed0de126c0c5e68dd2d88aea1a395be3234607ce5 +DIST nsd-4.1.26.tar.gz 1127895 BLAKE2B b132022b846cffffa0ca34fff189f95c26dc7646648773d455ad7835c42718b1a00645b3b686e5c211432ef4bb83a3618ae6b675b9b53fd40ecf7a9f6d9ec5ba SHA512 49c07ad79e4e056bd519dad157a44d5cc55cd9a28723fd910159dc761d4ba56ef86cb7bf289dc5d1b363a49b999232bb7ec1afa737ca5c2659c4c9893e93494b +EBUILD nsd-4.1.25.ebuild 2929 BLAKE2B 0cec048c4ad8c25831da05e5c46aeff51b89b9b222041f8611389a9603dafca4e0a9fb680cf6629a4f41f3e39e4e51091a9e2cfb4382dba6b2d0f037694c7890 SHA512 8bda60f6858025c0cae80115aa87842b6b242bc3fddecbd55f0cd5bae0bec1114c48cfda752373a74387ba287b45868ef6a47d67e6fc6fab58e6eb6189fed018 +EBUILD nsd-4.1.26.ebuild 3120 BLAKE2B 24c13aab7d796e72e0b4254a3f0fd9d105bb41d4d5f8abe5e726a218ba06dabb6de21fc6e062cceb071815b6a219181cf5c7a7a7f7a45702d8a5716aa45233fa SHA512 af2fe234655ebb5d25d412fc4fb11ba38f0799d5573d95ddd66a12b51c5c8fa7fd8b834cc72b789d5f1e6b09584fed9a920a0bef74ba5195f0eeb9d8aa0ede23 +MISC metadata.xml 1082 BLAKE2B c44a5b7b9cb5ad52ebc55dd52a584cd8b0700977a19d541df1b415164250e390941ef35a0e8633a975e6cbae402719d8c5fe7d452dde5623223b01a7ec4320ac SHA512 a66e71346c6742c77ce38ca73f600dde471f3256928bab79f2015cb88c2f3237a4d69f7b9127ea90c58f584b60b8b676416b0704761ee1455479644fd2cd5a8d 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/metadata.xml b/net-dns/nsd/metadata.xml index 0d66874728b4..80941c35662f 100644 --- a/net-dns/nsd/metadata.xml +++ b/net-dns/nsd/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="bind8-stats">Enables BIND8 like NSTATS and XSTATS</flag> + <flag name="dnstap">Enable the structured binary log format</flag> <flag name="libevent">Use libevent or libev, useful when zone count is high</flag> <flag name="minimal-responses">If minimal responses are disabled, diff --git a/net-dns/nsd/nsd-4.1.25.ebuild b/net-dns/nsd/nsd-4.1.25.ebuild index 9a5fc16aa9bb..bef653ea457a 100644 --- a/net-dns/nsd/nsd-4.1.25.ebuild +++ b/net-dns/nsd/nsd-4.1.25.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl" S="${WORKDIR}/${MY_P}" @@ -93,7 +93,7 @@ src_install() { # remove the /run directory that usually resides on tmpfs and is # being taken care of by the nsd init script anyway (checkpath) - rm -r "${ED%/}"/run || die "Failed to remove /run" + rm -r "${ED}"/run || die "Failed to remove /run" keepdir /var/db/${PN} } @@ -104,8 +104,8 @@ pkg_postinst() { enewuser nsd -1 -1 -1 nsd # database directory, writable by nsd for database updates and zone transfers - install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/db/nsd + install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd # zones directory, writable by nsd for zone file updates (nsd-control write) - install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/lib/nsd + install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd } diff --git a/net-dns/nsd/nsd-4.1.24.ebuild b/net-dns/nsd/nsd-4.1.26.ebuild index bce39add9171..2d738583621d 100644 --- a/net-dns/nsd/nsd-4.1.24.ebuild +++ b/net-dns/nsd/nsd-4.1.26.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools user systemd @@ -15,12 +15,16 @@ HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl" +KEYWORDS="~amd64 ~x86" +IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl" S="${WORKDIR}/${MY_P}" RDEPEND=" + dnstap? ( + dev-libs/fstrm + dev-libs/protobuf-c + ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( @@ -39,6 +43,9 @@ DEPEND=" 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() { @@ -60,6 +67,7 @@ src_configure() { --with-zonesdir="${EPREFIX}"/var/lib/nsd $(use_enable bind8-stats) $(use_enable bind8-stats zone-stats) + $(use_enable dnstap) $(use_enable ipv6) $(use_enable minimal-responses) $(use_enable mmap) @@ -93,7 +101,7 @@ src_install() { # remove the /run directory that usually resides on tmpfs and is # being taken care of by the nsd init script anyway (checkpath) - rm -r "${ED%/}"/run || die "Failed to remove /run" + rm -r "${ED}"/run || die "Failed to remove /run" keepdir /var/db/${PN} } @@ -104,8 +112,8 @@ pkg_postinst() { enewuser nsd -1 -1 -1 nsd # database directory, writable by nsd for database updates and zone transfers - install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/db/nsd + install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd # zones directory, writable by nsd for zone file updates (nsd-control write) - install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/lib/nsd + install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd } |