Revision bump, pull in a couple of crasher fixes from upstream including one that could lead to an information leak (bug #547966). Update dependency on lua to include slot operator. Clean out a couple of old versions.

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

6 files changed, 117 insertions, 187 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 4ea1a576ee36..3b8da0bff7a8 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-dns/dnsmasq
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.264 2014/12/04 08:32:02 ago Exp $
+# 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 $
+
+*dnsmasq-2.72-r1 (28 Apr 2015)
+
+  28 Apr 2015; Patrick McLean <chutzpah@gentoo.org> +dnsmasq-2.72-r1.ebuild, +fi
+  les/dnsmasq-2.72-Fix-crash-caused-by-looking-up-servers.bind-when-many-servers
+  -defined.patch, +files/dnsmasq-2.72-Fix-crash-on-receipt-of-certain-malformed-
+  DNS-requests.patch, -dnsmasq-2.71-r1.ebuild, -dnsmasq-2.71.ebuild:
+  Revision bump, pull in a couple of crasher fixes from upstream including one
+  that could lead to an information leak (bug #547966). Update dependency on lua
+  to include slot operator. Clean out a couple of old versions.
 
   04 Dec 2014; Agostino Sarubbo <ago@gentoo.org> dnsmasq-2.72.ebuild:
   Stable for ppc64, wrt bug #527536
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index ecd1e2b5d73d..fbbb6cb1f7a3 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -3,34 +3,34 @@ Hash: SHA256
 
 AUX dnsmasq-2.47-fbsd-config.patch 505 SHA256 4e05e46b59254e718550cda505986b9b572a0716636fb6a5405a54df25cfa84a SHA512 9d2476c60b87f4515473e5b790ca3c6dd96105ecbda55fa385ce88290acbe8a16b6c48f9a6cbcc535662765aa4f07d182c0f5ebb4ffff1c98bb0cf6a8f4dd528 WHIRLPOOL e314020c11bc902f1dc29464785098ef0d10ebf14d8092fc1b8b673cea3d64e5212f82b85597ffe2d2bc150fbf51f27f560744a7ea12f2359c698e5ca80898cb
 AUX dnsmasq-2.66-dhcp-option-zero.patch 4084 SHA256 8d51ddd44560ef96a2e880997e8d337ed9c8aff0747e22b82444f87aed3d6ac4 SHA512 afee1cbed8fdb64cf73e92e68ed051433ee00adcce279826b251dcebd0fbb5b8044aff95da6d5bd544034f7797330321eb2339347409b75baf0ab1133358b33b WHIRLPOOL a222586e7e64707e57dfd80ba509d28a3f9031d58ede163fa5e95ace6a1b9f8db5ca9c5f32e8515c9851627a23490291d37097c230ba89fbfddb9469061ea011
+AUX dnsmasq-2.72-Fix-crash-caused-by-looking-up-servers.bind-when-many-servers-defined.patch 1065 SHA256 5a7f3d0ce4cd97a65337ba5cc80136bff7ece204518d6bc956ab28845ca84178 SHA512 36c2195575fa91b91283bba5a3c04171aa42fe5fcaaeb4dc57387a4f9b514e5dfbb078a17866eed85b8abe2b819788f7d859cb8ef6107bb7212bb32e6f4fe032 WHIRLPOOL 067b7ea7d8394bf83076600215f8111f749cd2e42b121e2aa9edec36abdad1caebd1eebb6a7faa503ebcc81f83fad3fb85d483a80720d40360095322179c6608
+AUX dnsmasq-2.72-Fix-crash-on-receipt-of-certain-malformed-DNS-requests.patch 1528 SHA256 255e94a6cf3b6648431525c0a4df3cc713306dce955e2963eb4bb7a82dd67e28 SHA512 b5fc92b8a1da037146c9d5a6b57fc2f1b77dd4f643409575896a07939b4d694001198332fa75271bb59e6d46786619aeab82e6fc20e3e1aecd2a49e980674f24 WHIRLPOOL e1500564a2b2ed94adc22f1a9c99c9d648eba578ea6c156fa56a61395a39ef50ffaa5e35df581891004d86ffdde4b9471af4c71850f8981032fc87b7d5b93224
 AUX dnsmasq-init-dhcp-r1 711 SHA256 5d3fa0f722239e950db0e03f7cc720c37ee3c0aedea02b26b2a79aad1e15f86e SHA512 24a3a2ca0d0675701891ae3c4c37cc46a6c473ae2b56b5a0c9a312d97facb5d5e5bfb689ab6e9a49b6fbdfc7778b63568205bf5699fca37697836a49f6be50af WHIRLPOOL a6df9be83d9a4c9ed8fc77f1f4c60e686bb47c50b7e369e756c243b45286bb8015c06ebe64a810af133e9eb9f2975a05a5fa8a83979a0c40e04a6bc573331d5d
 AUX dnsmasq-init-r2 595 SHA256 bc80bcd171db123a6d02df9ebbfde3fb59078295ff24dea9b9777bc4ee86db14 SHA512 1ebd8f61a11b3d05f754ef30c4b9f83df80892335b49b5b949d3c17277dc0ccc1929e77459aa2fcd193f55c65c2c3431cd049e4e0e5bfb4a35750c4fa845146a WHIRLPOOL 7a6ce7def99d58d7a01556fa811ae6f2dba2a20af30c9e770bd30dec5e052729768c9113f10e21bb3bfe2c6a1e45efd0e1d18f72dab22ad9fceef201db4c1a16
 AUX dnsmasq.confd-r1 170 SHA256 51c0672a70d5d6793d295d82db666d372fb081e8627318f67c88e48d08d254b5 SHA512 9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 WHIRLPOOL 86f364adcb5576bfb2cc84d13dd087bef987cae70eee1ae7816f0febc58ec637a97fea357c506456781eab116e257d06b1e45f7e2bbd81849251c15067a347ab
 AUX dnsmasq.service 278 SHA256 2cca1e7ec70aee80c9d1f59e7f17b515e5fa66b08835ed0fddbe799d2b39db04 SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1 WHIRLPOOL efbb77d8a3ec69bd030f219ffb975ec0a5680f0d4da8b05bbb896db26c444c861fb47d96dfe8201f21acf5085fb465892ef33263de677390308b2328a8a7e33e
 AUX dnsmasq.service-r1 278 SHA256 2cca1e7ec70aee80c9d1f59e7f17b515e5fa66b08835ed0fddbe799d2b39db04 SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1 WHIRLPOOL efbb77d8a3ec69bd030f219ffb975ec0a5680f0d4da8b05bbb896db26c444c861fb47d96dfe8201f21acf5085fb465892ef33263de677390308b2328a8a7e33e
 DIST dnsmasq-2.66.tar.xz 401056 SHA256 5e143947527bcdc46a30f4b1bbdfbfa96333dd98bcecdac3b5b1d6cacfe06c75 SHA512 f0bde09f178ca15f4c28efb06901213af9a009b4476daa8a08bafc7682b9ffed13ac65c5c232acdf828382f321137de08b4a33108d22613b198fe30695b3362c WHIRLPOOL e749d24017c35fdbaaaf417decdf9316e235cf7f96f031caceee14d06b982c285b0e561f50597cd12b6a31ef554f7f2e22ca6234f44a6d8bb066dede99461166
-DIST dnsmasq-2.71.tar.xz 448380 SHA256 4919fb572fed5c6205de1d384f8661c25c19358904c2e6265928e3a3e4bfffba SHA512 b0f1b8633b4560cb9a4fe6d98b8c0db40182c989e698964a9153ea3a96663dcaaa33848dd0876e8f9a93e8a24fc4bd91120335291871712ad6b9e9e97fa3baa1 WHIRLPOOL e8175e48f0d1569a1ca08fb108bbe9593d32b8f1263dcf2995349f5f4dd4b8b19e517aea8d64f038b5ebf3a1d81c101b0153959115df6f0af65175af44f0147e
 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.71-r1.ebuild 3922 SHA256 7355f820f4cea7857df34218e3af94245daf78c9ce8ef56445f8acc113f28347 SHA512 82c0f0437b2afbafcda67125f5073152ae6982f6685c388e19e5f3a677ac94388c73f427bf403497f706001bd27c0d881f0cfed561817ddedfb8300c4eb19e20 WHIRLPOOL 88655b09afa17b1f7ac69837b18e2c6cf98b532c24cde585a8ac21f6a67f421a68124152eb8cec1734c9544b18d61ff750ad768f524cc4e7e2201a3e7f5e279c
-EBUILD dnsmasq-2.71.ebuild 3690 SHA256 d0eccc3cdebac8d18379a27126ef2902ba399685a79b4c96624974dc5360cd4c SHA512 7e0818280810f259d143785813a3e8e371b037509ea8103c4750310c3756ae4e641641763b67f3da22ab72e20edf7e080d08e7574b1f32896177f7215c4a0e93 WHIRLPOOL 0ac33d7ff895b159278fd118357eb923e5d68d4e99c9728269bd8e8cf2e26826997b40d5756b4c937015e1537471304703268fd4b0291a4470885c4a72344f70
+EBUILD dnsmasq-2.72-r1.ebuild 4438 SHA256 5c4f9c49e5153fbda1a40a13f2223e5dd74076e7d4074a2cd59cc0b11d226ad4 SHA512 f32ad3413bf929f6c42ad43972504cc871a07229220eac103a0c4adf4c817aba2120e6239813f0cc43ca39da3b7857c4913a616984a7845b03214e9edd323d26 WHIRLPOOL 3b1b356aea6f9ccc83de4dfb58673d57768a209a49762bdfd784185806140d1eb5a7ba740c6fd238c86fe305a1225c2639cccd58051bae6af3c8edc727798acf
 EBUILD dnsmasq-2.72.ebuild 4228 SHA256 8aaf3cbf173910c5adf0d25068289727d9c8eacbd1c5778883d252e6d1670c54 SHA512 31b9d191248ac827dabe6f02558051697f5d9d38a0591891045b87ec8e87062e14575bb95c1b21f88cf4374ed8ad68537c927deac977f2299fda27ba6d279aeb WHIRLPOOL a2a8fd6ffbd0e4da4250ac39a0f0ea1484eee1450c5b3e32d4a6ba702461be7cd1b8ec33efa86b97703c22523dab052da5079c7a1c304afb3dcf2c3990926e62
-MISC ChangeLog 35769 SHA256 694ab47b334d33b713ef07e949c866dbac38633d3ba97508d69ff4d90ce29b05 SHA512 29931f47139c810d8eb1b6950ad7627a919859894818a52f3f3c596c509ee23ff1bcec15fe2537b7968e66a5cdf690b0766e14abc08f5abb4ff4b12d1baff1af WHIRLPOOL 2f962c9026233364500102824e3160c1aef43e88cd76cdf07ddf8100862269d05b05eb4f59032ecdee90d2847aeaede45f32e5e3094d00339cfd499edd4116f5
+MISC ChangeLog 36343 SHA256 a80ca73d1f012f41e711f8f603dc94282836385a78a6b4b9ede5cb458ec106b8 SHA512 c91d3a04b1c2fb69f8ec367a360868dedf4ef0bb41cbf5c6c92e267f078ffa9680f915ff813d6b4787d2f1dd940ed53aad7a4a06626fdd877980273a9b0d6765 WHIRLPOOL da1996fcbf22e6f3ad38e3ecf7d3527787bf6aab8a17c41a037b31c8fa4880f6b86463f89ff460309469ef73ce009e0c6ff2c49b7f17753d21188764bc859438
 MISC metadata.xml 807 SHA256 6fb95e16dba00e7466dd6f5fb4820c799a2f54fbc05e5b4a0791b0ac11520359 SHA512 593d4c571ec9e3927988aeb5072af21b7c5f4fc6b55a1a7ebbd1d03c14aa0a0cfa026eb5ba6547370105792485b74f8d9c8350e4b606dbe1bcf4a89aa6d73359 WHIRLPOOL e7690f451f0c10784b6d6b0902c97aac877c0d76ffe66954daa79294c1e74665e9b5d28749a594a6a1dd7c7f755a88fd942fed4619c2bf2b31e75ef5b762dd6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUgBwDAAoJELp701BxlEWfAPwQAJ4uA7RlBDHfAuT2DZ6+0oCe
-UiT5MdT9Hr4LYmVoUlmII1GHRtW5iA8j8oSTJye1QBcCAn8D4Qg8NVIKVmVtNRKG
-J7yXBVDLLlqaDUR22/LDBWf9lWK/9WaeMkwMQpfh3bbQmzGMS/t+Hk0qs7z1gipN
-2sOItm3Nptw4o51X1zj1pK72Gx02IJTmUXEEKwTVMrDVKTVNtyyCz4qXI06c0iza
-RWt3cnVneayHqSesPFCpUIuIjXL7WK+0V2KTBhkB85xMlCxobKrnKJHwKh4llW/i
-4jCBwMYLi5DY1S58y0DRJVYpv/Ri9SvJlYcrUeUV+rRpSQJQFjOWsttdf3AQ0ND8
-sfQHL+IZGqp2BzO1iBmYrqeCdNbzSkG4emFOJ0tjLeiNSQSx65QGfhnZCKXiq8M9
-rpUW6BppPMohUbL9Am3facCJWbmOshvTLIWD3HAChXztAB2G3NF1q6HPKD965kdv
-5i3iYETl6+9rZXIzXo6yu7emziFP2FK2eOBs4NaHNMTmvjWPGnl0OJM92mgeMqJ5
-zBHOFNARvdznmV9UdvAmtwhwymuwLZWVP0hd3NxxTNgWUk+UJpG/Z9yUvdL5I9YU
-cUhHqLz+o2QVKGvSjLaTBVwFPIgLC76gb1EpeLHC5viF22B/1fui4+ZLoLTMqlee
-VPvKsmcJXKj09k0LXNua
-=mthN
+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
 -----END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.71.ebuild b/net-dns/dnsmasq/dnsmasq-2.71.ebuild
deleted file mode 100644
index 1bf7b9204b63..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.71.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.71.ebuild,v 1.3 2014/11/02 08:48:02 swift 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 )
-		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 NO_ONLY=""
-	if [ $1 == '-n' ]; then
-		NO_ONLY=1
-		shift
-	fi
-
-	local UWORD=${2:-$1}
-	UWORD=${UWORD^^*}
-
-	if ! use ${1}; then
-		echo " -DNO_${UWORD}"
-	elif [ -z "${NO_ONLY}" ]; then
-		echo " -DHAVE_${UWORD}"
-	fi
-}
-
-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
-}
-
-src_configure() {
-	COPTS="$(use_have -n auth-dns auth)"
-	COPTS+="$(use_have conntrack)"
-	COPTS+="$(use_have dbus)"
-	COPTS+="$(use_have -n dhcp)"
-	COPTS+="$(use_have idn)"
-	COPTS+="$(use_have -n ipv6)"
-	COPTS+="$(use_have lua luascript)"
-	COPTS+="$(use_have -n script)"
-	COPTS+="$(use_have -n tftp)"
-	COPTS+="$(use ipv6 && use dhcp || echo " -DNO_DHCP6")"
-	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() {
-	emake \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		DESTDIR="${D}" \
-		install$(use nls && echo "-i18n")
-
-	local lingua
-	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
-	dodoc -r logo
-
-	dodoc CHANGELOG FAQ
-	dohtml *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init-r2 dnsmasq
-	newconfd "${FILESDIR}"/dnsmasq.confd-r1 dnsmasq
-
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	insinto /usr/share/dnsmasq
-	doins trust-anchors.conf
-
-	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
-}
diff --git a/net-dns/dnsmasq/dnsmasq-2.71-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.72-r1.ebuild
index 3c80602addfa..15867cbbd1a7 100644
--- a/net-dns/dnsmasq/dnsmasq-2.71-r1.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.72-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.71-r1.ebuild,v 1.2 2014/11/02 08:48:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.72-r1.ebuild,v 1.1 2015/04/28 18:16:54 chutzpah Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ done
 
 CDEPEND="dbus? ( sys-apps/dbus )
 	idn? ( net-dns/libidn )
-	lua? ( dev-lang/lua )
+	lua? ( dev-lang/lua:0 )
 	conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) )
 	nls? (
 		sys-devel/gettext
@@ -92,6 +92,9 @@ pkg_setup() {
 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() {
@@ -145,8 +148,8 @@ src_install() {
 	dodoc CHANGELOG FAQ
 	dohtml *.html
 
-	newinitd "${FILESDIR}"/dnsmasq-init-r2 dnsmasq
-	newconfd "${FILESDIR}"/dnsmasq.confd-r1 dnsmasq
+	newinitd "${FILESDIR}"/dnsmasq-init-r2 ${PN}
+	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
 
 	insinto /etc
 	newins dnsmasq.conf.example dnsmasq.conf
@@ -156,10 +159,8 @@ src_install() {
 
 	if use dhcp; then
 		dodir /var/lib/misc
-		touch "${D}"/var/lib/misc/${PN}.leases
-		fowners dnsmasq:dnsmasq /var/lib/misc/${PN}.leases
+		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r1 ${PN}
 	fi
-
 	if use dbus; then
 		insinto /etc/dbus-1/system.d
 		doins dbus/dnsmasq.conf
@@ -171,4 +172,15 @@ src_install() {
 	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
 }
diff --git a/net-dns/dnsmasq/files/dnsmasq-2.72-Fix-crash-caused-by-looking-up-servers.bind-when-many-servers-defined.patch b/net-dns/dnsmasq/files/dnsmasq-2.72-Fix-crash-caused-by-looking-up-servers.bind-when-many-servers-defined.patch
new file mode 100644
index 000000000000..57708b6f716e
--- /dev/null
+++ b/net-dns/dnsmasq/files/dnsmasq-2.72-Fix-crash-caused-by-looking-up-servers.bind-when-many-servers-defined.patch
@@ -0,0 +1,28 @@
+commit 04b0ac05377936d121a36873bb63d492cde292c9
+Author: Simon Kelley <simon@thekelleys.org.uk>
+Date:   Mon Apr 6 17:19:13 2015 +0100
+
+    Fix crash caused by looking up servers.bind when many servers defined.
+
+diff --git a/src/cache.c b/src/cache.c
+index d7bea57..178d654 100644
+--- a/src/cache.c
++++ b/src/cache.c
+@@ -1367,7 +1367,7 @@ int cache_make_stat(struct txt_record *t)
+ 		}
+ 	    port = prettyprint_addr(&serv->addr, daemon->addrbuff);
+ 	    lenp = p++; /* length */
+-	    bytes_avail = (p - buff) + bufflen;
++	    bytes_avail = bufflen - (p - buff );
+ 	    bytes_needed = snprintf(p, bytes_avail, "%s#%d %u %u", daemon->addrbuff, port, queries, failed_queries);
+ 	    if (bytes_needed >= bytes_avail)
+ 	      {
+@@ -1381,7 +1381,7 @@ int cache_make_stat(struct txt_record *t)
+ 		lenp = p - 1;
+ 		buff = new;
+ 		bufflen = newlen;
+-		bytes_avail = (p - buff) + bufflen;
++		bytes_avail =  bufflen - (p - buff );
+ 		bytes_needed = snprintf(p, bytes_avail, "%s#%d %u %u", daemon->addrbuff, port, queries, failed_queries);
+ 	      }
+ 	    *lenp = bytes_needed;
diff --git a/net-dns/dnsmasq/files/dnsmasq-2.72-Fix-crash-on-receipt-of-certain-malformed-DNS-requests.patch b/net-dns/dnsmasq/files/dnsmasq-2.72-Fix-crash-on-receipt-of-certain-malformed-DNS-requests.patch
new file mode 100644
index 000000000000..c6106db510de
--- /dev/null
+++ b/net-dns/dnsmasq/files/dnsmasq-2.72-Fix-crash-on-receipt-of-certain-malformed-DNS-requests.patch
@@ -0,0 +1,40 @@
+commit ad4a8ff7d9097008d7623df8543df435bfddeac8
+Author: Simon Kelley <simon@thekelleys.org.uk>
+Date:   Thu Apr 9 21:48:00 2015 +0100
+
+    Fix crash on receipt of certain malformed DNS requests.
+
+diff --git a/src/rfc1035.c b/src/rfc1035.c
+index 7a07b0c..a995ab5 100644
+--- a/src/rfc1035.c
++++ b/src/rfc1035.c
+@@ -1198,7 +1198,10 @@ unsigned int extract_request(struct dns_header *header, size_t qlen, char *name,
+ size_t setup_reply(struct dns_header *header, size_t qlen,
+ 		struct all_addr *addrp, unsigned int flags, unsigned long ttl)
+ {
+-  unsigned char *p = skip_questions(header, qlen);
++  unsigned char *p;
++
++  if (!(p = skip_questions(header, qlen)))
++    return 0;
+   
+   /* clear authoritative and truncated flags, set QR flag */
+   header->hb3 = (header->hb3 & ~(HB3_AA | HB3_TC)) | HB3_QR;
+@@ -1214,7 +1217,7 @@ size_t setup_reply(struct dns_header *header, size_t qlen,
+     SET_RCODE(header, NOERROR); /* empty domain */
+   else if (flags == F_NXDOMAIN)
+     SET_RCODE(header, NXDOMAIN);
+-  else if (p && flags == F_IPV4)
++  else if (flags == F_IPV4)
+     { /* we know the address */
+       SET_RCODE(header, NOERROR);
+       header->ancount = htons(1);
+@@ -1222,7 +1225,7 @@ size_t setup_reply(struct dns_header *header, size_t qlen,
+       add_resource_record(header, NULL, NULL, sizeof(struct dns_header), &p, ttl, NULL, T_A, C_IN, "4", addrp);
+     }
+ #ifdef HAVE_IPV6
+-  else if (p && flags == F_IPV6)
++  else if (flags == F_IPV6)
+     {
+       SET_RCODE(header, NOERROR);
+       header->ancount = htons(1);