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).

(Portage version: 2.1.10.32/cvs/Linux x86_64)

4 files changed, 130 insertions, 1 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/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>