[gentoo-commits] dev/graaff:master commit in: net-dns/pdns/, net-dns/pdns/files/

[Hans de Graaff]

commit:     cd3040e86d3dead522f13ac342ddedaac6cd9f51
Author:     Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Sun Oct 23 13:08:50 2011 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 13:08:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/graaff.git;a=commit;h=cd3040e8

Official 3.0 version is now in the tree.

---
 net-dns/pdns/ChangeLog                             |   12 --
 net-dns/pdns/Manifest                              |   17 ---
 .../pdns/files/2.9.18-default-mysql-options.patch  |   13 ---
 net-dns/pdns/files/pdns                            |   60 -----------
 net-dns/pdns/files/pdns-2.9.22-gcc44.patch         |   22 ----
 net-dns/pdns/metadata.xml                          |    5 -
 net-dns/pdns/pdns-3.0_rc2.ebuild                   |  109 --------------------
 7 files changed, 0 insertions(+), 238 deletions(-)

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
deleted file mode 100644
index 7cdbde4..0000000
--- a/net-dns/pdns/ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
-# ChangeLog for net-dns/pdns
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*pdns-3.0_rc2 (30 May 2011)
-
-  30 May 2011; Hans de Graaff <graaff@g.o>
-  +files/2.9.18-default-mysql-options.patch, +files/pdns-2.9.22-gcc44.patch,
-  +pdns-3.0_rc2.ebuild, +files/pdns, +metadata.xml:
-  Add RC version of pdns to test whether my bug with updating slaves from
-  multiple masters is fixed.
-

diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
deleted file mode 100644
index 8cc82dc..0000000
--- a/net-dns/pdns/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX 2.9.18-default-mysql-options.patch 606 RMD160 bfc5e2aeee2bc3e01a62a430b087e7ca5742a85b SHA1 d265706bb723f1a878a65c7c0db59a88e67f0816 SHA256 228a6c42a11a2eab82b68f8c04d5881f8be39746010675feba7ebf16add18151
-AUX pdns 1253 RMD160 304517b71ab729cf2419c043512bf58e4e5c459e SHA1 d020d7330af9313c40b812709aa2a7892c303ec0 SHA256 51b279ad0221c0b5d8c09c8cb91f46e4c99e372a4f1fb97378e6761647a59cc6
-AUX pdns-2.9.22-gcc44.patch 856 RMD160 3e477b236af42767aea3d55af4cb9f14cbca106d SHA1 0a206fee906f36eac630ad200a8d3866cd477a55 SHA256 1beba6a251e0c7a4a4d11dce41d2c5e9b809c3d32856aabce22225ebb02d3992
-DIST pdns-3.0-rc2.tar.gz 1181196 RMD160 be3edf9df708633a8d362e6798c93a1c0d849e16 SHA1 db2188546b704b36828f412a496c8f08ddb01741 SHA256 cf0d210a5423094953f3896a9731b98139724856fc3901fe9051d72c1d5a28be
-EBUILD pdns-3.0_rc2.ebuild 2813 RMD160 802ad6ec34fa9c948cb95e6c8e38f935c4f79cf2 SHA1 0b239f26742fd304b684a56d3cb96fd3589473a9 SHA256 3c70c1cb0e70637403ab71e3a5df41721f6b534feb5365b7c63ff08706cd6c61
-MISC ChangeLog 425 RMD160 be2a5124134aad828c5dbb9ecfed020dc63a7409 SHA1 dd5af6f391cbec2d8f9a9b93be1c8866c3f7fca9 SHA256 28383d3bb6c2981ff520b99b0fd599f17bf82894155bb366707a591f708177b3
-MISC metadata.xml 201 RMD160 bbf7920d9809941fb024d20016dbe2fb9f15ff97 SHA1 e629d21795e99a77bd0a6aded1a153fd12d5b2c5 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk3jeTEACgkQrnu0mw69JkrH+AD/aBPJG0gADlUyLC9s/4eJtUTO
-9eEfeOAdNW3V99fj240A/0DJaP4A8f7BccBpEMXmlVLYCZU55NxzVrXNJ1Js0vuF
-=5X7M
------END PGP SIGNATURE-----

