Version bump (bug #383257). Change opts to extra_commands in new init script (bug #386763). Change license to GPL-2 or GPL-3 (bug #383259).

Package-Manager: portage-2.1.10.32/cvs/Linux x86_64

5 files changed, 148 insertions, 8 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 8f6d2f0b0c54..d99051ed80c6 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.209 2011/05/22 23:57:47 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.210 2011/11/09 01:32:08 chutzpah Exp $
+
+*dnsmasq-2.59 (09 Nov 2011)
+
+  09 Nov 2011; Patrick McLean <chutzpah@gentoo.org> +dnsmasq-2.59.ebuild,
+  +files/dnsmasq-init-r1, metadata.xml:
+  Version bump (bug #383257). Change opts to extra_commands in new init script
+  (bug #386763). Change license to GPL-2 or GPL-3 (bug #383259).
 
   22 May 2011; Joseph Jezak <josejx@gentoo.org> dnsmasq-2.57.ebuild:
   Marked ppc/ppc64 stable for bug #361149.
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 9bcf7b15f20b..269bccf495b5 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX dnsmasq-2.47-fbsd-config.patch 505 RMD160 a19a17e94d924a21f79d50420faa4c2ed3ec40d0 SHA1 723580b460c93e2f7829627dee15bb758730b848 SHA256 4e05e46b59254e718550cda505986b9b572a0716636fb6a5405a54df25cfa84a
 AUX dnsmasq-fbsd-config.patch 451 RMD160 c9103d329ff429cdadea346db59678815fe3317d SHA1 28f48fc050c3cc964e717a1c09edb47b4438597a SHA256 8973971c4a161f48815c41045cb350394f330276085e9b8f3c578077abc0f359
 AUX dnsmasq-init 935 RMD160 8f6278946311abdc4c7ae8034ca8571cb24bb53b SHA1 7c34f475dc3c6afdc14fffdaf24f866e056c334f SHA256 30da83047c1a30e008e38bc398b3ac2a50d78f23d559b5c8ff7a22145786e05b
+AUX dnsmasq-init-r1 947 RMD160 cb5dadf70576d3fe743f8ae06b4dce0aed85d67f SHA1 8172d5a12798e94b8bdd690b1fea31d0999d31a3 SHA256 4aa16c4a268738f6f17b71d064a33767b66308a79088a2134c17d62210bc8bd5
 AUX dnsmasq.confd 140 RMD160 33f6370377b38bf33acab72d8de86cba5e197d79 SHA1 83461d2964dc3f0db777fc26141b07f6f3f5a762 SHA256 8bbc2634ab537ed3a17ee98be9c2667013a2b048f6981138017414e54fe90746
 AUX dnsmasq.confd-r1 170 RMD160 1863748117f626416a44b653110fb82dadb52352 SHA1 9b63416e44dea85586803862cd9f4759cc05d5a4 SHA256 51c0672a70d5d6793d295d82db666d372fb081e8627318f67c88e48d08d254b5
 AUX resolvconf.dnsmasq 4078 RMD160 8a290b908cf975e0cbb2b845c5c492d8a3f6e2aa SHA1 70f4ca6e6cbd91b700e7e82696d5508f3c1686dd SHA256 c3cf0b2249267aaf921f335ec10cf140db570b2aa4009be789a215c47323a1d5
@@ -11,19 +12,29 @@ DIST dnsmasq-2.52.tar.lzma 304860 RMD160 38e05bfd746d618c0ac51ae245540b008474bde
 DIST dnsmasq-2.55.tar.lzma 320116 RMD160 2e6f623da3f453a2c6086dc80315a9308a4245ef SHA1 0bd62b3846bad2ed5e243b1b8aae59c2e0e20da5 SHA256 ae36d8031640b3202d196170025ee13e6d9240cb6d523a2a3e4f7ab1289e1473
 DIST dnsmasq-2.56.tar.lzma 331543 RMD160 448787766684dc354582423e234825c808df557f SHA1 f6e6f488798c5b0d84698abf4801f922ff78e36c SHA256 36341d2534801cae3463489b79d912f9db8b5dbf5527efd69821a7984def2c33
 DIST dnsmasq-2.57.tar.lzma 333348 RMD160 e78d2f87804e88b2021da3c593191338d0deaed4 SHA1 cbf0c22a7b856746b23f2d894070c60d32c4a97e SHA256 b35c5a31afce2b7c4bd62566d5dc87e1ce62d0d2ebd9c2baf15b5ea16bcc279d
+DIST dnsmasq-2.59.tar.lzma 340720 RMD160 ca7b841d97e0ef7ab5a8c2c099ecb79de28633b3 SHA1 41de5a8187210d7473a084c27526d47853c2017f SHA256 3bba1f637d04145e756ffc31a5076961a0aaf4716d097fa0d4a9a24dc8869391
 EBUILD dnsmasq-2.52.ebuild 1697 RMD160 059361530d2c65008fc39757a96c0f70ee9ab18d SHA1 a09dd2685ddc664e3f2b8065be82afcd61082250 SHA256 4dcd5cafff159a8377381a28b438b7604fed1e959d4d120d8f0175665e7e55ae
 EBUILD dnsmasq-2.55.ebuild 1728 RMD160 87ab8a4440f21c7ae141f25fa06e9606e1971b4d SHA1 e5b69d5a3dbce4ef3f117d0107e6bdb8291472d3 SHA256 c9cc19c5ab05fe73e028a34c6d5456f7032d04b77c86f497a70a07002fcadfd3
 EBUILD dnsmasq-2.56.ebuild 1728 RMD160 31d2a20a181e719ec84c176c53577e125a293ffa SHA1 83df230db44bdfe939d0f7046eb7000876d0965a SHA256 de365c3cbd2b0deea2cd5ddac0570f91c12da8e5a69f1905133a3bbe358b9bbc
 EBUILD dnsmasq-2.57-r1.ebuild 1816 RMD160 92a368fb9fca8514c9761194a5ab8f207214d341 SHA1 7685150873559ea1d350076c48e6a9cebf8bc553 SHA256 f538f5002da97f597ac93d6ed659bbc1d42fb60a26d0ab534f2f3ee2b2ad0bfc
 EBUILD dnsmasq-2.57.ebuild 1731 RMD160 7f92ffb61551dac3d0d9d13228b46bf83d851717 SHA1 5c15ac0caff3c15e6040e96655952bed901360a9 SHA256 e4b6300897aaf76588f936488e2be83321d34fc0d62bc9d95fc909a220d4ae0b
-MISC ChangeLog 27051 RMD160 b7972308eb3b2118f51aa6bbec2d185cd9b703e2 SHA1 e425dec6ea332c203fc65088ab53eb1040caf69c SHA256 4424ab62950b2d13e8bd029cf7aa324d8f20c64bdb5ba42a1885f0ed981357dc
-MISC metadata.xml 388 RMD160 5170486dfa879467857beb0a2bd5dd718faf0371 SHA1 13f476b1fd729b83d9fd4a9bc3fa4780cd7e88e1 SHA256 0d9e84d8d92e5961ff822fe97a5ecbf891cacb54f207aae3693e4eaf5961ced9
+EBUILD dnsmasq-2.59.ebuild 1930 RMD160 f031ae3426b6e3ea73f135eeeb848b72a7095078 SHA1 87fe8cb2236b70def59dc24276ebcd39865e1c21 SHA256 c2969f963383b8e3b8e2190084050d36ab6db411f37be002b9e10a990c234851
+MISC ChangeLog 27341 RMD160 6e7653fac812497e75728e0a64e2bea5a2a53875 SHA1 3eecaf0e4a02770977cd061e4807835decab97f9 SHA256 6a6b269dc52403b61470b83f8562cf194d1980ea6b5fdc16c17dd27e31ea7b95
+MISC metadata.xml 471 RMD160 953fece7a2f3907d83cfe4088b75df3f071f3b30 SHA1 f1da6a50832ac27686d9c52e6134d14d0d10c3cf SHA256 49aaabcc1581f5e5955e0b7a8fc60c0917fa0bb966d604fe2fdc4a3b6c16c6de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59qNsACgkQfXuS5UK5QB1TyQQAoRIPFIOdTxalnodelsHziY2u
-/VMIfVGt7HkEPVl9j8eGKUu9BWNu66x5aSH/493pEDRRDtNibM7EwX1GYb+966dz
-G/xBdi1Hd922wESpIrs2N62EFmrCIheRi+LHPqmAPJkmSkUaU/9dUb86FYOWErGu
-rqwYsLcdYMH+IUxAx4I=
-=dqSA
+iQIcBAEBCAAGBQJOudglAAoJEHy/RO9cNQiDPkAP/3zW9YuKOVyMqgFBHWH/pbNO
+w4cJ9ElDbu6ZHMcbSBKMwEMhStGA728QgD9rqC9+a+/v6Fyc2o6w4JwWWdNirDNk
+sskI4DHLsRI0eDXcjQXw0S8aErxe+Hqmq0I+y9XoPmMXdyZeUyM+OFEGm9PGsR4C
+z9OE5lNvtVlk9ZVGT0T48ZEOgvRPtEGduLp/7WnLcThvkILTl/S9sSBSueVo753L
+xRfYHNf9xssjk2bU6uxE7LNTBHkYwUn4US4qGGA76onIfbXhqJ2TMAe0jH40S55X
+wQbQ3w7jBXObk7z2QQhU89vkJSjwXDbADjP4rJJDCCLYfOZTj3VXq8KPoadG9sr8
+hcv14i3sBGIKXjBISv5Aiav9C/zr7xbQDCgErN1JHEeAepgahXT6VHm7jdPGzXTt
+qeWoegUDlaEoEJ5+GmNQExR72gQDlUUmn+Dq47fUAfmH3GEpnWKInPt1I7+9tO9s
+UWamAoJjcElkNDZpXGQ01t0/Thoofzk8tvpgypp/TnVsWppHHA7mCerDGIzF6+e7
+6Xw/Sn8axPw/p+LXZJtT9hFzp0s9Ol9EpEKbThzcncNQGK19tJl6K+xMJTjDTPm2
+HAVw5RPBcdLOHgEMg//OXcQZjf86PiEp4IijgYcEJAUL9xzVhKurnJsH832wZc1E
+FRVld7lbqIPzprHPB53t
+=wxmH
 -----END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.59.ebuild b/net-dns/dnsmasq/dnsmasq-2.59.ebuild
new file mode 100644
index 000000000000..b445a7a73556
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.59.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.59.ebuild,v 1.1 2011/11/09 01:32:08 chutzpah Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs flag-o-matic
+
+MY_P="${P/_/}"
+MY_PV="${PV/_/}"
+DESCRIPTION="Small forwarding DNS server"
+HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
+SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.lzma"
+
+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="conntrack dbus +dhcp idn ipv6 nls tftp"
+
+RDEPEND="dbus? ( sys-apps/dbus )
+	idn? ( net-dns/libidn )
+	conntrack? ( net-libs/libnetfilter_conntrack )
+	nls? (
+		sys-devel/gettext
+		net-dns/libidn
+	)"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	|| ( app-arch/xz-utils app-arch/lzma-utils )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_setup() {
+	enewgroup dnsmasq
+	enewuser dnsmasq -1 -1 /dev/null dnsmasq
+}
+
+src_prepare() {
+	# dnsmasq on FreeBSD wants the config file in a silly location, this fixes
+	epatch "${FILESDIR}/${PN}-2.47-fbsd-config.patch"
+}
+
+src_configure() {
+	COPTS=""
+	use conntrack && COPTS+=" -DHAVE_CONNTRACK"
+	use tftp || COPTS+=" -DNO_TFTP"
+	use dhcp || COPTS+=" -DNO_DHCP"
+	use ipv6 || COPTS+=" -DNO_IPV6"
+	use dbus && COPTS+=" -DHAVE_DBUS"
+	use idn  && COPTS+=" -DHAVE_IDN"
+}
+
+src_compile() {
+	emake \
+		PREFIX=/usr \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		COPTS="${COPTS}" \
+		all$(use nls && echo "-i18n")
+}
+
+src_install() {
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		DESTDIR="${D}" \
+		install$(use nls && echo "-i18n")
+
+	dodoc CHANGELOG FAQ
+	dohtml *.html
+
+	newinitd "${FILESDIR}"/dnsmasq-init-r1 dnsmasq
+	newconfd "${FILESDIR}"/dnsmasq.confd-r1 dnsmasq
+	insinto /etc
+	newins dnsmasq.conf.example dnsmasq.conf
+
+	if use dbus ; then
+		insinto /etc/dbus-1/system.d
+		doins dbus/dnsmasq.conf
+	fi
+}
diff --git a/net-dns/dnsmasq/files/dnsmasq-init-r1 b/net-dns/dnsmasq/files/dnsmasq-init-r1
new file mode 100644
index 000000000000..bb3f3c0a8366
--- /dev/null
+++ b/net-dns/dnsmasq/files/dnsmasq-init-r1
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/files/dnsmasq-init-r1,v 1.1 2011/11/09 01:32:08 chutzpah Exp $
+
+extra_commands="reload"
+
+depend() {
+	provide dns
+	need localmount net
+	after bootmisc
+	use logger
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec /usr/sbin/dnsmasq \
+	    --pidfile /var/run/dnsmasq.pid \
+	    -- -x /var/run/dnsmasq.pid ${DNSMASQ_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --exec /usr/sbin/dnsmasq \
+	    --pidfile /var/run/dnsmasq.pid
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	if ! service_started "${SVCNAME}" ; then
+	    eend 1 "${SVCNAME} is not started"
+	    return 1
+	fi
+	start-stop-daemon --stop --oknodo --signal HUP \
+	    --exec /usr/sbin/dnsmasq --pidfile /var/run/dnsmasq.pid
+	eend $?
+}
diff --git a/net-dns/dnsmasq/metadata.xml b/net-dns/dnsmasq/metadata.xml
index bbe15b456234..1e40ae7bd4de 100644
--- a/net-dns/dnsmasq/metadata.xml
+++ b/net-dns/dnsmasq/metadata.xml
@@ -8,6 +8,7 @@
 <use>
 	<flag name='dhcp'>Enable support for reading ISC DHCPd lease files</flag>
 	<flag name='tftp'>Enables built in TFTP server for netbooting</flag>
+	<flag name='conntrack'>Add support for Linux conntrack connection marking.</flag>
 </use>
 </pkgmetadata>