Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/nsd/files/, net-dns/nsd/
Date: Tue, 27 Sep 2016 22:34:35
Message-Id: 1475015663.9ba90733adba1e11baa9d58396e0d6e566021000.polynomial-c@gentoo
1 commit: 9ba90733adba1e11baa9d58396e0d6e566021000
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 27 22:33:59 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 27 22:34:23 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ba90733
7
8 net-dns/nsd: Removed old.
9
10 Package-Manager: portage-2.3.1
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 net-dns/nsd/Manifest | 2 -
14 .../nsd-4.1.10-r4644-build-without-ipv6.patch | 23 -----
15 net-dns/nsd/files/nsd.initd | 53 -----------
16 net-dns/nsd/nsd-4.1.10.ebuild | 100 ---------------------
17 net-dns/nsd/nsd-4.1.11-r2.ebuild | 97 --------------------
18 5 files changed, 275 deletions(-)
19
20 diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
21 index 62bfb39..a06b0fb 100644
22 --- a/net-dns/nsd/Manifest
23 +++ b/net-dns/nsd/Manifest
24 @@ -1,5 +1,3 @@
25 DIST nsd-3.2.22.tar.gz 924627 SHA256 47c2b424c719a1535f709f4e82d796bca43cad86731f5f275c9367040a474a03 SHA512 2c0cbc97eaa376dcf496ed4323d9f7afb0dbf1852fa5fc9d8c7ecbcf8aaa1b025d56b5e439d19bc36b50deaf5f753fb08109d7e25dc1f8223fe85b7d017f81c3 WHIRLPOOL 271b47a331f2a63dd51bf642fed7083f27660f618fe0418c6b3a361d7b0a7ebda1a300d12d92c1c03e21cd17560ba4f2f2cdac76f7c6793d4befc71b66646f7d
26 -DIST nsd-4.1.10.tar.gz 1075892 SHA256 3a757014046752a0b0b11c1a2e22a36bb796f89f6939147ed3226556b4298727 SHA512 e77c858d34002e54085f3a39eda7c6229f21f980339beb9a9d5719245d6010e5435a13dba978ac1aed9b712ed49e5a8ca75cb216cb50dd590556077d32b97a96 WHIRLPOOL 8d04b8661e821ec49c93a00a088bec83b3ca3faf7c07d9d720cba1c5c71fc2db3aafc95b5d0d3a8e848c38f11bd9daeb1a53da752bcf8314722aefbd1d55c4d5
27 -DIST nsd-4.1.11.tar.gz 1080220 SHA256 c7712fd05eb0ab97040738e01d9369d02b89c0a7fa0943fd5bfc43b2111a92df SHA512 e5f4ad1d39bd75b086f3fc3281fa6ac31f4b6ba9c4a9e23bba527d1a1374dfaf0acaac24168bb5a3ad5a041829d1864331928f18ba49562a25e3f8651609a1f7 WHIRLPOOL 187088f8b1c4c92a7e67535b9f2d1520ff3d056c209535afa74079f4b680bf2afe7766e5a102b1481cfe11beb2169b4e1dedcec6d137ab3044e04cf5715fc579
28 DIST nsd-4.1.12.tar.gz 1080273 SHA256 fd1979dff1fba55310fd4f439dc9f3f4701d435c0ec4fb9af533e12c7f27d5de SHA512 f78c0a24669ce8a0cf5640d90f5dfc8756009a840545feddd9c466a5f0b7441d470efb267f7ad38ed45321a6f8b75ad7db9b13bdaefab55b7614ebb3e9bd183b WHIRLPOOL 6304ff6b25a315cf3e340d9cf3cffee141abfdceaeb71ac94c97fe78d14698fe2164042db7785a254feeecd4170c4ad7a8fccdf165cfb5bbefbe1244fdbd4bea
29 DIST nsd-4.1.13.tar.gz 1085701 SHA256 c45cd4ba2101a027e133b2be44db9378e27602e05f09a5ef25019e1ae45291af SHA512 f355402273480b2befe914ab2e933c37ec35e5c8e747f85ba03bf8928e42ab809bb6b21cf2b8bf11e8d422a795254e1d916b154156243bc94752a01fb540525e WHIRLPOOL f5d7d3386649b82bf2f7eb6ab2f0c50b2f11e4e545931d99352a63317cda127278e5d9219763dc51a5e3a73daa0ab04e45b037eea738cad20cabf284068e9c7c
30
31 diff --git a/net-dns/nsd/files/nsd-4.1.10-r4644-build-without-ipv6.patch b/net-dns/nsd/files/nsd-4.1.10-r4644-build-without-ipv6.patch
32 deleted file mode 100644
33 index cb59ca9..00000000
34 --- a/net-dns/nsd/files/nsd-4.1.10-r4644-build-without-ipv6.patch
35 +++ /dev/null
36 @@ -1,23 +0,0 @@
37 - 4.1.10
38 -Index: query.c
39 -===================================================================
40 -diff --git a/query.c b/query.c
41 ---- a/query.c (revision 4643)
42 -+++ b/query.c (revision 4644)
43 -@@ -704,11 +704,16 @@
44 - result = answer_add_rrset(answer, section, owner, rrset);
45 - switch (rrset_rrtype(rrset)) {
46 - case TYPE_NS:
47 -+#if defined(INET6)
48 - /* if query over IPv6, swap A and AAAA; put AAAA first */
49 - add_additional_rrsets(query, answer, rrset, 0, 1,
50 - (query->addr.ss_family == AF_INET6)?
51 - swap_aaaa_additional_rr_types:
52 - default_additional_rr_types);
53 -+#else
54 -+ add_additional_rrsets(query, answer, rrset, 0, 1,
55 -+ default_additional_rr_types);
56 -+#endif
57 - break;
58 - case TYPE_MB:
59 - add_additional_rrsets(query, answer, rrset, 0, 0,
60
61 diff --git a/net-dns/nsd/files/nsd.initd b/net-dns/nsd/files/nsd.initd
62 deleted file mode 100644
63 index bbab4a6..00000000
64 --- a/net-dns/nsd/files/nsd.initd
65 +++ /dev/null
66 @@ -1,53 +0,0 @@
67 -#!/sbin/openrc-run
68 -# Copyright 1999-2016 Gentoo Foundation
69 -# Distributed under the terms of the GNU General Public License v2
70 -# $Id$
71 -
72 -description="NSD is an authoritative-only, high performance, open source name server"
73 -extra_commands="configtest"
74 -
75 -# these can be overridden in /etc/conf.d/nsd if necessary
76 -NSD_CONFIG="${NSD_CONFIG:-/etc/nsd/nsd.conf}"
77 -NSD_BINARY="${NSD_BINARY:-/usr/sbin/nsd}"
78 -NSD_CHECKCONF="${NSD_CHECKCONF:-/usr/sbin/nsd-checkconf}"
79 -
80 -depend() {
81 - need net
82 - use logger
83 -}
84 -
85 -configtest() {
86 - ebegin "Checking ${SVCNAME} configuration"
87 - checkconfig
88 - eend $?
89 -}
90 -
91 -checkconfig() {
92 - if ! test -e "${NSD_CONFIG}"; then
93 - eerror "You need to create an appropriate config file."
94 - eerror "An example can be found in /etc/nsd/nsd.conf.sample"
95 - return 1
96 - elif ! "${NSD_CHECKCONF}" "${NSD_CONFIG}"; then
97 - eerror "You have errors in your configfile (${NSD_CONFIG})"
98 - return $?
99 - fi
100 - return 0
101 -}
102 -
103 -start() {
104 - ebegin "Starting NSD"
105 - checkconfig || return $?
106 - local pidfile=$("${NSD_CHECKCONF}" -o pidfile "${NSD_CONFIG}")
107 - checkpath --directory --owner nsd:nsd $(dirname "${pidfile}")
108 - start-stop-daemon --start --pidfile "${pidfile}" \
109 - --exec "${NSD_BINARY}" -- -c "${NSD_CONFIG}"
110 - eend $?
111 -}
112 -
113 -stop() {
114 - ebegin "Stopping NSD"
115 - checkconfig || return $?
116 - local pidfile=$("${NSD_CHECKCONF}" -o pidfile "${NSD_CONFIG}")
117 - start-stop-daemon --stop --pidfile "${pidfile}"
118 - eend $?
119 -}
120
121 diff --git a/net-dns/nsd/nsd-4.1.10.ebuild b/net-dns/nsd/nsd-4.1.10.ebuild
122 deleted file mode 100644
123 index bc175e8..00000000
124 --- a/net-dns/nsd/nsd-4.1.10.ebuild
125 +++ /dev/null
126 @@ -1,100 +0,0 @@
127 -# Copyright 1999-2016 Gentoo Foundation
128 -# Distributed under the terms of the GNU General Public License v2
129 -# $Id$
130 -
131 -EAPI=6
132 -
133 -inherit user systemd
134 -
135 -DESCRIPTION="An authoritative only, high performance, open source name server"
136 -HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
137 -# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
138 -MY_PV=${PV/_rc/rc}
139 -MY_PV=${MY_PV/_beta/b}
140 -MY_P=${PN}-${MY_PV}
141 -S="${WORKDIR}/${MY_P}"
142 -SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
143 -
144 -LICENSE="BSD"
145 -SLOT="0"
146 -KEYWORDS="~amd64 ~x86"
147 -IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl libressl"
148 -
149 -RDEPEND="
150 - virtual/yacc
151 - libevent? ( dev-libs/libevent )
152 - ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
153 - munin? ( net-analyzer/munin )
154 -"
155 -DEPEND="
156 - ${RDEPEND}
157 - sys-devel/flex
158 -"
159 -
160 -src_prepare() {
161 - # Fix for USE=-ipv6 compile bug in nsd 4.1.10 only, taken from upstream
162 - eapply "${FILESDIR}/${P}-r4644-build-without-ipv6.patch"
163 -
164 - # Fix the paths in the munin plugin to match our install
165 - eapply "${FILESDIR}"/nsd_munin_.patch
166 - eapply_user
167 -}
168 -
169 -src_configure() {
170 - econf \
171 - --enable-pie \
172 - --enable-relro-now \
173 - --enable-largefile \
174 - --with-logfile="${EPREFIX}"/var/log/nsd.log \
175 - --with-pidfile="${EPREFIX}"/run/nsd/nsd.pid \
176 - --with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db \
177 - --with-xfrdir="${EPREFIX}"/var/db/nsd \
178 - --with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state \
179 - --with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list \
180 - --with-zonesdir="${EPREFIX}"/var/lib/nsd \
181 - $(use_enable bind8-stats) \
182 - $(use_enable bind8-stats zone-stats) \
183 - $(use_enable ipv6) \
184 - $(use_enable minimal-responses) \
185 - $(use_enable mmap) \
186 - $(use_enable nsec3) \
187 - $(use_enable ratelimit) \
188 - $(use_enable root-server) \
189 - $(use_enable runtime-checks checking) \
190 - $(use_with libevent) \
191 - $(use_with ssl)
192 -}
193 -
194 -src_install() {
195 - emake DESTDIR="${D}" install
196 -
197 - dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
198 -
199 - newinitd "${FILESDIR}"/nsd.initd nsd
200 -
201 - # install munin plugin and config
202 - if use munin ; then
203 - exeinto /usr/libexec/munin/plugins
204 - doexe contrib/nsd_munin_
205 - insinto /etc/munin/plugin-conf.d
206 - newins "${FILESDIR}"/nsd.munin-conf nsd_munin
207 - fi
208 -
209 - systemd_dounit "${FILESDIR}"/nsd.service
210 -
211 - # remove the /run directory that usually resides on tmpfs and is
212 - # being taken care of by the nsd init script anyway (checkpath)
213 - rm -r "${ED}"/run || die "Failed to remove /run"
214 -}
215 -
216 -pkg_postinst() {
217 - # Do this in postinst to ensure the uid/gid is consistent for binpkgs
218 - enewgroup nsd
219 - enewuser nsd -1 -1 -1 nsd
220 -
221 - # database directory, writable by nsd for database updates and zone transfers
222 - install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/db/nsd
223 -
224 - # zones directory, writable by nsd for zone file updates (nsd-control write)
225 - install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/lib/nsd
226 -}
227
228 diff --git a/net-dns/nsd/nsd-4.1.11-r2.ebuild b/net-dns/nsd/nsd-4.1.11-r2.ebuild
229 deleted file mode 100644
230 index 3719d0f..00000000
231 --- a/net-dns/nsd/nsd-4.1.11-r2.ebuild
232 +++ /dev/null
233 @@ -1,97 +0,0 @@
234 -# Copyright 1999-2016 Gentoo Foundation
235 -# Distributed under the terms of the GNU General Public License v2
236 -# $Id$
237 -
238 -EAPI=6
239 -
240 -inherit user systemd
241 -
242 -DESCRIPTION="An authoritative only, high performance, open source name server"
243 -HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
244 -# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
245 -MY_PV=${PV/_rc/rc}
246 -MY_PV=${MY_PV/_beta/b}
247 -MY_P=${PN}-${MY_PV}
248 -S="${WORKDIR}/${MY_P}"
249 -SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
250 -
251 -LICENSE="BSD"
252 -SLOT="0"
253 -KEYWORDS="~amd64 ~x86"
254 -IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl libressl"
255 -
256 -RDEPEND="
257 - virtual/yacc
258 - libevent? ( dev-libs/libevent )
259 - ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
260 - munin? ( net-analyzer/munin )
261 -"
262 -DEPEND="
263 - ${RDEPEND}
264 - sys-devel/flex
265 -"
266 -
267 -src_prepare() {
268 - # Fix the paths in the munin plugin to match our install
269 - eapply "${FILESDIR}"/nsd_munin_.patch
270 - eapply_user
271 -}
272 -
273 -src_configure() {
274 - econf \
275 - --enable-pie \
276 - --enable-relro-now \
277 - --enable-largefile \
278 - --with-logfile="${EPREFIX}"/var/log/nsd.log \
279 - --with-pidfile="${EPREFIX}"/run/nsd/nsd.pid \
280 - --with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db \
281 - --with-xfrdir="${EPREFIX}"/var/db/nsd \
282 - --with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state \
283 - --with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list \
284 - --with-zonesdir="${EPREFIX}"/var/lib/nsd \
285 - $(use_enable bind8-stats) \
286 - $(use_enable bind8-stats zone-stats) \
287 - $(use_enable ipv6) \
288 - $(use_enable minimal-responses) \
289 - $(use_enable mmap) \
290 - $(use_enable nsec3) \
291 - $(use_enable ratelimit) \
292 - $(use_enable root-server) \
293 - $(use_enable runtime-checks checking) \
294 - $(use_with libevent) \
295 - $(use_with ssl)
296 -}
297 -
298 -src_install() {
299 - emake DESTDIR="${D}" install
300 -
301 - dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
302 -
303 - newinitd "${FILESDIR}"/nsd.initd-r1 nsd
304 -
305 - # install munin plugin and config
306 - if use munin ; then
307 - exeinto /usr/libexec/munin/plugins
308 - doexe contrib/nsd_munin_
309 - insinto /etc/munin/plugin-conf.d
310 - newins "${FILESDIR}"/nsd.munin-conf nsd_munin
311 - fi
312 -
313 - systemd_dounit "${FILESDIR}"/nsd.service
314 -
315 - # remove the /run directory that usually resides on tmpfs and is
316 - # being taken care of by the nsd init script anyway (checkpath)
317 - rm -r "${ED}"/run || die "Failed to remove /run"
318 -}
319 -
320 -pkg_postinst() {
321 - # Do this in postinst to ensure the uid/gid is consistent for binpkgs
322 - enewgroup nsd
323 - enewuser nsd -1 -1 -1 nsd
324 -
325 - # database directory, writable by nsd for database updates and zone transfers
326 - install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/db/nsd
327 -
328 - # zones directory, writable by nsd for zone file updates (nsd-control write)
329 - install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/lib/nsd
330 -}