1 |
commit: c8187366a1ddc5adbf4bae3d9d4a3b1944c7c320 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 29 17:30:43 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 29 17:49:20 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8187366 |
7 |
|
8 |
net-dns/nsd: drop 4.3.9, 4.4.0 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
net-dns/nsd/Manifest | 2 - |
13 |
net-dns/nsd/files/nsd-4.3.9-no_ssl.patch | 22 ------ |
14 |
net-dns/nsd/nsd-4.3.9.ebuild | 119 ------------------------------- |
15 |
net-dns/nsd/nsd-4.4.0.ebuild | 119 ------------------------------- |
16 |
4 files changed, 262 deletions(-) |
17 |
|
18 |
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest |
19 |
index 4705886c0228..17df2b61cc13 100644 |
20 |
--- a/net-dns/nsd/Manifest |
21 |
+++ b/net-dns/nsd/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
DIST nsd-4.3.8.tar.gz 1225840 BLAKE2B 19d014f130844aab5b7c6224658c6e5a4a7d8d337ceb11e1641bceb367fe76b46be146c703296a12cec834020992eabec0e1ee8f3cb6211333ac8c4c7029fef5 SHA512 aec892f85a6757bfdf537c6f0b4bc3d60c564b3062b582af14df800b24261edc96bedcd0b6649444a46b198b9018397e356b919a871364032c8a2db6256b9268 |
24 |
-DIST nsd-4.3.9.tar.gz 1222919 BLAKE2B 0b317c246f66476e95727d763bf7444cde14936c8a87036843458b89f8c79790130995db3f0f9ff33d8bfda756cf3ae4724b07f97ee2996f05a2dcd1c14bc0e5 SHA512 de170cbaf6e0be0a20941d9d6b2102a7dddb59a320c30566238447d5740e4497f751f54488f36c2b89f2c3cff6e3101df31a36d0d2d66db8d77cfb6e86124f32 |
25 |
-DIST nsd-4.4.0.tar.gz 1226433 BLAKE2B 8ead662c2ad87e9cfd9424898758cb7a7e6adc3c419583e0a4c3ced4d6bb8ae5005266af621ee4c138a06215652b60b65f075a875b6473dc92d1bef414901be1 SHA512 0fa32337246ccdaf9d6fe4257792cef8b6ce6de086fdee1024983da7b90a77b9039061cee87a2e0ad7eddf195411c57f4777469d973f2bdc10d3a51ee96d90bc |
26 |
DIST nsd-4.5.0.tar.gz 1259059 BLAKE2B 5c90a17b2c2df3cf06bea2609fb02198b4fdde3e9ed7cc0a07526d43069f735458a0c1775fc7b45ac7bd1fba42ec329fe5b67378d6282bf86f6c520f73b00397 SHA512 0309e1ff083b6f2118ba6fd59425319c21f31558d30e17a40eb8f1e53dee9e3e766d7b53eb50462130ba17b454a3559dc786d344cb779468d255732bbc6bc5da |
27 |
|
28 |
diff --git a/net-dns/nsd/files/nsd-4.3.9-no_ssl.patch b/net-dns/nsd/files/nsd-4.3.9-no_ssl.patch |
29 |
deleted file mode 100644 |
30 |
index 33553a0ec889..000000000000 |
31 |
--- a/net-dns/nsd/files/nsd-4.3.9-no_ssl.patch |
32 |
+++ /dev/null |
33 |
@@ -1,22 +0,0 @@ |
34 |
-From c5e6a8e5e566380c8c6731e9feb7ac686a1c0735 Mon Sep 17 00:00:00 2001 |
35 |
-From: "W.C.A. Wijngaards" <wouter@×××××××××.nl> |
36 |
-Date: Fri, 28 Jan 2022 16:38:53 +0100 |
37 |
-Subject: [PATCH] - Fix #206: build with --without-ssl fails. |
38 |
- |
39 |
-diff --git a/edns.c b/edns.c |
40 |
-index c7fc39d9..478ec681 100644 |
41 |
---- a/edns.c |
42 |
-+++ b/edns.c |
43 |
-@@ -21,6 +21,12 @@ |
44 |
- #include "nsd.h" |
45 |
- #include "query.h" |
46 |
- |
47 |
-+#if !defined(HAVE_SSL) || !defined(HAVE_CRYPTO_MEMCMP) |
48 |
-+/* we need fixed time compare, pull it in from tsig.c */ |
49 |
-+#define CRYPTO_memcmp memcmp_fixedtime |
50 |
-+int memcmp_fixedtime(const void *s1, const void *s2, size_t n); |
51 |
-+#endif |
52 |
-+ |
53 |
- void |
54 |
- edns_init_data(edns_data_type *data, uint16_t max_length) |
55 |
- { |
56 |
|
57 |
diff --git a/net-dns/nsd/nsd-4.3.9.ebuild b/net-dns/nsd/nsd-4.3.9.ebuild |
58 |
deleted file mode 100644 |
59 |
index e4f824b01061..000000000000 |
60 |
--- a/net-dns/nsd/nsd-4.3.9.ebuild |
61 |
+++ /dev/null |
62 |
@@ -1,119 +0,0 @@ |
63 |
-# Copyright 1999-2022 Gentoo Authors |
64 |
-# Distributed under the terms of the GNU General Public License v2 |
65 |
- |
66 |
-EAPI=8 |
67 |
- |
68 |
-inherit autotools systemd |
69 |
- |
70 |
-# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1 |
71 |
-MY_PV="${PV/_beta/b}" |
72 |
-MY_PV="${MY_PV/_rc/rc}" |
73 |
-MY_P="${PN}-${MY_PV}" |
74 |
- |
75 |
-DESCRIPTION="An authoritative only, high performance, open source name server" |
76 |
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" |
77 |
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" |
78 |
-LICENSE="BSD" |
79 |
-SLOT="0" |
80 |
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ |
81 |
-KEYWORDS="~amd64 ~x86" |
82 |
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd" |
83 |
- |
84 |
-S="${WORKDIR}/${MY_P}" |
85 |
- |
86 |
-RDEPEND=" |
87 |
- acct-group/nsd |
88 |
- acct-user/nsd |
89 |
- dnstap? ( |
90 |
- dev-libs/fstrm |
91 |
- dev-libs/protobuf-c |
92 |
- ) |
93 |
- libevent? ( dev-libs/libevent ) |
94 |
- munin? ( net-analyzer/munin ) |
95 |
- ssl? ( |
96 |
- dev-libs/openssl:0= |
97 |
- ) |
98 |
- systemd? ( sys-apps/systemd ) |
99 |
-" |
100 |
-DEPEND="${RDEPEND}" |
101 |
-BDEPEND=" |
102 |
- sys-devel/flex |
103 |
- virtual/yacc |
104 |
- systemd? ( virtual/pkgconfig ) |
105 |
-" |
106 |
- |
107 |
-PATCHES=( |
108 |
- # Fix the paths in the munin plugin to match our install |
109 |
- "${FILESDIR}"/nsd_munin_.patch |
110 |
- |
111 |
- "${FILESDIR}/${P}-no_ssl.patch" #832213 |
112 |
-) |
113 |
- |
114 |
-src_prepare() { |
115 |
- default |
116 |
- # Required to get correct pkg-config macros with USE="systemd" |
117 |
- # see bugs #663618 and #758050 |
118 |
- eautoreconf |
119 |
-} |
120 |
- |
121 |
-src_configure() { |
122 |
- local myeconfargs=( |
123 |
- --enable-largefile |
124 |
- --enable-pie |
125 |
- --enable-relro-now |
126 |
- --enable-tcp-fastopen |
127 |
- --with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db |
128 |
- --with-logfile="${EPREFIX}"/var/log/nsd.log |
129 |
- --with-pidfile="${EPREFIX}"/run/nsd/nsd.pid |
130 |
- --with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state |
131 |
- --with-xfrdir="${EPREFIX}"/var/db/nsd |
132 |
- --with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list |
133 |
- --with-zonesdir="${EPREFIX}"/var/lib/nsd |
134 |
- $(use_enable bind8-stats) |
135 |
- $(use_enable bind8-stats zone-stats) |
136 |
- $(use_enable dnstap) |
137 |
- $(use_enable ipv6) |
138 |
- $(use_enable minimal-responses) |
139 |
- $(use_enable mmap) |
140 |
- $(use_enable nsec3) |
141 |
- $(use_enable ratelimit) |
142 |
- $(use_enable root-server) |
143 |
- $(use_enable runtime-checks checking) |
144 |
- $(use_enable systemd) |
145 |
- $(use_with libevent) |
146 |
- $(use_with ssl) |
147 |
- ) |
148 |
- econf "${myeconfargs[@]}" |
149 |
-} |
150 |
- |
151 |
-src_install() { |
152 |
- emake DESTDIR="${D}" install |
153 |
- |
154 |
- dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS} |
155 |
- |
156 |
- newinitd "${FILESDIR}"/nsd.initd-r1 nsd |
157 |
- |
158 |
- # install munin plugin and config |
159 |
- if use munin ; then |
160 |
- exeinto /usr/libexec/munin/plugins |
161 |
- doexe contrib/nsd_munin_ |
162 |
- insinto /etc/munin/plugin-conf.d |
163 |
- newins "${FILESDIR}"/nsd.munin-conf nsd_munin |
164 |
- fi |
165 |
- |
166 |
- systemd_dounit "${FILESDIR}"/nsd.service |
167 |
- |
168 |
- # remove the /run directory that usually resides on tmpfs and is |
169 |
- # being taken care of by the nsd init script anyway (checkpath) |
170 |
- rm -r "${ED}"/run || die "Failed to remove /run" |
171 |
- |
172 |
- keepdir /var/db/${PN} |
173 |
-} |
174 |
- |
175 |
-pkg_postinst() { |
176 |
- # database directory, writable by nsd for database updates and zone transfers |
177 |
- install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd |
178 |
- |
179 |
- # zones directory, writable by nsd for zone file updates (nsd-control write) |
180 |
- install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd |
181 |
-} |
182 |
|
183 |
diff --git a/net-dns/nsd/nsd-4.4.0.ebuild b/net-dns/nsd/nsd-4.4.0.ebuild |
184 |
deleted file mode 100644 |
185 |
index a41057e6300d..000000000000 |
186 |
--- a/net-dns/nsd/nsd-4.4.0.ebuild |
187 |
+++ /dev/null |
188 |
@@ -1,119 +0,0 @@ |
189 |
-# Copyright 1999-2022 Gentoo Authors |
190 |
-# Distributed under the terms of the GNU General Public License v2 |
191 |
- |
192 |
-EAPI=8 |
193 |
- |
194 |
-inherit autotools systemd |
195 |
- |
196 |
-DESCRIPTION="An authoritative only, high performance, open source name server" |
197 |
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" |
198 |
-LICENSE="BSD" |
199 |
-SLOT="0" |
200 |
-if [[ "${PV}" == *9999 ]] ; then |
201 |
- inherit git-r3 |
202 |
- EGIT_REPO_URI="https://github.com/NLnetLabs/nsd.git" |
203 |
-else |
204 |
- # version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1 |
205 |
- MY_PV="${PV/_beta/b}" |
206 |
- MY_PV="${MY_PV/_rc/rc}" |
207 |
- MY_P="${PN}-${MY_PV}" |
208 |
- |
209 |
- [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ |
210 |
- KEYWORDS="~amd64 ~x86" |
211 |
- SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" |
212 |
- S="${WORKDIR}/${MY_P}" |
213 |
-fi |
214 |
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd" |
215 |
- |
216 |
-RDEPEND=" |
217 |
- acct-group/nsd |
218 |
- acct-user/nsd |
219 |
- dnstap? ( |
220 |
- dev-libs/fstrm |
221 |
- dev-libs/protobuf-c |
222 |
- ) |
223 |
- libevent? ( dev-libs/libevent ) |
224 |
- munin? ( net-analyzer/munin ) |
225 |
- ssl? ( dev-libs/openssl:0= ) |
226 |
- systemd? ( sys-apps/systemd ) |
227 |
-" |
228 |
-DEPEND="${RDEPEND}" |
229 |
-BDEPEND=" |
230 |
- sys-devel/flex |
231 |
- virtual/yacc |
232 |
- systemd? ( virtual/pkgconfig ) |
233 |
-" |
234 |
- |
235 |
-PATCHES=( |
236 |
- # Fix the paths in the munin plugin to match our install |
237 |
- "${FILESDIR}"/nsd_munin_.patch |
238 |
-) |
239 |
- |
240 |
-src_prepare() { |
241 |
- default |
242 |
- # Required to get correct pkg-config macros with USE="systemd" |
243 |
- # see bugs #663618 and #758050 |
244 |
- eautoreconf |
245 |
-} |
246 |
- |
247 |
-src_configure() { |
248 |
- local myeconfargs=( |
249 |
- --enable-largefile |
250 |
- --enable-pie |
251 |
- --enable-relro-now |
252 |
- --enable-tcp-fastopen |
253 |
- --with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db |
254 |
- --with-logfile="${EPREFIX}"/var/log/nsd.log |
255 |
- --with-pidfile="${EPREFIX}"/run/nsd/nsd.pid |
256 |
- --with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state |
257 |
- --with-xfrdir="${EPREFIX}"/var/db/nsd |
258 |
- --with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list |
259 |
- --with-zonesdir="${EPREFIX}"/var/lib/nsd |
260 |
- $(use_enable bind8-stats) |
261 |
- $(use_enable bind8-stats zone-stats) |
262 |
- $(use_enable dnstap) |
263 |
- $(use_enable ipv6) |
264 |
- $(use_enable minimal-responses) |
265 |
- $(use_enable mmap) |
266 |
- $(use_enable nsec3) |
267 |
- $(use_enable ratelimit) |
268 |
- $(use_enable root-server) |
269 |
- $(use_enable runtime-checks checking) |
270 |
- $(use_enable systemd) |
271 |
- $(use_with libevent) |
272 |
- $(use_with ssl) |
273 |
- ) |
274 |
- econf "${myeconfargs[@]}" |
275 |
-} |
276 |
- |
277 |
-src_install() { |
278 |
- emake DESTDIR="${D}" install |
279 |
- |
280 |
- dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS} |
281 |
- |
282 |
- newinitd "${FILESDIR}"/nsd.initd-r1 nsd |
283 |
- |
284 |
- # install munin plugin and config |
285 |
- if use munin ; then |
286 |
- exeinto /usr/libexec/munin/plugins |
287 |
- doexe contrib/nsd_munin_ |
288 |
- insinto /etc/munin/plugin-conf.d |
289 |
- newins "${FILESDIR}"/nsd.munin-conf nsd_munin |
290 |
- fi |
291 |
- |
292 |
- systemd_dounit "${FILESDIR}"/nsd.service |
293 |
- |
294 |
- # remove the /run directory that usually resides on tmpfs and is |
295 |
- # being taken care of by the nsd init script anyway (checkpath) |
296 |
- rm -r "${ED}"/run || die "Failed to remove /run" |
297 |
- |
298 |
- keepdir /var/db/${PN} |
299 |
-} |
300 |
- |
301 |
-pkg_postinst() { |
302 |
- # database directory, writable by nsd for database updates and zone transfers |
303 |
- install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd |
304 |
- |
305 |
- # zones directory, writable by nsd for zone file updates (nsd-control write) |
306 |
- install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd |
307 |
-} |