diff --git a/net-dns/pdns/files/2.9.18-default-mysql-options.patch b/net-dns/pdns/files/2.9.18-default-mysql-options.patch
deleted file mode 100644
index a9048e1..0000000
--- a/net-dns/pdns/files/2.9.18-default-mysql-options.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur pdns-2.9.18.orig/modules/gmysqlbackend/smysql.cc pdns-2.9.18/modules/gmysqlbackend/smysql.cc
---- pdns-2.9.18.orig/modules/gmysqlbackend/smysql.cc	2005-04-23 23:40:15.000000000 +0200
-+++ pdns-2.9.18/modules/gmysqlbackend/smysql.cc	2005-07-17 10:38:35.363597586 +0200
-@@ -15,6 +15,9 @@
- 	       const string &password)
- {
-   mysql_init(&d_db);
-+#if MYSQL_VERSION_ID > 32349
-+  mysql_options(&d_db, MYSQL_READ_DEFAULT_GROUP, "client");
-+#endif
-   if (!mysql_real_connect(&d_db, host.empty() ? 0 : host.c_str(), 
- 			  user.empty() ? 0 : user.c_str(), 
- 			  password.empty() ? 0 : password.c_str(),

diff --git a/net-dns/pdns/files/pdns b/net-dns/pdns/files/pdns
deleted file mode 100644
index cdbbdf3..0000000
--- a/net-dns/pdns/files/pdns
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 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.10 2007/05/07 20:19:18 swegener Exp $
-
-opts="reload monitor dump"
-
-PDNS_INSTANCE="${SVCNAME#pdns[.-]}"
-PDNS_CONFIG=""
-
-if [ -n "${PDNS_INSTANCE}" ] && [ "${PDNS_INSTANCE}" != "pdns" ]
-then
-	PDNS_CONFIG="--config-name=${PDNS_INSTANCE}"
-else
-	PDNS_INSTANCE="default"
-fi
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting PowerDNS (${PDNS_INSTANCE})"
-	/usr/sbin/pdns_server \
-		${PDNS_CONFIG} \
-		--daemon=yes \
-		--guardian=yes
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping PowerDNS (${PDNS_INSTANCE})"
-	/usr/bin/pdns_control ${PDNS_CONFIG} quit &>/dev/null
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading PowerDNS (${PDNS_INSTANCE})"
-	/usr/bin/pdns_control ${PDNS_CONFIG} cycle &>/dev/null
-	eend $?
-}
-
-dump() {
-	ebegin "Dumping PowerDNS (${PDNS_INSTANCE}) variables"
-	/usr/bin/pdns_control ${PDNS_CONFIG} list
-	eend $?
-}
-
-monitor() {
-	ebegin "Starting PowerDNS (${PDNS_INSTANCE}) in monitor mode"
-	/usr/sbin/pdns_server \
-		${PDNS_CONFIG} \
-		--daemon=no \
-		--guardian=no \
-		--control-console=yes \
-		--loglevel=9 \
-		--log-dns-details=yes \
-		--query-logging=yes
-	eend $?
-}

diff --git a/net-dns/pdns/files/pdns-2.9.22-gcc44.patch b/net-dns/pdns/files/pdns-2.9.22-gcc44.patch
deleted file mode 100644
index 35c1c77..0000000
--- a/net-dns/pdns/files/pdns-2.9.22-gcc44.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur pdns-2.9.22.orig/pdns/dnsparser.cc pdns-2.9.22/pdns/dnsparser.cc
---- pdns-2.9.22.orig/pdns/dnsparser.cc	2008-11-15 22:32:46.000000000 +0200
-+++ pdns-2.9.22/pdns/dnsparser.cc	2009-07-06 22:09:02.000000000 +0300
-@@ -16,6 +16,7 @@
-     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
- 
-+#include <stdio.h>
- #include "dnsparser.hh"
- #include "dnswriter.hh"
- #include <boost/lexical_cast.hpp>
-diff -ur pdns-2.9.22.orig/pdns/rcpgenerator.cc pdns-2.9.22/pdns/rcpgenerator.cc
---- pdns-2.9.22.orig/pdns/rcpgenerator.cc	2008-11-15 23:20:27.000000000 +0200
-+++ pdns-2.9.22/pdns/rcpgenerator.cc	2009-07-06 22:07:26.000000000 +0300
-@@ -16,6 +16,7 @@
-     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
- 
-+#include <stdio.h>
- #include "rcpgenerator.hh"
- #include "dnsparser.hh"
- #include "misc.hh"

diff --git a/net-dns/pdns/metadata.xml b/net-dns/pdns/metadata.xml
deleted file mode 100644
index f977299..0000000
--- a/net-dns/pdns/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer><email>graaff@g.o</email></maintainer>
-</pkgmetadata>

diff --git a/net-dns/pdns/pdns-3.0_rc2.ebuild b/net-dns/pdns/pdns-3.0_rc2.ebuild
deleted file mode 100644
index 348ab4e..0000000
--- a/net-dns/pdns/pdns-3.0_rc2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.22-r1.ebuild,v 1.4 2010/11/08 22:43:29 swegener Exp $
-
-EAPI=2
-inherit eutils multilib
-
-DESCRIPTION="The PowerDNS Daemon"
-SRC_URI="http://downloads.powerdns.com/releases/pdns-3.0-rc2.tar.gz"
-HOMEPAGE="http://www.powerdns.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc ldap mysql postgres sqlite sqlite3 static opendbx"
-
-RDEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 )
-	sqlite? ( =dev-db/sqlite-2.8* )
-	sqlite3? ( =dev-db/sqlite-3* )
-	opendbx? ( dev-db/opendbx )
-	>=dev-libs/boost-1.34
-	>=dev-lang/lua-5.1"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/pdns-3.0-rc2"
-
-src_prepare() {
-#	epatch "${FILESDIR}"/2.9.18-default-mysql-options.patch \
-#		"${FILESDIR}"/${P}-gcc44.patch
-echo
-}
-
-src_configure() {
-	local modules="pipe geo" myconf=""
-
-	use mysql && modules="${modules} gmysql"
-	use postgres && modules="${modules} gpgsql"
-	use sqlite && modules="${modules} gsqlite"
-	use sqlite3 && modules="${modules} gsqlite3"
-	use opendbx && modules="${modules} opendbx"
-	use ldap && modules="${modules} ldap"
-	use debug && myconf="${myconf} --enable-verbose-logging"
-
-	econf \
-		--sysconfdir=/etc/powerdns \
-		--libdir=/usr/$(get_libdir)/powerdns \
-		--disable-recursor \
-		--with-modules= \
-		--with-dynmodules="${modules}" \
-		--with-pgsql-includes=/usr/include \
-		--with-pgsql-lib=/usr/$(get_libdir) \
-		--with-mysql-lib=/usr/$(get_libdir) \
-		--with-sqlite-lib=/usr/$(get_libdir) \
-		--with-sqlite3-lib=/usr/$(get_libdir) \
-		$(use_enable static static-binaries) \
-		${myconf} \
-		|| die "econf failed"
-}
-
-src_compile() {
-	default
-
-	if use doc
-	then
-		emake -C codedocs codedocs || die "emake codedocs failed"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	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
-
-	keepdir /var/empty
-
-	dodoc ChangeLog README TODO
-	use doc && dohtml -r codedocs/html/.
-
-	# Install development headers
-	insinto /usr/include/pdns
-	doins pdns/*.hh
-	insinto /usr/include/pdns/backends/gsql
-	doins pdns/backends/gsql/*.hh
-}
-
-pkg_preinst() {
-	enewgroup pdns
-	enewuser pdns -1 -1 /var/empty pdns
-}
-
-pkg_postinst() {
-	elog
-	elog "PowerDNS provides multiple instances support. You can create more instances"
-	elog "by symlinking the pdns init script to another name."
-	elog
-	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
-	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
-	elog
-}