add monitor and dump opts to init script, make config files go into /etc/powerdns, add pdns user+group

(Portage version: 2.1_pre3-r1)

5 files changed, 134 insertions, 6 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index 010ae2512bf5..dbcbc419d246 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/pdns
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.23 2005/10/30 14:21:49 swegener Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.24 2006/01/20 19:03:54 wschlich Exp $
+
+*pdns-2.9.19-r1 (20 Jan 2006)
+
+  20 Jan 2006; Wolfram Schlich <wschlich@gentoo.org> files/pdns,
+  +pdns-2.9.19-r1.ebuild:
+  add monitor and dump opts to init script, make config files go into
+  /etc/powerdns, add pdns user+group
 
   30 Oct 2005; Sven Wegener <swegener@gentoo.org>
   +files/2.9.19-ldap-fix.patch, pdns-2.9.19.ebuild:
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index ae0e27aa9c4b..31a4faf308c1 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,12 +1,14 @@
-MD5 c3488c80e2b93234529db0b39732ebfd ChangeLog 3589
+MD5 213a662f079fe29164343cc918226cea ChangeLog 3819
 MD5 90fb32e843326d14359c508cef855929 files/2.9.18-default-mysql-options.patch 606
 MD5 48d0e8119d1617f7ab3594f836cd98fb files/2.9.18-ldap-fix.patch 853
 MD5 ad994e3dbae5cffa058fb8153b130751 files/2.9.19-ldap-fix.patch 285
 MD5 e59bb419d93a7d7bdcb13764c57b3f6d files/digest-pdns-2.9.18 63
 MD5 15eea3e4726a75c942fb7c48ee25b30c files/digest-pdns-2.9.19 63
-MD5 60d7355f48410a77e8df555a089025cb files/pdns 889
+MD5 15eea3e4726a75c942fb7c48ee25b30c files/digest-pdns-2.9.19-r1 63
+MD5 b534c9bfb2ffccbe87dcd51fb035549a files/pdns 1240
 MD5 558969af8e34a040723147fe14a53a44 files/precursor 488
 MD5 bbb2b0b25869b840d8fa2d242a8b20c2 files/recursor.conf 392
 MD5 56567ddcaf248499457a1ce74277c910 metadata.xml 573
 MD5 7e3f6249fc15cbedf45e33ba7167427c pdns-2.9.18.ebuild 2383
+MD5 c6c02f840b0bc7f44859245b1c91c773 pdns-2.9.19-r1.ebuild 2867
 MD5 135361381d689dec1b19c4efa7092611 pdns-2.9.19.ebuild 2373
diff --git a/net-dns/pdns/files/digest-pdns-2.9.19-r1 b/net-dns/pdns/files/digest-pdns-2.9.19-r1
new file mode 100644
index 000000000000..06abdfafed44
--- /dev/null
+++ b/net-dns/pdns/files/digest-pdns-2.9.19-r1
@@ -0,0 +1 @@
+MD5 30c96878b56845329cca5b8a351277b4 pdns-2.9.19.tar.gz 855801
diff --git a/net-dns/pdns/files/pdns b/net-dns/pdns/files/pdns
index 2dd2ecb4ef7c..82ec1ff15e4b 100644
--- a/net-dns/pdns/files/pdns
+++ b/net-dns/pdns/files/pdns
@@ -1,9 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/files/pdns,v 1.5 2005/07/17 05:25:53 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/files/pdns,v 1.6 2006/01/20 19:03:54 wschlich Exp $
 
-opts="${opts} reload"
+opts="${opts} reload monitor dump"
 
 # Default instance
 PDNS_INSTANCE="default"
@@ -37,3 +37,15 @@ reload() {
 	/usr/bin/pdns_control ${PDNS_CONFIG} cycle &>/dev/null
 	eend $?
 }
+
+monitor() {
+       ebegin "Starting PowerDNS (${PDNS_INSTANCE}) in monitor mode"
+       /usr/sbin/pdns_server ${PDNS_CONFIG} --daemon=no --guardian=no --control-console --loglevel=9
+       eend $?
+}
+
+dump() {
+       ebegin "Dumping PowerDNS (${PDNS_INSTANCE}) variables"
+       /usr/bin/pdns_control ${PDNS_CONFIG} list
+       eend $?
+}
diff --git a/net-dns/pdns/pdns-2.9.19-r1.ebuild b/net-dns/pdns/pdns-2.9.19-r1.ebuild
new file mode 100644
index 000000000000..82b9b023c567
--- /dev/null
+++ b/net-dns/pdns/pdns-2.9.19-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.19-r1.ebuild,v 1.1 2006/01/20 19:03:54 wschlich Exp $
+
+inherit eutils
+
+DESCRIPTION="The PowerDNS Daemon"
+SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.gz"
+HOMEPAGE="http://www.powerdns.com/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc ldap mysql postgres recursor sqlite static tdb"
+
+DEPEND="mysql? ( >=dev-db/mysql-3.23.54a )
+	postgres? ( >=dev-cpp/libpqpp-4.0-r1 )
+	ldap? ( >=net-nds/openldap-2.0.27-r4 )
+	sqlite? ( =dev-db/sqlite-2.8* )
+	tdb? ( dev-libs/tdb )
+	>=dev-libs/boost-1.31"
+
+RDEPEND="${DEPEND}"
+
+DEPEND="${DEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/2.9.18-default-mysql-options.patch
+	epatch "${FILESDIR}"/2.9.19-ldap-fix.patch
+}
+
+src_compile() {
+	local modules="pipe geo" myconf=""
+
+	useq mysql && modules="${modules} gmysql"
+	useq postgres && modules="${modules} gpgsql"
+	useq sqlite && modules="${modules} gsqlite"
+	useq ldap && modules="${modules} ldap"
+	useq tdb && modules="${modules} xdb"
+	useq debug && myconf="${myconf} --enable-verbose-logging"
+
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-modules= \
+		--with-dynmodules="${modules}" \
+		--with-pgsql-includes=/usr/include \
+		$(use_enable static static-binaries) \
+		$(use_enable recursor) \
+		${myconf} \
+		|| die "econf failed"
+	emake -j1 || die "emake failed"
+
+	if use doc
+	then
+		emake -C codedocs codedocs || die "emake codedocs failed"
+	fi
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die
+
+	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+	# set defaults: setuid=pdns, setgid=pdns
+	sed -i -e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
+		"${D}"/etc/powerdns/pdns.conf
+
+	doinitd "${FILESDIR}"/pdns
+
+	if use recursor
+	then
+		doinitd "${FILESDIR}"/precursor
+		insinto /etc/powerdns
+		doins "${FILESDIR}"/recursor.conf
+	fi
+
+	dodoc ChangeLog README TODO
+	use doc && dohtml -r codedocs/html/.
+}
+
+pkg_preinst() {
+	einfo "checking for pdns group... creating if missing."
+	enewgroup pdns
+	einfo "checking for pdns user... creating if missing."
+	enewuser pdns -1 -1 /var/empty pdns -c "Added by PowerDNS ebuild"
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "ATTENTION: the config files have moved from /etc to /etc/powerdns!"
+	ewarn
+	einfo
+	einfo "pdns now provides multiple instances support. You can create more instances"
+	einfo "by symlinking the pdns init script to another name."
+	einfo
+	einfo "The name must be in the format pdns-<suffix> and PowerDNS will use the"
+	einfo "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
+	einfo
+	einfo "Also all backends, except the bind and random backends, are now compiled as"
+	einfo "loadable modules and must be loaded with load-modules= in the configuration"
+	einfo "file."
+	einfo
+}