1 |
commit: a7f9bd7e750885f62e6ddd21a10783847f572141 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 26 03:09:35 2019 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 26 03:10:49 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7f9bd7e |
7 |
|
8 |
net-dns/dnsmasq: Drop old versions |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
net-dns/dnsmasq/Manifest | 1 - |
13 |
net-dns/dnsmasq/dnsmasq-2.79.ebuild | 198 ---------------------------------- |
14 |
net-dns/dnsmasq/dnsmasq-2.80.ebuild | 208 ------------------------------------ |
15 |
3 files changed, 407 deletions(-) |
16 |
|
17 |
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest |
18 |
index 328fffce268..a01ccab43f4 100644 |
19 |
--- a/net-dns/dnsmasq/Manifest |
20 |
+++ b/net-dns/dnsmasq/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST dnsmasq-2.79.tar.xz 493036 BLAKE2B 91152c52aef06def74151f6fbae9153d25261ba5e6a728cbab503c074967963e40dce39d93a0fbe4c5497c9313ac24d495cc8233934c00d4ab82aefe83b01ccd SHA512 2c06212696ab55e1584f6133872f5b196013509e4b1822d0457787b456e14341afdde887749e370a2e512124cb4138f012f4601b08690707be4acc7cf2f2876f |
23 |
DIST dnsmasq-2.80.tar.xz 501072 BLAKE2B 39c9808df43a22e32286105c9e001b2f817a4f68b92b84282eeb8cfeaa61404d64275bbb3f944bec6fac1b015987fba6aeab7a88201446c0cff67f02c8d88d8c SHA512 58e56beb553fc41311e5dc16d8b0eb3b6801e2bdfbcd0e7a6659703f08960b6ad10d48b0b14a4d727636faf35483e01597cff2ae49e7fe9fa9e214f437b1c068 |
24 |
|
25 |
diff --git a/net-dns/dnsmasq/dnsmasq-2.79.ebuild b/net-dns/dnsmasq/dnsmasq-2.79.ebuild |
26 |
deleted file mode 100644 |
27 |
index c82ca7f79b3..00000000000 |
28 |
--- a/net-dns/dnsmasq/dnsmasq-2.79.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,198 +0,0 @@ |
31 |
-# Copyright 1999-2018 Gentoo Authors |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
- |
34 |
-EAPI=6 |
35 |
- |
36 |
-inherit toolchain-funcs flag-o-matic user systemd |
37 |
- |
38 |
-DESCRIPTION="Small forwarding DNS server" |
39 |
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html" |
40 |
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" |
41 |
- |
42 |
-LICENSE="|| ( GPL-2 GPL-3 )" |
43 |
-SLOT="0" |
44 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" |
45 |
- |
46 |
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec id idn libidn2 +inotify" |
47 |
-IUSE+=" ipv6 lua nls script selinux static tftp" |
48 |
- |
49 |
-DM_LINGUAS=(de es fi fr id it no pl pt_BR ro) |
50 |
- |
51 |
-CDEPEND="dbus? ( sys-apps/dbus ) |
52 |
- idn? ( |
53 |
- !libidn2? ( net-dns/libidn:0 ) |
54 |
- libidn2? ( >=net-dns/libidn2-2.0 ) |
55 |
- ) |
56 |
- lua? ( dev-lang/lua:* ) |
57 |
- conntrack? ( net-libs/libnetfilter_conntrack ) |
58 |
- nls? ( sys-devel/gettext ) |
59 |
-" |
60 |
- |
61 |
-DEPEND="${CDEPEND} |
62 |
- app-arch/xz-utils |
63 |
- dnssec? ( |
64 |
- dev-libs/nettle[gmp] |
65 |
- static? ( dev-libs/nettle[static-libs(+)] ) |
66 |
- ) |
67 |
- virtual/pkgconfig |
68 |
-" |
69 |
- |
70 |
-RDEPEND="${CDEPEND} |
71 |
- dnssec? ( |
72 |
- !static? ( |
73 |
- dev-libs/nettle[gmp] |
74 |
- ) |
75 |
- ) |
76 |
- selinux? ( sec-policy/selinux-dnsmasq ) |
77 |
-" |
78 |
- |
79 |
-REQUIRED_USE="dhcp-tools? ( dhcp ) |
80 |
- lua? ( script ) |
81 |
- libidn2? ( idn )" |
82 |
- |
83 |
-use_have() { |
84 |
- local useflag no_only uword |
85 |
- if [[ $1 == '-n' ]]; then |
86 |
- no_only=1 |
87 |
- shift |
88 |
- fi |
89 |
- useflag="${1}" |
90 |
- shift |
91 |
- |
92 |
- uword="${1:-${useflag}}" |
93 |
- shift |
94 |
- |
95 |
- while [[ ${uword} ]]; do |
96 |
- uword="${uword^^}" |
97 |
- |
98 |
- if ! use "${useflag}"; then |
99 |
- printf -- " -DNO_%s" "${uword}" |
100 |
- elif [[ -z "${no_only}" ]]; then |
101 |
- printf -- " -DHAVE_%s" "${uword}" |
102 |
- fi |
103 |
- uword="${1}" |
104 |
- shift |
105 |
- done |
106 |
-} |
107 |
- |
108 |
-pkg_pretend() { |
109 |
- if use static; then |
110 |
- einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked." |
111 |
- use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored." |
112 |
- fi |
113 |
-} |
114 |
- |
115 |
-pkg_setup() { |
116 |
- enewgroup dnsmasq |
117 |
- enewuser dnsmasq -1 -1 /dev/null dnsmasq |
118 |
-} |
119 |
- |
120 |
-src_prepare() { |
121 |
- default |
122 |
- |
123 |
- sed -i -r 's:lua5.[0-9]+:lua:' Makefile |
124 |
- sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example |
125 |
-} |
126 |
- |
127 |
-src_configure() { |
128 |
- COPTS="$(use_have -n auth-dns auth)" |
129 |
- COPTS+="$(use_have conntrack)" |
130 |
- COPTS+="$(use_have dbus)" |
131 |
- COPTS+="$(use libidn2 || use_have idn)" |
132 |
- COPTS+="$(use_have libidn2)" |
133 |
- COPTS+="$(use_have -n inotify)" |
134 |
- COPTS+="$(use_have -n dhcp dhcp dhcp6)" |
135 |
- COPTS+="$(use_have -n ipv6 ipv6 dhcp6)" |
136 |
- COPTS+="$(use_have -n id id)" |
137 |
- COPTS+="$(use_have lua luascript)" |
138 |
- COPTS+="$(use_have -n script)" |
139 |
- COPTS+="$(use_have -n tftp)" |
140 |
- COPTS+="$(use_have dnssec)" |
141 |
- COPTS+="$(use_have static dnssec_static)" |
142 |
-} |
143 |
- |
144 |
-src_compile() { |
145 |
- emake \ |
146 |
- PREFIX=/usr \ |
147 |
- MANDIR=/usr/share/man \ |
148 |
- CC="$(tc-getCC)" \ |
149 |
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \ |
150 |
- CFLAGS="${CFLAGS}" \ |
151 |
- LDFLAGS="${LDFLAGS}" \ |
152 |
- COPTS="${COPTS}" \ |
153 |
- CONFFILE="/etc/${PN}.conf" \ |
154 |
- all$(use nls && echo "-i18n") |
155 |
- |
156 |
- use dhcp-tools && emake -C contrib/lease-tools \ |
157 |
- PREFIX=/usr \ |
158 |
- MANDIR=/usr/share/man \ |
159 |
- CC="$(tc-getCC)" \ |
160 |
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \ |
161 |
- CFLAGS="${CFLAGS}" \ |
162 |
- LDFLAGS="${LDFLAGS}" \ |
163 |
- all |
164 |
-} |
165 |
- |
166 |
-src_install() { |
167 |
- local lingua puid |
168 |
- emake \ |
169 |
- PREFIX=/usr \ |
170 |
- MANDIR=/usr/share/man \ |
171 |
- COPTS="${COPTS}" \ |
172 |
- DESTDIR="${D}" \ |
173 |
- install$(use nls && echo "-i18n") |
174 |
- |
175 |
- for lingua in "${DM_LINGUAS[@]}"; do |
176 |
- has ${lingua} ${LINGUAS-${lingua}} \ |
177 |
- || rm -rf "${D}"/usr/share/locale/${lingua} |
178 |
- done |
179 |
- [[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/ |
180 |
- |
181 |
- dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example |
182 |
- dodoc -r logo |
183 |
- |
184 |
- docinto html/ |
185 |
- dodoc *.html |
186 |
- |
187 |
- newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN} |
188 |
- newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN} |
189 |
- |
190 |
- insinto /etc/logrotate.d |
191 |
- newins "${FILESDIR}"/dnsmasq.logrotate ${PN} |
192 |
- |
193 |
- insinto /etc |
194 |
- newins dnsmasq.conf.example dnsmasq.conf |
195 |
- |
196 |
- insinto /usr/share/dnsmasq |
197 |
- doins trust-anchors.conf |
198 |
- |
199 |
- if use dhcp; then |
200 |
- keepdir /var/lib/misc |
201 |
- newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${PN} |
202 |
- fi |
203 |
- if use dbus; then |
204 |
- insinto /etc/dbus-1/system.d |
205 |
- doins dbus/dnsmasq.conf |
206 |
- fi |
207 |
- |
208 |
- if use dhcp-tools; then |
209 |
- dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time} |
210 |
- doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1 |
211 |
- if use ipv6; then |
212 |
- dosbin contrib/lease-tools/dhcp_release6 |
213 |
- doman contrib/lease-tools/dhcp_release6.1 |
214 |
- fi |
215 |
- fi |
216 |
- |
217 |
- systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service |
218 |
-} |
219 |
- |
220 |
-pkg_preinst() { |
221 |
- # temporary workaround to (hopefully) prevent leases file from being removed |
222 |
- [[ -f /var/lib/misc/dnsmasq.leases ]] && cp /var/lib/misc/dnsmasq.leases "${T}" |
223 |
-} |
224 |
- |
225 |
-pkg_postinst() { |
226 |
- # temporary workaround to (hopefully) prevent leases file from being removed |
227 |
- [[ -f "${T}"/dnsmasq.leases ]] && cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases |
228 |
-} |
229 |
|
230 |
diff --git a/net-dns/dnsmasq/dnsmasq-2.80.ebuild b/net-dns/dnsmasq/dnsmasq-2.80.ebuild |
231 |
deleted file mode 100644 |
232 |
index fbf773ea07c..00000000000 |
233 |
--- a/net-dns/dnsmasq/dnsmasq-2.80.ebuild |
234 |
+++ /dev/null |
235 |
@@ -1,208 +0,0 @@ |
236 |
-# Copyright 1999-2019 Gentoo Authors |
237 |
-# Distributed under the terms of the GNU General Public License v2 |
238 |
- |
239 |
-EAPI=7 |
240 |
- |
241 |
-inherit toolchain-funcs flag-o-matic user systemd |
242 |
- |
243 |
-DESCRIPTION="Small forwarding DNS server" |
244 |
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html" |
245 |
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" |
246 |
- |
247 |
-LICENSE="|| ( GPL-2 GPL-3 )" |
248 |
-SLOT="0" |
249 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" |
250 |
- |
251 |
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2" |
252 |
-IUSE+=" +inotify ipv6 lua nls script selinux static tftp" |
253 |
- |
254 |
-DM_LINGUAS=(de es fi fr id it no pl pt_BR ro) |
255 |
- |
256 |
-BDEPEND="app-arch/xz-utils |
257 |
- virtual/pkgconfig |
258 |
- nls? ( sys-devel/gettext ) |
259 |
-" |
260 |
- |
261 |
-COMMON_DEPEND="dbus? ( sys-apps/dbus:= ) |
262 |
- idn? ( |
263 |
- !libidn2? ( net-dns/libidn:0= ) |
264 |
- libidn2? ( >=net-dns/libidn2-2.0:= ) |
265 |
- ) |
266 |
- lua? ( dev-lang/lua:* ) |
267 |
- conntrack? ( net-libs/libnetfilter_conntrack:= ) |
268 |
- nls? ( sys-devel/gettext ) |
269 |
-" |
270 |
- |
271 |
-DEPEND="${COMMON_DEPEND} |
272 |
- dnssec? ( |
273 |
- dev-libs/nettle:=[gmp] |
274 |
- static? ( >=dev-libs/nettle-3.4[static-libs(+)] ) |
275 |
- ) |
276 |
-" |
277 |
- |
278 |
-RDEPEND="${COMMON_DEPEND} |
279 |
- dnssec? ( |
280 |
- !static? ( |
281 |
- >=dev-libs/nettle-3.4:=[gmp] |
282 |
- ) |
283 |
- ) |
284 |
- selinux? ( sec-policy/selinux-dnsmasq ) |
285 |
-" |
286 |
- |
287 |
-REQUIRED_USE="dhcp-tools? ( dhcp ) |
288 |
- lua? ( script ) |
289 |
- libidn2? ( idn )" |
290 |
- |
291 |
-use_have() { |
292 |
- local useflag no_only uword |
293 |
- if [[ ${1} == '-n' ]]; then |
294 |
- no_only=1 |
295 |
- shift |
296 |
- fi |
297 |
- useflag="${1}" |
298 |
- shift |
299 |
- |
300 |
- uword="${1:-${useflag}}" |
301 |
- shift |
302 |
- |
303 |
- while [[ ${uword} ]]; do |
304 |
- uword="${uword^^}" |
305 |
- |
306 |
- if ! use "${useflag}"; then |
307 |
- printf -- " -DNO_%s" "${uword}" |
308 |
- elif [[ -z "${no_only}" ]]; then |
309 |
- printf -- " -DHAVE_%s" "${uword}" |
310 |
- fi |
311 |
- uword="${1}" |
312 |
- shift |
313 |
- done |
314 |
-} |
315 |
- |
316 |
-pkg_pretend() { |
317 |
- if use static; then |
318 |
- einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked." |
319 |
- use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense;" \ |
320 |
- "the static USE flag is ignored." |
321 |
- fi |
322 |
-} |
323 |
- |
324 |
-pkg_setup() { |
325 |
- enewgroup dnsmasq |
326 |
- enewuser dnsmasq -1 -1 /dev/null dnsmasq |
327 |
-} |
328 |
- |
329 |
-src_prepare() { |
330 |
- default |
331 |
- |
332 |
- sed -i -r 's:lua5.[0-9]+:lua:' Makefile |
333 |
- sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example |
334 |
-} |
335 |
- |
336 |
-src_configure() { |
337 |
- COPTS=( |
338 |
- "$(use_have -n auth-dns auth)" |
339 |
- "$(use_have conntrack)" |
340 |
- "$(use_have dbus)" |
341 |
- "$(use libidn2 || use_have idn)" |
342 |
- "$(use_have libidn2)" |
343 |
- "$(use_have -n inotify)" |
344 |
- "$(use_have -n dhcp dhcp dhcp6)" |
345 |
- "$(use_have -n ipv6 ipv6 dhcp6)" |
346 |
- "$(use_have -n id id)" |
347 |
- "$(use_have lua luascript)" |
348 |
- "$(use_have -n script)" |
349 |
- "$(use_have -n tftp)" |
350 |
- "$(use_have dnssec)" |
351 |
- "$(use_have static dnssec_static)" |
352 |
- "$(use_have -n dumpfile)" |
353 |
- ) |
354 |
-} |
355 |
- |
356 |
-src_compile() { |
357 |
- emake \ |
358 |
- PREFIX=/usr \ |
359 |
- MANDIR=/usr/share/man \ |
360 |
- CC="$(tc-getCC)" \ |
361 |
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \ |
362 |
- CFLAGS="${CFLAGS}" \ |
363 |
- LDFLAGS="${LDFLAGS}" \ |
364 |
- COPTS="${COPTS[*]}" \ |
365 |
- CONFFILE="/etc/${PN}.conf" \ |
366 |
- all$(use nls && printf -- "-i18n\n") |
367 |
- |
368 |
- use dhcp-tools && emake -C contrib/lease-tools \ |
369 |
- PREFIX=/usr \ |
370 |
- MANDIR=/usr/share/man \ |
371 |
- CC="$(tc-getCC)" \ |
372 |
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \ |
373 |
- CFLAGS="${CFLAGS}" \ |
374 |
- LDFLAGS="${LDFLAGS}" \ |
375 |
- all |
376 |
-} |
377 |
- |
378 |
-src_install() { |
379 |
- local lingua puid |
380 |
- emake \ |
381 |
- PREFIX=/usr \ |
382 |
- MANDIR=/usr/share/man \ |
383 |
- COPTS="${COPTS[*]}" \ |
384 |
- DESTDIR="${ED}" \ |
385 |
- install$(use nls && printf -- "-i18n\n") |
386 |
- |
387 |
- for lingua in "${DM_LINGUAS[@]}"; do |
388 |
- has ${lingua} ${LINGUAS-${lingua}} \ |
389 |
- || rm -rf "${ED}"/usr/share/locale/${lingua} |
390 |
- done |
391 |
- [[ -d "${D}"/usr/share/locale/ ]] && \ |
392 |
- rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/locale/ |
393 |
- |
394 |
- dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example |
395 |
- dodoc -r logo |
396 |
- |
397 |
- docinto html/ |
398 |
- dodoc *.html |
399 |
- |
400 |
- newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN} |
401 |
- newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN} |
402 |
- |
403 |
- insinto /etc/logrotate.d |
404 |
- newins "${FILESDIR}"/dnsmasq.logrotate ${PN} |
405 |
- |
406 |
- insinto /etc |
407 |
- newins dnsmasq.conf.example dnsmasq.conf |
408 |
- |
409 |
- insinto /usr/share/dnsmasq |
410 |
- doins trust-anchors.conf |
411 |
- |
412 |
- if use dhcp; then |
413 |
- keepdir /var/lib/misc |
414 |
- newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${PN} |
415 |
- fi |
416 |
- if use dbus; then |
417 |
- insinto /etc/dbus-1/system.d |
418 |
- doins dbus/dnsmasq.conf |
419 |
- fi |
420 |
- |
421 |
- if use dhcp-tools; then |
422 |
- dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time} |
423 |
- doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1 |
424 |
- if use ipv6; then |
425 |
- dosbin contrib/lease-tools/dhcp_release6 |
426 |
- doman contrib/lease-tools/dhcp_release6.1 |
427 |
- fi |
428 |
- fi |
429 |
- |
430 |
- systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service |
431 |
-} |
432 |
- |
433 |
-pkg_preinst() { |
434 |
- # temporary workaround to (hopefully) prevent leases file from being removed |
435 |
- [[ -f /var/lib/misc/dnsmasq.leases ]] && \ |
436 |
- cp /var/lib/misc/dnsmasq.leases "${T}" |
437 |
-} |
438 |
- |
439 |
-pkg_postinst() { |
440 |
- # temporary workaround to (hopefully) prevent leases file from being removed |
441 |
- [[ -f "${T}"/dnsmasq.leases ]] && \ |
442 |
- cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases |
443 |
-} |