Version bump, added support for DNSSEC (Bug #504154). Initial ebuild changes contributed by Alex Xu.

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

4 files changed, 190 insertions, 21 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index dfa4592bf925..d4dcaac3bcbd 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/dnsmasq
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.248 2013/12/10 19:55:03 chutzpah Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.249 2014/04/10 18:05:22 chutzpah Exp $
+
+*dnsmasq-2.69 (10 Apr 2014)
+
+  10 Apr 2014; Patrick McLean <chutzpah@gentoo.org> +dnsmasq-2.69.ebuild,
+  metadata.xml:
+  Version bump, added support for DNSSEC (Bug #504154). Initial ebuild changes
+  contributed by Alex Xu.
 
   10 Dec 2013; Patrick McLean <chutzpah@gentoo.org> +files/dnsmasq.service-r1,
   dnsmasq-2.68.ebuild, files/dnsmasq.service:
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 37dac29aa067..b0ea0a451320 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -10,25 +10,27 @@ AUX dnsmasq.service-r1 278 SHA256 2cca1e7ec70aee80c9d1f59e7f17b515e5fa66b08835ed
 DIST dnsmasq-2.66.tar.xz 401056 SHA256 5e143947527bcdc46a30f4b1bbdfbfa96333dd98bcecdac3b5b1d6cacfe06c75 SHA512 f0bde09f178ca15f4c28efb06901213af9a009b4476daa8a08bafc7682b9ffed13ac65c5c232acdf828382f321137de08b4a33108d22613b198fe30695b3362c WHIRLPOOL e749d24017c35fdbaaaf417decdf9316e235cf7f96f031caceee14d06b982c285b0e561f50597cd12b6a31ef554f7f2e22ca6234f44a6d8bb066dede99461166
 DIST dnsmasq-2.67.tar.xz 418484 SHA256 a8f1cec9d3f38d19c7c54e2879703d42748ace0f62c32e695b082051bdd2705d SHA512 32946fb01fca7f635b6164e0b06392d3377031c0f3fefbcd52bee74939ae527ba5abe494db7dd9d4afdd39faa044c0e82f0bec0b1137b7768013601bceb8a6b3 WHIRLPOOL d9d22e47a9e36962f87df3a76e38fd18415a00fdf60241861d8b29417c4d0f404cb6797e3a4688b95d4bc4cff86cb2cb3b3b0f405286c312300a54a0a61a2591
 DIST dnsmasq-2.68.tar.xz 420968 SHA256 055904f39a65bf651ccbe0f25922c88cf6e7e1b85e8b1905804253b6957ec7a0 SHA512 c67605f21fc5e64fe70ac4349c45a246575ebdb07ada14602c453b9a1152a12c3a7f3a01d5749db9f7a24a9f281a7fb9fd24bfaff1ec35e9ab0d213ae14cac07 WHIRLPOOL 9a69feedd8982dd70053df270fbd5523acc9a5b6e74d03e68363adb111d3ffe87f22dfb0f6f16f7159f717cb5d2de0bc142e585e26e2961068b0e3cc50734c03
+DIST dnsmasq-2.69.tar.xz 446724 SHA256 80ce4293b2c0966ebe7997adf626269cafdcb98d7dbe51d8a312ff15244e69fc SHA512 dfa5f1fe6837a27483035d68f0cfd18d9a95a5298b86bcd1961413d76ab33063ae8e86047b146e7fbb1c9855e2563db75f0e8d5fbb5744088f145055f5f86651 WHIRLPOOL 0badd6ac1eb18f6c606da7d61fc90e6d7964fbcbe023ab4aee229594f55e70dfb43b7c6b4b3ca7e18c479011843b7481002e7b6067296d5fa29d4c113619afee
 EBUILD dnsmasq-2.66.ebuild 3154 SHA256 62ffc1af6d4021fba25f7d9f6c36f71d291661c3988de2501b8a394b4bf6342e SHA512 049e94034f89e3a91c3b875a9e1c87ec014e5678c8c53708e17c8dcc858c418525ef550c4d4bc6201a235a0a66a3d9380b66dc8fc559d3a742d24666072ccd2d WHIRLPOOL d268b4ebaa126c73215b7cc6cf623a1eb085b4242ca04b08ce1cf89f9f5f60f078bc0f3dff5109053712048830c43793115d27cb6c144e5fc4e7d7a8f3b56654
 EBUILD dnsmasq-2.67.ebuild 3041 SHA256 22e5fca1aaac67e68e7f04de1eeff0547b46d682cd1ce0e629d404a158a782e2 SHA512 19a08db447e7cc58a6c4d3092b5e8e6bbc436683911bf819777d36697311fad4fbe38938261358f9a426e05caa68643aa287a3bfcb9e6630a3f2740c34f15836 WHIRLPOOL 547fbb5416e1ba8cf13c305d1ebceb43a8739431f63da30b393b4017a35c6c3ee220b2dae9b866850fa956f85960bf1a910102e99ca110213c08100bc42bfd43
 EBUILD dnsmasq-2.68.ebuild 3094 SHA256 9446bfc330242c7f381c361d3848c354c8d9bd90cf1f57e03910cd82297f0834 SHA512 7e85593b89eb636fe3cd520909cd25f283d004b69baffc840be096572c7a241a6f4283b414c93884376703e4ec78b7141c283c858afa540bf51bba0f1575637c WHIRLPOOL b267228927d2f11a967f0385c821fa098a10d46c0cf57878f617cb733263acf1ee4ae47455ac951dda57b836f3d2bdfaf1772fa5dc3411f89b3566dbcf278735
-MISC ChangeLog 33281 SHA256 0e25c9770ab64903a21d2bc9a67b47260a1916e26086601c9852b085de1890fb SHA512 b2acc72581110e9563d08dd408a7fb37ae23254b367256c9a05118c11d5a839085be67d8b2cf7b64059c934b39b7627d21484c33874c42c2227ce12cab4ef5b3 WHIRLPOOL 835adc7ca263f5a2e44dd333a1845f6a3e10e5fa0edc138f9cb6ebb194f009fd12694289bdb0b0f8d67a66fea1d8a7b9b855784303010dc97c7ebc1701170db6
-MISC metadata.xml 735 SHA256 ac74dd1039502a798c295934e7f94b42ea4576dec58b157a28f1406ced7cb00f SHA512 bb083c9077d9a4304e1d851c1c3e0eae827673ce81314f58542b3bb515691bab2ea5aedd35f93726d4f9225e4b51be10e73b67dc9d027985bcd7caeceb0e938f WHIRLPOOL 4cb58f7b294625a5f768124261f30a3e76094778b74b45e3cbbe3908309332ffbcd9382c5e5a0a160187d6e77ebe56162f275dae16e31285dfd99fb4cfbc0ce5
+EBUILD dnsmasq-2.69.ebuild 3685 SHA256 00b0f99cbd73b4730ab56d087a0b06b26508dd02534cdfbe087b3d9db4ea49fc SHA512 32b9d87fc83a277bfea7b4fdb48101c56edd6cb7216ab750f3d5d9b12fd7cd6fb44ee00fff8d855d201d73a69465bc206fa60f57b22e07d7dce48cc76d8f3909 WHIRLPOOL 6bc030ef28ba0ec96734c0cd359eedd16a4d709dfa0fa22e92a4eeb38eabce3e559087386d8073fdb9eba1fa2922318d9dbee8e255b64b5379c96152ab6a435d
+MISC ChangeLog 33506 SHA256 734940a1a7780ee2e77b0f8f04aa45d00909c28387d5e335d0d36385cfc84720 SHA512 4011eda700f81ad7568cce6887ed7fce5b161a794f56c3136404bdb61249e8ff58f5e78e89649b46276328409077f3dd9ea49bb9c74568b0398b35d9c5497737 WHIRLPOOL c03997a9d98389cdfc88419b240853cc869ba357f746092142132134d4f0c2eb0476ff9bf558e96dbe4f1ed147a6bea525d84586342d3528a74f26bdfe38a4cc
+MISC metadata.xml 807 SHA256 6fb95e16dba00e7466dd6f5fb4820c799a2f54fbc05e5b4a0791b0ac11520359 SHA512 593d4c571ec9e3927988aeb5072af21b7c5f4fc6b55a1a7ebbd1d03c14aa0a0cfa026eb5ba6547370105792485b74f8d9c8350e4b606dbe1bcf4a89aa6d73359 WHIRLPOOL e7690f451f0c10784b6d6b0902c97aac877c0d76ffe66954daa79294c1e74665e9b5d28749a594a6a1dd7c7f755a88fd942fed4619c2bf2b31e75ef5b762dd6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSp3GZAAoJEHy/RO9cNQiDyGcP/0Kuwad4Q1Vrzdcd+G6gCDKp
-S9P/vG3PbK1UHINlMScexa2rdFCeJL9N8iFqwRVntUfSdZQZnE6NIW3r4LRQBT5l
-4crKSmFrX9iuC7+wJ7ByQNcjYj4TKnJ/DVujV/qoQGv5POXoJLAMNjjpbHjxUTOh
-CBVUsgFLCpNOtvdt9SQ1wq5ey0C0JyaaLKiKNjvIyV3mY2kXFa+mdemowPcS9pya
-B3WmzDmzyBJpun97UClZ1yZh/+FF65XL/FMhOLmxVw4ZmZcu7KWW670nwuai7YcT
-EIWCqd5ekMMmycQ+JV/XC0s4Plc6c5f2G/Odh9+t1JXhy4sG4IagfKQpKwuLSSnK
-2fQXKmWq7VkSCQANQGw1ouj5TDD6eMT2bE1tcgBGH+84Z5GP0Si+yHw3AE2I0k23
-GUhUnl+IIJUQFdXvgG91gL+fzcPVs+l/OT2RIl7lKS1Ok4bZPm4oIn9iblmaEHZb
-C98hLMXprGvvpi+/H0vTxStfDke3apDT9WMNu7BA/blkjeBgfIL7YR8fe0PxBRse
-z0CzJFB08UkjGKy+UrGHkbbKI3QJdL9oV62OyLkKKc0N1NMXBEO+AN8FwkSfSN1R
-kejKVfiy5Q+dlHiFDOP8mR8bct4XSF3JDYn4tOhhO3x8FXqZT+4f5JKjaU4lo63H
-QoTFW59m9u+RyY2XRu5R
-=gkKv
+iQIcBAEBCAAGBQJTRt1tAAoJEHy/RO9cNQiDYP8QAMO4TiRrme4zmVcyGffW6jxR
+YTNBNpYFLaScPVoHVZFx01YjmZnTRbWOV2qoCAtWa1VpHso6kL/2PJzG5fEZ7SjZ
+ne2rUVOPVC/F1OuPF0M5X4Udkjlxo9go4YOBjk7M1PEdiUa3r534+xe7kNfqoW57
+JnX0+PzJ5cOUZcoPa82zxowVWpEaC3rxKh4sf8PjuG0Hc5QMHhkeYGxJuiPX8y/Y
+CGl7CLYYPZBrrfFmbBZiND/74x6QUDV44MBiHFCWCEE+5Ss/AbJBcBJC1Xnhpg7j
+1I29enGIJHY2e5owD9r3dV7orA3gCCQanfnQ2iZnpp+fcRC24M0ew9T+Bz+H+DNN
+zYmg+vasARdOVF+FeGhYYwFqRhnU5lHCrZzXwzStasyZi67jwzGH2ugGM/u+4RKu
+gb7dyHEbnpT2OK5ZRBPGpeF+Zb8QqcLVJ/2j37PLEBwwSvihOmWBsA2ASRO29I/V
+qWiOBuhEi2Igsz7u9Sxq2x7wyS4HL9ylZVRtS1xGpvVVNQgFyeAyLZjJJdiu+tnE
+1azHusCpoc/ytNxDsmANPw5cmGcd+dIL1vo6ZHA0KhpxseTRNsEk27RGqLya8o9F
+8ZN75+N9Vx+cM3YAbseBmCrAK9g4TZ1GdYjjYIbMgHIrxarXW+E9eb3bzGrCFd2B
+egPn6CPYZ6MaXtoufsvG
+=MRHP
 -----END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.69.ebuild b/net-dns/dnsmasq/dnsmasq-2.69.ebuild
new file mode 100644
index 000000000000..762b68308e12
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.69.ebuild
@@ -0,0 +1,159 @@
+# 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.69.ebuild,v 1.1 2014/04/10 18:05:22 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 ~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
+		)
+		selinux? ( sec-policy/selinux-dnsmasq )"
+
+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]
+			)
+		)"
+
+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/metadata.xml b/net-dns/dnsmasq/metadata.xml
index 74dc8ba08f96..90d3572ff6b9 100644
--- a/net-dns/dnsmasq/metadata.xml
+++ b/net-dns/dnsmasq/metadata.xml
@@ -8,10 +8,11 @@
 <use>
 	<flag name='auth-dns'>Add support for acting as an authorative DNS server.</flag>
 	<flag name='conntrack'>Add support for Linux conntrack connection marking.</flag>
-	<flag name='dhcp'>Enable support for reading ISC DHCPd lease files</flag>
-	<flag name='script'>Enable support for calling scripts when leases change</flag>
-	<flag name='tftp'>Enables built in TFTP server for netbooting</flag>
-	<flag name='dhcp-tools'>Install extra command line tools for manually managing DHCP leases</flag>
+	<flag name='dhcp-tools'>Install extra command line tools for manually managing DHCP leases.</flag>
+	<flag name='dhcp'>Enable support for acting as a DHCP server.</flag>
+	<flag name='dnssec'>Enable support DNSSEC validation and caching.</flag>
+	<flag name='script'>Enable support for calling scripts when leases change.</flag>
+	<flag name='tftp'>Enables built in TFTP server for netbooting.</flag>
 </use>
 </pkgmetadata>