| 1 |
commit: 7d8b5da81e3c80c8137a6b5521314f9ce3227b72 |
| 2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 25 01:22:37 2018 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 25 01:22:37 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d8b5da8 |
| 7 |
|
| 8 |
net-dns/dnsmasq: cleanup vulnerable wrt bug #632692 |
| 9 |
|
| 10 |
net-dns/dnsmasq/Manifest | 2 - |
| 11 |
net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild | 190 -------------------------------- |
| 12 |
net-dns/dnsmasq/dnsmasq-2.76.ebuild | 186 ------------------------------- |
| 13 |
net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild | 195 --------------------------------- |
| 14 |
net-dns/dnsmasq/dnsmasq-2.77.ebuild | 193 -------------------------------- |
| 15 |
5 files changed, 766 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest |
| 18 |
index f8bdcc32285..0c1296ae6cf 100644 |
| 19 |
--- a/net-dns/dnsmasq/Manifest |
| 20 |
+++ b/net-dns/dnsmasq/Manifest |
| 21 |
@@ -1,3 +1 @@ |
| 22 |
-DIST dnsmasq-2.76.tar.xz 480796 BLAKE2B 09dd0e97bcd70fa2beecd80ed157692a217a8a5b71f5d9491c419bedc909b1dcee043c5aeaab333a44d1775785182658ac999c5d3c4f4bd48f1683122697e326 SHA512 8a930f3e7cdc0c291ce89bea8128a4b8438b9aa9e660a2ac037e0baa4c5c74f4482a8f83b0410066a759444b3c4e1cf62a9beb625e38509690227996de10e06a |
| 23 |
-DIST dnsmasq-2.77.tar.xz 487244 BLAKE2B 4671dd47f87c4554b7d18413cff22cd5ed8338d2d97a8c2ecb57a92d0c7efa6a7fd9ff208b529f124cd8678e0d7f9328366a18039162647bed6076a05a882b1a SHA512 6ca98a71a8fdfd606e29c58b34dadfa63148c39f931570cca67a287e044d52c6ec2f8acbf5620ada3312e9db3a2fd63877188d829c070beaa730607e3309e768 |
| 24 |
DIST dnsmasq-2.78.tar.xz 489172 BLAKE2B 996b59181c4b582b74c91be073e62f0756d2e4c67ee36ff825b6973699f60e44959bb0451bbb8623f277e5a8378cda987a300eee6ec9398ae99284b302da2747 SHA512 9b79b84e5a768d52f90f6335ccef2c404ecd7a13e78e49f4cd0755fffc6cf34d0dc96ad4c72cad1dab3c5743a8d0d789b3e9b6e625b03c5675bb898ca61a698b |
| 25 |
|
| 26 |
diff --git a/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild |
| 27 |
deleted file mode 100644 |
| 28 |
index 70cc1f59fb1..00000000000 |
| 29 |
--- a/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,190 +0,0 @@ |
| 32 |
-# Copyright 1999-2018 Gentoo Foundation |
| 33 |
-# Distributed under the terms of the GNU General Public License v2 |
| 34 |
- |
| 35 |
-EAPI=6 |
| 36 |
- |
| 37 |
-inherit eutils toolchain-funcs flag-o-matic user systemd |
| 38 |
- |
| 39 |
-DESCRIPTION="Small forwarding DNS server" |
| 40 |
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html" |
| 41 |
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" |
| 42 |
- |
| 43 |
-LICENSE="|| ( GPL-2 GPL-3 )" |
| 44 |
-SLOT="0" |
| 45 |
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" |
| 46 |
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp" |
| 47 |
-DM_LINGUAS="de es fi fr id it no pl pt_BR ro" |
| 48 |
- |
| 49 |
-CDEPEND="dbus? ( sys-apps/dbus ) |
| 50 |
- idn? ( net-dns/libidn ) |
| 51 |
- lua? ( dev-lang/lua:* ) |
| 52 |
- conntrack? ( net-libs/libnetfilter_conntrack ) |
| 53 |
- nls? ( |
| 54 |
- sys-devel/gettext |
| 55 |
- net-dns/libidn |
| 56 |
- ) |
| 57 |
-" |
| 58 |
- |
| 59 |
-DEPEND="${CDEPEND} |
| 60 |
- app-arch/xz-utils |
| 61 |
- dnssec? ( |
| 62 |
- dev-libs/nettle[gmp] |
| 63 |
- static? ( |
| 64 |
- dev-libs/nettle[static-libs(+)] |
| 65 |
- ) |
| 66 |
- ) |
| 67 |
- virtual/pkgconfig" |
| 68 |
- |
| 69 |
-RDEPEND="${CDEPEND} |
| 70 |
- dnssec? ( |
| 71 |
- !static? ( |
| 72 |
- dev-libs/nettle[gmp] |
| 73 |
- ) |
| 74 |
- ) |
| 75 |
- selinux? ( sec-policy/selinux-dnsmasq ) |
| 76 |
-" |
| 77 |
- |
| 78 |
-REQUIRED_USE="dhcp-tools? ( dhcp ) |
| 79 |
- lua? ( script )" |
| 80 |
- |
| 81 |
-use_have() { |
| 82 |
- local useflag no_only uword |
| 83 |
- if [[ $1 == '-n' ]]; then |
| 84 |
- no_only=1 |
| 85 |
- shift |
| 86 |
- fi |
| 87 |
- useflag="${1}" |
| 88 |
- shift |
| 89 |
- |
| 90 |
- uword="${1:-${useflag}}" |
| 91 |
- shift |
| 92 |
- |
| 93 |
- while [[ ${uword} ]]; do |
| 94 |
- uword="${uword^^}" |
| 95 |
- |
| 96 |
- if ! use "${useflag}"; then |
| 97 |
- echo -n " -DNO_${uword}" |
| 98 |
- elif [[ -z "${no_only}" ]]; then |
| 99 |
- echo -n " -DHAVE_${uword}" |
| 100 |
- fi |
| 101 |
- uword="${1}" |
| 102 |
- shift |
| 103 |
- done |
| 104 |
-} |
| 105 |
- |
| 106 |
-pkg_pretend() { |
| 107 |
- if use static; then |
| 108 |
- einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked." |
| 109 |
- use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored." |
| 110 |
- fi |
| 111 |
-} |
| 112 |
- |
| 113 |
-pkg_setup() { |
| 114 |
- enewgroup dnsmasq |
| 115 |
- enewuser dnsmasq -1 -1 /dev/null dnsmasq |
| 116 |
-} |
| 117 |
- |
| 118 |
-src_prepare() { |
| 119 |
- default |
| 120 |
- |
| 121 |
- sed -i -r 's:lua5.[0-9]+:lua:' Makefile |
| 122 |
- sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example |
| 123 |
-} |
| 124 |
- |
| 125 |
-src_configure() { |
| 126 |
- COPTS="$(use_have -n auth-dns auth)" |
| 127 |
- COPTS+="$(use_have conntrack)" |
| 128 |
- COPTS+="$(use_have dbus)" |
| 129 |
- COPTS+="$(use_have idn)" |
| 130 |
- COPTS+="$(use_have -n inotify)" |
| 131 |
- COPTS+="$(use_have -n dhcp dhcp dhcp6)" |
| 132 |
- COPTS+="$(use_have -n ipv6 ipv6 dhcp6)" |
| 133 |
- COPTS+="$(use_have lua luascript)" |
| 134 |
- COPTS+="$(use_have -n script)" |
| 135 |
- COPTS+="$(use_have -n tftp)" |
| 136 |
- COPTS+="$(use_have dnssec)" |
| 137 |
- COPTS+="$(use_have static dnssec_static)" |
| 138 |
-} |
| 139 |
- |
| 140 |
-src_compile() { |
| 141 |
- emake \ |
| 142 |
- PREFIX=/usr \ |
| 143 |
- MANDIR=/usr/share/man \ |
| 144 |
- CC="$(tc-getCC)" \ |
| 145 |
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \ |
| 146 |
- CFLAGS="${CFLAGS}" \ |
| 147 |
- LDFLAGS="${LDFLAGS}" \ |
| 148 |
- COPTS="${COPTS}" \ |
| 149 |
- CONFFILE="/etc/${PN}.conf" \ |
| 150 |
- all$(use nls && echo "-i18n") |
| 151 |
- |
| 152 |
- use dhcp-tools && emake -C contrib/lease-tools \ |
| 153 |
- PREFIX=/usr \ |
| 154 |
- MANDIR=/usr/share/man \ |
| 155 |
- CC="$(tc-getCC)" \ |
| 156 |
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \ |
| 157 |
- CFLAGS="${CFLAGS}" \ |
| 158 |
- LDFLAGS="${LDFLAGS}" \ |
| 159 |
- all |
| 160 |
-} |
| 161 |
- |
| 162 |
-src_install() { |
| 163 |
- local lingua puid |
| 164 |
- emake \ |
| 165 |
- PREFIX=/usr \ |
| 166 |
- MANDIR=/usr/share/man \ |
| 167 |
- COPTS="${COPTS}" \ |
| 168 |
- DESTDIR="${D}" \ |
| 169 |
- install$(use nls && echo "-i18n") |
| 170 |
- |
| 171 |
- for lingua in ${DM_LINGUAS}; do |
| 172 |
- has ${lingua} ${LINGUAS-${lingua}} \ |
| 173 |
- || rm -rf "${D}"/usr/share/locale/${lingua} |
| 174 |
- done |
| 175 |
- [[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/ |
| 176 |
- |
| 177 |
- dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example |
| 178 |
- dodoc -r logo |
| 179 |
- |
| 180 |
- docinto html/ |
| 181 |
- dodoc *.html |
| 182 |
- |
| 183 |
- newinitd "${FILESDIR}"/dnsmasq-init-r2 ${PN} |
| 184 |
- newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN} |
| 185 |
- |
| 186 |
- insinto /etc |
| 187 |
- newins dnsmasq.conf.example dnsmasq.conf |
| 188 |
- |
| 189 |
- insinto /usr/share/dnsmasq |
| 190 |
- doins trust-anchors.conf |
| 191 |
- |
| 192 |
- if use dhcp; then |
| 193 |
- dodir /var/lib/misc |
| 194 |
- newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r1 ${PN} |
| 195 |
- fi |
| 196 |
- if use dbus; then |
| 197 |
- insinto /etc/dbus-1/system.d |
| 198 |
- doins dbus/dnsmasq.conf |
| 199 |
- fi |
| 200 |
- |
| 201 |
- if use dhcp-tools; then |
| 202 |
- dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time} |
| 203 |
- doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1 |
| 204 |
- if use ipv6; then |
| 205 |
- dosbin contrib/lease-tools/dhcp_release6 |
| 206 |
- doman contrib/lease-tools/dhcp_release6.1 |
| 207 |
- fi |
| 208 |
- fi |
| 209 |
- |
| 210 |
- systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service |
| 211 |
-} |
| 212 |
- |
| 213 |
-pkg_preinst() { |
| 214 |
- # temporary workaround to (hopefully) prevent leases file from being removed |
| 215 |
- [[ -f /var/lib/misc/dnsmasq.leases ]] && cp /var/lib/misc/dnsmasq.leases "${T}" |
| 216 |
-} |
| 217 |
- |
| 218 |
-pkg_postinst() { |
| 219 |
- # temporary workaround to (hopefully) prevent leases file from being removed |
| 220 |
- [[ -f "${T}"/dnsmasq.leases ]] && cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases |
| 221 |
-} |
| 222 |
|
| 223 |
diff --git a/net-dns/dnsmasq/dnsmasq-2.76.ebuild b/net-dns/dnsmasq/dnsmasq-2.76.ebuild |
| 224 |
deleted file mode 100644 |
| 225 |
index 580899b2c9c..00000000000 |
| 226 |
--- a/net-dns/dnsmasq/dnsmasq-2.76.ebuild |
| 227 |
+++ /dev/null |
| 228 |
@@ -1,186 +0,0 @@ |
| 229 |
-# Copyright 1999-2018 Gentoo Foundation |
| 230 |
-# Distributed under the terms of the GNU General Public License v2 |
| 231 |
- |
| 232 |
-EAPI=6 |
| 233 |
- |
| 234 |
-inherit eutils toolchain-funcs flag-o-matic user systemd |
| 235 |
- |
| 236 |
-DESCRIPTION="Small forwarding DNS server" |
| 237 |
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html" |
| 238 |
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" |
| 239 |
- |
| 240 |
-LICENSE="|| ( GPL-2 GPL-3 )" |
| 241 |
-SLOT="0" |
| 242 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" |
| 243 |
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp" |
| 244 |
-DM_LINGUAS="de es fi fr id it no pl pt_BR ro" |
| 245 |
- |
| 246 |
-CDEPEND="dbus? ( sys-apps/dbus ) |
| 247 |
- idn? ( net-dns/libidn ) |
| 248 |
- lua? ( dev-lang/lua:* ) |
| 249 |
- conntrack? ( net-libs/libnetfilter_conntrack ) |
| 250 |
- nls? ( |
| 251 |
- sys-devel/gettext |
| 252 |
- net-dns/libidn |
| 253 |
- ) |
| 254 |
-" |
| 255 |
- |
| 256 |
-DEPEND="${CDEPEND} |
| 257 |
- app-arch/xz-utils |
| 258 |
- dnssec? ( |
| 259 |
- dev-libs/nettle[gmp] |
| 260 |
- static? ( |
| 261 |
- dev-libs/nettle[static-libs(+)] |
| 262 |
- ) |
| 263 |
- ) |
| 264 |
- virtual/pkgconfig" |
| 265 |
- |
| 266 |
-RDEPEND="${CDEPEND} |
| 267 |
- dnssec? ( |
| 268 |
- !static? ( |
| 269 |
- dev-libs/nettle[gmp] |
| 270 |
- ) |
| 271 |
- ) |
| 272 |
- selinux? ( sec-policy/selinux-dnsmasq ) |
| 273 |
-" |
| 274 |
- |
| 275 |
-REQUIRED_USE="dhcp-tools? ( dhcp ) |
| 276 |
- lua? ( script )" |
| 277 |
- |
| 278 |
-use_have() { |
| 279 |
- local useflag no_only uword |
| 280 |
- if [[ $1 == '-n' ]]; then |
| 281 |
- no_only=1 |
| 282 |
- shift |
| 283 |
- fi |
| 284 |
- useflag="${1}" |
| 285 |
- shift |
| 286 |
- |
| 287 |
- uword="${1:-${useflag}}" |
| 288 |
- shift |
| 289 |
- |
| 290 |
- while [[ ${uword} ]]; do |
| 291 |
- uword="${uword^^}" |
| 292 |
- |
| 293 |
- if ! use "${useflag}"; then |
| 294 |
- echo -n " -DNO_${uword}" |
| 295 |
- elif [[ -z "${no_only}" ]]; then |
| 296 |
- echo -n " -DHAVE_${uword}" |
| 297 |
- fi |
| 298 |
- uword="${1}" |
| 299 |
- shift |
| 300 |
- done |
| 301 |
-} |
| 302 |
- |
| 303 |
-pkg_pretend() { |
| 304 |
- if use static; then |
| 305 |
- einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked." |
| 306 |
- use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored." |
| 307 |
- fi |
| 308 |
-} |
| 309 |
- |
| 310 |
-pkg_setup() { |
| 311 |
- enewgroup dnsmasq |
| 312 |
- enewuser dnsmasq -1 -1 /dev/null dnsmasq |
| 313 |
-} |
| 314 |
- |
| 315 |
-src_prepare() { |
| 316 |
- default |
| 317 |
- |
| 318 |
- sed -i -r 's:lua5.[0-9]+:lua:' Makefile |
| 319 |
- sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example |
| 320 |
-} |
| 321 |
- |
| 322 |
-src_configure() { |
| 323 |
- COPTS="$(use_have -n auth-dns auth)" |
| 324 |
- COPTS+="$(use_have conntrack)" |
| 325 |
- COPTS+="$(use_have dbus)" |
| 326 |
- COPTS+="$(use_have idn)" |
| 327 |
- COPTS+="$(use_have -n inotify)" |
| 328 |
- COPTS+="$(use_have -n dhcp dhcp dhcp6)" |
| 329 |
- COPTS+="$(use_have -n ipv6 ipv6 dhcp6)" |
| 330 |
- COPTS+="$(use_have lua luascript)" |
| 331 |
- COPTS+="$(use_have -n script)" |
| 332 |
- COPTS+="$(use_have -n tftp)" |
| 333 |
- COPTS+="$(use_have dnssec)" |
| 334 |
- COPTS+="$(use_have static dnssec_static)" |
| 335 |
-} |
| 336 |
- |
| 337 |
-src_compile() { |
| 338 |
- emake \ |
| 339 |
- PREFIX=/usr \ |
| 340 |
- MANDIR=/usr/share/man \ |
| 341 |
- CC="$(tc-getCC)" \ |
| 342 |
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \ |
| 343 |
- CFLAGS="${CFLAGS}" \ |
| 344 |
- LDFLAGS="${LDFLAGS}" \ |
| 345 |
- COPTS="${COPTS}" \ |
| 346 |
- CONFFILE="/etc/${PN}.conf" \ |
| 347 |
- all$(use nls && echo "-i18n") |
| 348 |
- |
| 349 |
- use dhcp-tools && emake -C contrib/lease-tools \ |
| 350 |
- PREFIX=/usr \ |
| 351 |
- MANDIR=/usr/share/man \ |
| 352 |
- CC="$(tc-getCC)" \ |
| 353 |
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \ |
| 354 |
- CFLAGS="${CFLAGS}" \ |
| 355 |
- LDFLAGS="${LDFLAGS}" \ |
| 356 |
- all |
| 357 |
-} |
| 358 |
- |
| 359 |
-src_install() { |
| 360 |
- local lingua puid |
| 361 |
- emake \ |
| 362 |
- PREFIX=/usr \ |
| 363 |
- MANDIR=/usr/share/man \ |
| 364 |
- COPTS="${COPTS}" \ |
| 365 |
- DESTDIR="${D}" \ |
| 366 |
- install$(use nls && echo "-i18n") |
| 367 |
- |
| 368 |
- for lingua in ${DM_LINGUAS}; do |
| 369 |
- has ${lingua} ${LINGUAS-${lingua}} \ |
| 370 |
- || rm -rf "${D}"/usr/share/locale/${lingua} |
| 371 |
- done |
| 372 |
- [[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/ |
| 373 |
- |
| 374 |
- dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example |
| 375 |
- dodoc -r logo |
| 376 |
- |
| 377 |
- docinto html/ |
| 378 |
- dodoc *.html |
| 379 |
- |
| 380 |
- newinitd "${FILESDIR}"/dnsmasq-init-r2 ${PN} |
| 381 |
- newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN} |
| 382 |
- |
| 383 |
- insinto /etc |
| 384 |
- newins dnsmasq.conf.example dnsmasq.conf |
| 385 |
- |
| 386 |
- insinto /usr/share/dnsmasq |
| 387 |
- doins trust-anchors.conf |
| 388 |
- |
| 389 |
- if use dhcp; then |
| 390 |
- dodir /var/lib/misc |
| 391 |
- newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r1 ${PN} |
| 392 |
- fi |
| 393 |
- if use dbus; then |
| 394 |
- insinto /etc/dbus-1/system.d |
| 395 |
- doins dbus/dnsmasq.conf |
| 396 |
- fi |
| 397 |
- |
| 398 |
- if use dhcp-tools; then |
| 399 |
- dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time} |
| 400 |
- doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1 |
| 401 |
- fi |
| 402 |
- |
| 403 |
- systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service |
| 404 |
-} |
| 405 |
- |
| 406 |
-pkg_preinst() { |
| 407 |
- # temporary workaround to (hopefully) prevent leases file from being removed |
| 408 |
- [[ -f /var/lib/misc/dnsmasq.leases ]] && cp /var/lib/misc/dnsmasq.leases "${T}" |
| 409 |
-} |
| 410 |
- |
| 411 |
-pkg_postinst() { |
| 412 |
- # temporary workaround to (hopefully) prevent leases file from being removed |
| 413 |
- [[ -f "${T}"/dnsmasq.leases ]] && cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases |
| 414 |
-} |
| 415 |
|
| 416 |
diff --git a/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild |
| 417 |
deleted file mode 100644 |
| 418 |
index af735d94ac3..00000000000 |
| 419 |
--- a/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild |
| 420 |
+++ /dev/null |
| 421 |
@@ -1,195 +0,0 @@ |
| 422 |
-# Copyright 1999-2018 Gentoo Foundation |
| 423 |
-# Distributed under the terms of the GNU General Public License v2 |
| 424 |
- |
| 425 |
-EAPI=6 |
| 426 |
- |
| 427 |
-inherit toolchain-funcs flag-o-matic user systemd |
| 428 |
- |
| 429 |
-DESCRIPTION="Small forwarding DNS server" |
| 430 |
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html" |
| 431 |
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" |
| 432 |
- |
| 433 |
-LICENSE="|| ( GPL-2 GPL-3 )" |
| 434 |
-SLOT="0" |
| 435 |
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
| 436 |
- |
| 437 |
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify" |
| 438 |
-IUSE+=" ipv6 lua nls script selinux static tftp" |
| 439 |
- |
| 440 |
-DM_LINGUAS=(de es fi fr id it no pl pt_BR ro) |
| 441 |
- |
| 442 |
-CDEPEND="dbus? ( sys-apps/dbus ) |
| 443 |
- idn? ( |
| 444 |
- !libidn2? ( net-dns/libidn ) |
| 445 |
- libidn2? ( >=net-dns/libidn2-2.0 ) |
| 446 |
- ) |
| 447 |
- lua? ( dev-lang/lua:* ) |
| 448 |
- conntrack? ( net-libs/libnetfilter_conntrack ) |
| 449 |
- nls? ( sys-devel/gettext ) |
| 450 |
-" |
| 451 |
- |
| 452 |
-DEPEND="${CDEPEND} |
| 453 |
- app-arch/xz-utils |
| 454 |
- dnssec? ( |
| 455 |
- dev-libs/nettle[gmp] |
| 456 |
- static? ( dev-libs/nettle[static-libs(+)] ) |
| 457 |
- ) |
| 458 |
- virtual/pkgconfig |
| 459 |
-" |
| 460 |
- |
| 461 |
-RDEPEND="${CDEPEND} |
| 462 |
- dnssec? ( |
| 463 |
- !static? ( |
| 464 |
- dev-libs/nettle[gmp] |
| 465 |
- ) |
| 466 |
- ) |
| 467 |
- selinux? ( sec-policy/selinux-dnsmasq ) |
| 468 |
-" |
| 469 |
- |
| 470 |
-REQUIRED_USE="dhcp-tools? ( dhcp ) |
| 471 |
- lua? ( script ) |
| 472 |
- libidn2? ( idn )" |
| 473 |
- |
| 474 |
-use_have() { |
| 475 |
- local useflag no_only uword |
| 476 |
- if [[ $1 == '-n' ]]; then |
| 477 |
- no_only=1 |
| 478 |
- shift |
| 479 |
- fi |
| 480 |
- useflag="${1}" |
| 481 |
- shift |
| 482 |
- |
| 483 |
- uword="${1:-${useflag}}" |
| 484 |
- shift |
| 485 |
- |
| 486 |
- while [[ ${uword} ]]; do |
| 487 |
- uword="${uword^^}" |
| 488 |
- |
| 489 |
- if ! use "${useflag}"; then |
| 490 |
- echo -n " -DNO_${uword}" |
| 491 |
- elif [[ -z "${no_only}" ]]; then |
| 492 |
- echo -n " -DHAVE_${uword}" |
| 493 |
- fi |
| 494 |
- uword="${1}" |
| 495 |
- shift |
| 496 |
- done |
| 497 |
-} |
| 498 |
- |
| 499 |
-pkg_pretend() { |
| 500 |
- if use static; then |
| 501 |
- einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked." |
| 502 |
- use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored." |
| 503 |
- fi |
| 504 |
-} |
| 505 |
- |
| 506 |
-pkg_setup() { |
| 507 |
- enewgroup dnsmasq |
| 508 |
- enewuser dnsmasq -1 -1 /dev/null dnsmasq |
| 509 |
-} |
| 510 |
- |
| 511 |
-src_prepare() { |
| 512 |
- default |
| 513 |
- |
| 514 |
- sed -i -r 's:lua5.[0-9]+:lua:' Makefile |
| 515 |
- sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example |
| 516 |
-} |
| 517 |
- |
| 518 |
-src_configure() { |
| 519 |
- COPTS="$(use_have -n auth-dns auth)" |
| 520 |
- COPTS+="$(use_have conntrack)" |
| 521 |
- COPTS+="$(use_have dbus)" |
| 522 |
- COPTS+="$(use libidn2 || use_have idn)" |
| 523 |
- COPTS+="$(use_have libidn2)" |
| 524 |
- COPTS+="$(use_have -n inotify)" |
| 525 |
- COPTS+="$(use_have -n dhcp dhcp dhcp6)" |
| 526 |
- COPTS+="$(use_have -n ipv6 ipv6 dhcp6)" |
| 527 |
- COPTS+="$(use_have -n id id)" |
| 528 |
- COPTS+="$(use_have lua luascript)" |
| 529 |
- COPTS+="$(use_have -n script)" |
| 530 |
- COPTS+="$(use_have -n tftp)" |
| 531 |
- COPTS+="$(use_have dnssec)" |
| 532 |
- COPTS+="$(use_have static dnssec_static)" |
| 533 |
-} |
| 534 |
- |
| 535 |
-src_compile() { |
| 536 |
- emake \ |
| 537 |
- PREFIX=/usr \ |
| 538 |
- MANDIR=/usr/share/man \ |
| 539 |
- CC="$(tc-getCC)" \ |
| 540 |
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \ |
| 541 |
- CFLAGS="${CFLAGS}" \ |
| 542 |
- LDFLAGS="${LDFLAGS}" \ |
| 543 |
- COPTS="${COPTS}" \ |
| 544 |
- CONFFILE="/etc/${PN}.conf" \ |
| 545 |
- all$(use nls && echo "-i18n") |
| 546 |
- |
| 547 |
- use dhcp-tools && emake -C contrib/lease-tools \ |
| 548 |
- PREFIX=/usr \ |
| 549 |
- MANDIR=/usr/share/man \ |
| 550 |
- CC="$(tc-getCC)" \ |
| 551 |
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \ |
| 552 |
- CFLAGS="${CFLAGS}" \ |
| 553 |
- LDFLAGS="${LDFLAGS}" \ |
| 554 |
- all |
| 555 |
-} |
| 556 |
- |
| 557 |
-src_install() { |
| 558 |
- local lingua puid |
| 559 |
- emake \ |
| 560 |
- PREFIX=/usr \ |
| 561 |
- MANDIR=/usr/share/man \ |
| 562 |
- COPTS="${COPTS}" \ |
| 563 |
- DESTDIR="${D}" \ |
| 564 |
- install$(use nls && echo "-i18n") |
| 565 |
- |
| 566 |
- for lingua in "${DM_LINGUAS[@]}"; do |
| 567 |
- has ${lingua} ${LINGUAS-${lingua}} \ |
| 568 |
- || rm -rf "${D}"/usr/share/locale/${lingua} |
| 569 |
- done |
| 570 |
- [[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/ |
| 571 |
- |
| 572 |
- dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example |
| 573 |
- dodoc -r logo |
| 574 |
- |
| 575 |
- docinto html/ |
| 576 |
- dodoc *.html |
| 577 |
- |
| 578 |
- newinitd "${FILESDIR}"/dnsmasq-init-r2 ${PN} |
| 579 |
- newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN} |
| 580 |
- |
| 581 |
- insinto /etc |
| 582 |
- newins dnsmasq.conf.example dnsmasq.conf |
| 583 |
- |
| 584 |
- insinto /usr/share/dnsmasq |
| 585 |
- doins trust-anchors.conf |
| 586 |
- |
| 587 |
- if use dhcp; then |
| 588 |
- dodir /var/lib/misc |
| 589 |
- newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r1 ${PN} |
| 590 |
- fi |
| 591 |
- if use dbus; then |
| 592 |
- insinto /etc/dbus-1/system.d |
| 593 |
- doins dbus/dnsmasq.conf |
| 594 |
- fi |
| 595 |
- |
| 596 |
- if use dhcp-tools; then |
| 597 |
- dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time} |
| 598 |
- doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1 |
| 599 |
- if use ipv6; then |
| 600 |
- dosbin contrib/lease-tools/dhcp_release6 |
| 601 |
- doman contrib/lease-tools/dhcp_release6.1 |
| 602 |
- fi |
| 603 |
- fi |
| 604 |
- |
| 605 |
- systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service |
| 606 |
-} |
| 607 |
- |
| 608 |
-pkg_preinst() { |
| 609 |
- # temporary workaround to (hopefully) prevent leases file from being removed |
| 610 |
- [[ -f /var/lib/misc/dnsmasq.leases ]] && cp /var/lib/misc/dnsmasq.leases "${T}" |
| 611 |
-} |
| 612 |
- |
| 613 |
-pkg_postinst() { |
| 614 |
- # temporary workaround to (hopefully) prevent leases file from being removed |
| 615 |
- [[ -f "${T}"/dnsmasq.leases ]] && cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases |
| 616 |
-} |
| 617 |
|
| 618 |
diff --git a/net-dns/dnsmasq/dnsmasq-2.77.ebuild b/net-dns/dnsmasq/dnsmasq-2.77.ebuild |
| 619 |
deleted file mode 100644 |
| 620 |
index cd8e91ad766..00000000000 |
| 621 |
--- a/net-dns/dnsmasq/dnsmasq-2.77.ebuild |
| 622 |
+++ /dev/null |
| 623 |
@@ -1,193 +0,0 @@ |
| 624 |
-# Copyright 1999-2018 Gentoo Foundation |
| 625 |
-# Distributed under the terms of the GNU General Public License v2 |
| 626 |
- |
| 627 |
-EAPI=6 |
| 628 |
- |
| 629 |
-inherit toolchain-funcs flag-o-matic user systemd |
| 630 |
- |
| 631 |
-DESCRIPTION="Small forwarding DNS server" |
| 632 |
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html" |
| 633 |
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" |
| 634 |
- |
| 635 |
-LICENSE="|| ( GPL-2 GPL-3 )" |
| 636 |
-SLOT="0" |
| 637 |
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
| 638 |
- |
| 639 |
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify" |
| 640 |
-IUSE+=" ipv6 lua nls script selinux static tftp" |
| 641 |
- |
| 642 |
-DM_LINGUAS=(de es fi fr id it no pl pt_BR ro) |
| 643 |
- |
| 644 |
-CDEPEND="dbus? ( sys-apps/dbus ) |
| 645 |
- idn? ( net-dns/libidn ) |
| 646 |
- libidn2? ( >=net-dns/libidn2-2.0 ) |
| 647 |
- lua? ( dev-lang/lua:* ) |
| 648 |
- conntrack? ( net-libs/libnetfilter_conntrack ) |
| 649 |
- nls? ( sys-devel/gettext ) |
| 650 |
-" |
| 651 |
- |
| 652 |
-DEPEND="${CDEPEND} |
| 653 |
- app-arch/xz-utils |
| 654 |
- dnssec? ( |
| 655 |
- dev-libs/nettle[gmp] |
| 656 |
- static? ( dev-libs/nettle[static-libs(+)] ) |
| 657 |
- ) |
| 658 |
- virtual/pkgconfig |
| 659 |
-" |
| 660 |
- |
| 661 |
-RDEPEND="${CDEPEND} |
| 662 |
- dnssec? ( |
| 663 |
- !static? ( |
| 664 |
- dev-libs/nettle[gmp] |
| 665 |
- ) |
| 666 |
- ) |
| 667 |
- selinux? ( sec-policy/selinux-dnsmasq ) |
| 668 |
-" |
| 669 |
- |
| 670 |
-REQUIRED_USE="dhcp-tools? ( dhcp ) |
| 671 |
- lua? ( script ) |
| 672 |
- libidn2? ( !idn )" |
| 673 |
- |
| 674 |
-use_have() { |
| 675 |
- local useflag no_only uword |
| 676 |
- if [[ $1 == '-n' ]]; then |
| 677 |
- no_only=1 |
| 678 |
- shift |
| 679 |
- fi |
| 680 |
- useflag="${1}" |
| 681 |
- shift |
| 682 |
- |
| 683 |
- uword="${1:-${useflag}}" |
| 684 |
- shift |
| 685 |
- |
| 686 |
- while [[ ${uword} ]]; do |
| 687 |
- uword="${uword^^}" |
| 688 |
- |
| 689 |
- if ! use "${useflag}"; then |
| 690 |
- echo -n " -DNO_${uword}" |
| 691 |
- elif [[ -z "${no_only}" ]]; then |
| 692 |
- echo -n " -DHAVE_${uword}" |
| 693 |
- fi |
| 694 |
- uword="${1}" |
| 695 |
- shift |
| 696 |
- done |
| 697 |
-} |
| 698 |
- |
| 699 |
-pkg_pretend() { |
| 700 |
- if use static; then |
| 701 |
- einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked." |
| 702 |
- use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored." |
| 703 |
- fi |
| 704 |
-} |
| 705 |
- |
| 706 |
-pkg_setup() { |
| 707 |
- enewgroup dnsmasq |
| 708 |
- enewuser dnsmasq -1 -1 /dev/null dnsmasq |
| 709 |
-} |
| 710 |
- |
| 711 |
-src_prepare() { |
| 712 |
- default |
| 713 |
- |
| 714 |
- sed -i -r 's:lua5.[0-9]+:lua:' Makefile |
| 715 |
- sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example |
| 716 |
-} |
| 717 |
- |
| 718 |
-src_configure() { |
| 719 |
- COPTS="$(use_have -n auth-dns auth)" |
| 720 |
- COPTS+="$(use_have conntrack)" |
| 721 |
- COPTS+="$(use_have dbus)" |
| 722 |
- COPTS+="$(use_have idn)" |
| 723 |
- COPTS+="$(use_have libidn2)" |
| 724 |
- COPTS+="$(use_have -n inotify)" |
| 725 |
- COPTS+="$(use_have -n dhcp dhcp dhcp6)" |
| 726 |
- COPTS+="$(use_have -n ipv6 ipv6 dhcp6)" |
| 727 |
- COPTS+="$(use_have -n id id)" |
| 728 |
- COPTS+="$(use_have lua luascript)" |
| 729 |
- COPTS+="$(use_have -n script)" |
| 730 |
- COPTS+="$(use_have -n tftp)" |
| 731 |
- COPTS+="$(use_have dnssec)" |
| 732 |
- COPTS+="$(use_have static dnssec_static)" |
| 733 |
-} |
| 734 |
- |
| 735 |
-src_compile() { |
| 736 |
- emake \ |
| 737 |
- PREFIX=/usr \ |
| 738 |
- MANDIR=/usr/share/man \ |
| 739 |
- CC="$(tc-getCC)" \ |
| 740 |
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \ |
| 741 |
- CFLAGS="${CFLAGS}" \ |
| 742 |
- LDFLAGS="${LDFLAGS}" \ |
| 743 |
- COPTS="${COPTS}" \ |
| 744 |
- CONFFILE="/etc/${PN}.conf" \ |
| 745 |
- all$(use nls && echo "-i18n") |
| 746 |
- |
| 747 |
- use dhcp-tools && emake -C contrib/lease-tools \ |
| 748 |
- PREFIX=/usr \ |
| 749 |
- MANDIR=/usr/share/man \ |
| 750 |
- CC="$(tc-getCC)" \ |
| 751 |
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \ |
| 752 |
- CFLAGS="${CFLAGS}" \ |
| 753 |
- LDFLAGS="${LDFLAGS}" \ |
| 754 |
- all |
| 755 |
-} |
| 756 |
- |
| 757 |
-src_install() { |
| 758 |
- local lingua puid |
| 759 |
- emake \ |
| 760 |
- PREFIX=/usr \ |
| 761 |
- MANDIR=/usr/share/man \ |
| 762 |
- COPTS="${COPTS}" \ |
| 763 |
- DESTDIR="${D}" \ |
| 764 |
- install$(use nls && echo "-i18n") |
| 765 |
- |
| 766 |
- for lingua in "${DM_LINGUAS[@]}"; do |
| 767 |
- has ${lingua} ${LINGUAS-${lingua}} \ |
| 768 |
- || rm -rf "${D}"/usr/share/locale/${lingua} |
| 769 |
- done |
| 770 |
- [[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/ |
| 771 |
- |
| 772 |
- dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example |
| 773 |
- dodoc -r logo |
| 774 |
- |
| 775 |
- docinto html/ |
| 776 |
- dodoc *.html |
| 777 |
- |
| 778 |
- newinitd "${FILESDIR}"/dnsmasq-init-r2 ${PN} |
| 779 |
- newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN} |
| 780 |
- |
| 781 |
- insinto /etc |
| 782 |
- newins dnsmasq.conf.example dnsmasq.conf |
| 783 |
- |
| 784 |
- insinto /usr/share/dnsmasq |
| 785 |
- doins trust-anchors.conf |
| 786 |
- |
| 787 |
- if use dhcp; then |
| 788 |
- dodir /var/lib/misc |
| 789 |
- newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r1 ${PN} |
| 790 |
- fi |
| 791 |
- if use dbus; then |
| 792 |
- insinto /etc/dbus-1/system.d |
| 793 |
- doins dbus/dnsmasq.conf |
| 794 |
- fi |
| 795 |
- |
| 796 |
- if use dhcp-tools; then |
| 797 |
- dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time} |
| 798 |
- doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1 |
| 799 |
- if use ipv6; then |
| 800 |
- dosbin contrib/lease-tools/dhcp_release6 |
| 801 |
- doman contrib/lease-tools/dhcp_release6.1 |
| 802 |
- fi |
| 803 |
- fi |
| 804 |
- |
| 805 |
- systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service |
| 806 |
-} |
| 807 |
- |
| 808 |
-pkg_preinst() { |
| 809 |
- # temporary workaround to (hopefully) prevent leases file from being removed |
| 810 |
- [[ -f /var/lib/misc/dnsmasq.leases ]] && cp /var/lib/misc/dnsmasq.leases "${T}" |
| 811 |
-} |
| 812 |
- |
| 813 |
-pkg_postinst() { |
| 814 |
- # temporary workaround to (hopefully) prevent leases file from being removed |
| 815 |
- [[ -f "${T}"/dnsmasq.leases ]] && cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases |
| 816 |
-} |
Archives