Revision bump, allow lua to come from either slot 0 or slot 5.1 (bug #548104)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 3b8da0bff7a8ffe726ddc62d18cf6143c919065a..3a22521595e4f344cffd5e2138f34048f8ba78a8 100644 (file)
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.265 2015/04/28 18:16:54 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.266 2015/04/29 17:26:40 chutzpah Exp $
+
+*dnsmasq-2.72-r2 (29 Apr 2015)
+
+  29 Apr 2015; Patrick McLean <chutzpah@gentoo.org> +dnsmasq-2.72-r2.ebuild:
+  Revision bump, allow lua to come from either slot 0 or slot 5.1 (bug #548104)
 
 *dnsmasq-2.72-r1 (28 Apr 2015)
 

diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index fbbb6cb1f7a3372754c8cbc58555f7a02a106eff..a4daa929a924f2de0531804cceae56709f6d10ee 100644 (file)
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -14,23 +14,24 @@ DIST dnsmasq-2.66.tar.xz 401056 SHA256 5e143947527bcdc46a30f4b1bbdfbfa96333dd98b
 DIST dnsmasq-2.72.tar.xz 454048 SHA256 7d0bd23f5d74b3a6b26a75d5ffcf9db81d461b47cbe578cb65a83a98008600b1 SHA512 d84b89c987966a5f5880aa329833626b0a017628dd6aa667bdad880d1c5f101a386dddb439eb6983d58952a36f25670bf58df94281b89320f02895a3e6af4cec WHIRLPOOL 491eadb0060f372a0b7f5855fb57040c4baf37352732a2943fb4173aa28e875b91537f87085201f13e76ec5680e4ad681992829a5cef800833be0911298a793c
 EBUILD dnsmasq-2.66.ebuild 3181 SHA256 2811d53903d109cc344c962bfa49e6c9f857242931663042a74e0778c145da9e SHA512 2efdee54d8dd70be76cbce1e6b729618c1e79170dca1f054cf0f12ca0eca5ab65a5a61471fe913f5851f4d97c36fb83203d5d23fb6512ea30e6d4ea9ab16c124 WHIRLPOOL 8c49095c02073fe3b56fcff2f2333b7724fff270ecf03908b351d902be95d9ad80b1b20dafd9f8739b2c93f38027a62a8bc1580dfba8000b5f1efe29e1f0cb15
 EBUILD dnsmasq-2.72-r1.ebuild 4438 SHA256 5c4f9c49e5153fbda1a40a13f2223e5dd74076e7d4074a2cd59cc0b11d226ad4 SHA512 f32ad3413bf929f6c42ad43972504cc871a07229220eac103a0c4adf4c817aba2120e6239813f0cc43ca39da3b7857c4913a616984a7845b03214e9edd323d26 WHIRLPOOL 3b1b356aea6f9ccc83de4dfb58673d57768a209a49762bdfd784185806140d1eb5a7ba740c6fd238c86fe305a1225c2639cccd58051bae6af3c8edc727798acf
+EBUILD dnsmasq-2.72-r2.ebuild 4473 SHA256 6417f96db4694573151a88417e299e0f7df0604b0c1b5f5bb72166be339569b0 SHA512 37130775cc4391fdc977a59b64305629e98209446ac9fe4778029fddc9391f2342d82424dc92784e9a9bd828e7880ea24f959ebc5f32323077f045df4d6c944d WHIRLPOOL 6c65f7bbadd1d1228a1ed7199e61a47bf54809933cdc7e6844158e2391879202d376539e37f8d1feee2987c5a2508d7252a6aea605f9adf208cccf3fe2090a0a
 EBUILD dnsmasq-2.72.ebuild 4228 SHA256 8aaf3cbf173910c5adf0d25068289727d9c8eacbd1c5778883d252e6d1670c54 SHA512 31b9d191248ac827dabe6f02558051697f5d9d38a0591891045b87ec8e87062e14575bb95c1b21f88cf4374ed8ad68537c927deac977f2299fda27ba6d279aeb WHIRLPOOL a2a8fd6ffbd0e4da4250ac39a0f0ea1484eee1450c5b3e32d4a6ba702461be7cd1b8ec33efa86b97703c22523dab052da5079c7a1c304afb3dcf2c3990926e62
-MISC ChangeLog 36343 SHA256 a80ca73d1f012f41e711f8f603dc94282836385a78a6b4b9ede5cb458ec106b8 SHA512 c91d3a04b1c2fb69f8ec367a360868dedf4ef0bb41cbf5c6c92e267f078ffa9680f915ff813d6b4787d2f1dd940ed53aad7a4a06626fdd877980273a9b0d6765 WHIRLPOOL da1996fcbf22e6f3ad38e3ecf7d3527787bf6aab8a17c41a037b31c8fa4880f6b86463f89ff460309469ef73ce009e0c6ff2c49b7f17753d21188764bc859438
+MISC ChangeLog 36533 SHA256 53bb1686c7312a1ab22dcae84a53b39af0a6f8b73aa65673f362c6b5c7c9a008 SHA512 2d3952ed0286fcfd24bd78ae48fa3e983f3f0bdb706168321a3fc94580a5deaffc3104f7250532aa114f891bf2d7b7cce6467b5472b2f932bec35983c10629df WHIRLPOOL 50bec7856bc91694227f898e98bde26af46dbb8cc36ca061fc4ff177e8d22972b7b757d02da0701c19230fd81d7776488ad83a5d773483588ba86bf579c3e434
 MISC metadata.xml 807 SHA256 6fb95e16dba00e7466dd6f5fb4820c799a2f54fbc05e5b4a0791b0ac11520359 SHA512 593d4c571ec9e3927988aeb5072af21b7c5f4fc6b55a1a7ebbd1d03c14aa0a0cfa026eb5ba6547370105792485b74f8d9c8350e4b606dbe1bcf4a89aa6d73359 WHIRLPOOL e7690f451f0c10784b6d6b0902c97aac877c0d76ffe66954daa79294c1e74665e9b5d28749a594a6a1dd7c7f755a88fd942fed4619c2bf2b31e75ef5b762dd6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVP86iAAoJEHy/RO9cNQiDjLQP/ihXoOYEvDki9UBWS6ESJ54r
-q0NKnizVqBgXm+fgVCjptaVoFaDt0zi6hWE+za98sHmhZeN8NTQL5HqbIDfwMH6n
-DBHhoMTbcDERXDorlIC9dl+5hl958CFUkvL7M7/lUAKztQEcZiukD9XWb6r2xl//
-cHj8JRDeYiRbu7tkdERCY/RyjYuWbUqnmP755RvvHuqx/EUSoukyf717nQoFKrjN
-kCugnfJi3Pyd7WETWOt/qrYER4ByzeVd1VGsvYa77kTKXiFRe9Q2j0O2EsRCshHX
-on6mUhdJWO5+KKdzcFZbHo37KtrlIKW8wA6WwEfmLF4NLAY2Xp5irqp27evPGMD+
-P8nRuweT7/OOTHOYVErg/w9MK4Jf9so6jRf+r5rMkRsy9xuMr2Nd1+gY7YeHMIpf
-Mr3Mjh1HL3BRQlp9ysnxMun9HS7QL6SFKXfowlOPgtIGkHhlpuu9pN67yftxhM2p
-p8PSRxddeDd8Ir0gZN4puh+cUgxjvRwLStSK3NyOgI8Y93Di229p/iv7EnJ7K3RD
-caRXl6Fauoydoo49C7/4tuU/C4Ir3z9/oiIWi1BK1qY3r0ZnhQYCVbsDosNASAol
-eWachiY6rH/emJqYDAVS1o+V5cF5MbFKi8qGmYzUA1k2JtWzS6X3G885BTJJugM3
-Ae7xOqqRKxDFz4Z23+yu
-=Sd9L
+iQIcBAEBCAAGBQJVQRRbAAoJEHy/RO9cNQiDh4wQAKcjLGMXbHnzo4qVnpOWkR2f
+FgFuBu7dXUXH8yneqARqcp3OQTNOQJ6Bj+Vt46hxgF1anVuKQIxGvuGA2VQgBYe+
+kJNcYK8VLQc/Q3ruNJQO+Bc4pEt25bm6itIoixOClDH3y75GVNDb2N8K7Np9ZKVR
+WHskTKwOesoljgp05Q8ZlraOYtbK+R19+RoN07l7a5WJKXP0Gv/U4tFdT+JdwnTp
+OOQKE3l3f6e4eYAaQ7flthRgqOSiqXWXipVTcYul6/bVw4JUtEkZgnIVjGKnwVfM
+PION0snSHCPcxxeOZ5jdxow1MJrk0TJy1FDIDJEEaiK2uybqPEq2rmhVyS+owGUD
+cNB2YRW4vdRILMnmoGV2k1yP8fOy/vfl59unc432Cj4x5AYpz+9A9KkXMzHEtT8b
+oUHPrw/wUJC7I9OuVaghkqONJ2THHd9w3deIAfKoJgAXa5WodCunH84h72W1P0cF
+mekeds4S4pSNmgpaNXXG3sph9yMThnIrLE0PG979+rMcPQx+eYZX3TkTw3zb6DHQ
+ayOg+0ZYxh5SFKqvzQaiSnBw+hbGvtvNBXScG2OQ5kQuHmj3lpF45n9fmbqV/KTw
+kPalgy3WH5SQN81y+f5Q16OvggWlkd21XXb63g7TJ8ZHFH0I7lsJ35EhOKUaXvAf
+hCqNnX0LYwjRVQFNrKle
+=MSuO
 -----END PGP SIGNATURE-----

diff --git a/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild b/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild
new file mode 100644 (file)
index 0000000..ee7c8e8
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild,v 1.1 2015/04/29 17:26:40 chutzpah Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs flag-o-matic user systemd
+
+DESCRIPTION="Small forwarding DNS server"
+HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
+SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn ipv6 lua nls script selinux static tftp"
+DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
+for dm_lingua in ${DM_LINGUAS}; do
+       IUSE+=" linguas_${dm_lingua}"
+done
+
+CDEPEND="dbus? ( sys-apps/dbus )
+       idn? ( net-dns/libidn )
+       lua? (
+               || (
+                       dev-lang/lua:0
+                       dev-lang/lua:5.1
+               )
+       )
+       conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) )
+       nls? (
+               sys-devel/gettext
+               net-dns/libidn
+       )
+"
+
+DEPEND="${CDEPEND}
+       app-arch/xz-utils
+       dnssec? (
+               dev-libs/nettle[gmp]
+               static? (
+                       dev-libs/nettle[static-libs(+)]
+               )
+       )
+       virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+       dnssec? (
+               !static? (
+                       dev-libs/nettle[gmp]
+               )
+       )
+       selinux? ( sec-policy/selinux-dnsmasq )
+"
+
+REQUIRED_USE="dhcp-tools? ( dhcp )
+       lua? ( script )
+       s390? ( !conntrack )"
+
+use_have() {
+       local useflag no_only uword
+       if [[ $1 == '-n' ]]; then
+               no_only=1
+               shift
+       fi
+       useflag="${1}"
+       shift
+
+       uword="${1:-${useflag}}"
+       shift
+
+       while [[ ${uword} ]]; do
+               uword=${uword^^*}
+
+               if ! use "${useflag}"; then
+                       echo -n " -DNO_${uword}"
+               elif [[ -z "${no_only}" ]]; then
+                       echo -n " -DHAVE_${uword}"
+               fi
+               uword="${1}"
+               shift
+       done
+}
+
+pkg_pretend() {
+       if use static; then
+               einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
+               use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored."
+       fi
+}
+
+pkg_setup() {
+       enewgroup dnsmasq
+       enewuser dnsmasq -1 -1 /dev/null dnsmasq
+}
+
+src_prepare() {
+       sed -i -r 's:lua5.[0-9]+:lua:' Makefile
+       sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
+
+       epatch "${FILESDIR}"/${P}-Fix-crash-on-receipt-of-certain-malformed-DNS-requests.patch
+       epatch "${FILESDIR}"/${P}-Fix-crash-caused-by-looking-up-servers.bind-when-many-servers-defined.patch
+}
+
+src_configure() {
+       COPTS="$(use_have -n auth-dns auth)"
+       COPTS+="$(use_have conntrack)"
+       COPTS+="$(use_have dbus)"
+       COPTS+="$(use_have idn)"
+       COPTS+="$(use_have -n dhcp dhcp dhcp6)"
+       COPTS+="$(use_have -n ipv6 ipv6 dhcp6)"
+       COPTS+="$(use_have lua luascript)"
+       COPTS+="$(use_have -n script)"
+       COPTS+="$(use_have -n tftp)"
+       COPTS+="$(use_have dnssec)"
+       COPTS+="$(use_have static dnssec_static)"
+}
+
+src_compile() {
+       emake \
+               PREFIX=/usr \
+               CC="$(tc-getCC)" \
+               CFLAGS="${CFLAGS}" \
+               LDFLAGS="${LDFLAGS}" \
+               COPTS="${COPTS}" \
+               CONFFILE="/etc/${PN}.conf" \
+               all$(use nls && echo "-i18n")
+
+       use dhcp-tools && emake -C contrib/wrt \
+               PREFIX=/usr \
+               CC="$(tc-getCC)" \
+               CFLAGS="${CFLAGS}" \
+               LDFLAGS="${LDFLAGS}" \
+               all
+}
+
+src_install() {
+       local lingua puid
+       emake \
+               PREFIX=/usr \
+               MANDIR=/usr/share/man \
+               DESTDIR="${D}" \
+               install$(use nls && echo "-i18n")
+
+       for lingua in ${DM_LINGUAS}; do
+               use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
+       done
+       [[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
+
+       dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
+       dodoc -r logo
+
+       dodoc CHANGELOG FAQ
+       dohtml *.html
+
+       newinitd "${FILESDIR}"/dnsmasq-init-r2 ${PN}
+       newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
+
+       insinto /etc
+       newins dnsmasq.conf.example dnsmasq.conf
+
+       insinto /usr/share/dnsmasq
+       doins trust-anchors.conf
+
+       if use dhcp; then
+               dodir /var/lib/misc
+               newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r1 ${PN}
+       fi
+       if use dbus; then
+               insinto /etc/dbus-1/system.d
+               doins dbus/dnsmasq.conf
+       fi
+
+       if use dhcp-tools; then
+               dosbin contrib/wrt/{dhcp_release,dhcp_lease_time}
+               doman contrib/wrt/{dhcp_release,dhcp_lease_time}.1
+       fi
+
+       systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+
+}
+
+pkg_preinst() {
+       # temporary workaround to (hopefully) prevent leases file from being removed
+       [[ -f /var/lib/misc/dnsmasq.leases ]] && cp /var/lib/misc/dnsmasq.leases "${T}"
+}
+
+pkg_postinst() {
+       # temporary workaround to (hopefully) prevent leases file from being removed
+       [[ -f "${T}"/dnsmasq.leases ]] && cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
+}