Add support for the geoip backend, bug #527022 by James Taylor.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x64D4CF24

3 files changed, 187 insertions, 5 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index 4029919915e1..0152db30a250 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/pdns
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.99 2014/11/03 13:33:17 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.100 2014/12/09 19:30:05 swegener Exp $
+
+*pdns-3.4.0-r1 (09 Dec 2014)
+
+  09 Dec 2014; Sven Wegener <swegener@gentoo.org> +pdns-3.4.0-r1.ebuild:
+  Add support for the geoip backend, bug #527022 by James Taylor.
 
   03 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org> pdns-3.3.1.ebuild,
   pdns-3.4.0.ebuild:
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index cddcffb440ff..4f5f342686d0 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -7,13 +7,14 @@ AUX pdns-3.3.1-fix-curl-link.patch 642 SHA256 23f332af6ecb9d25ea0733696f1280fceb
 DIST pdns-3.3.1.tar.gz 1403435 SHA256 feb566994725e049391e9b862c9437ca545f1bb970143d2387e474a6ff645bf3 SHA512 b56fa8afce0eb2f881c269f4deedf61b4313dea80563c11f75af5c4bcc35d4e59d52629351abace534e7b810759baf0aaa30ee42fcf030aa5b9684e18dc43bb4 WHIRLPOOL dd688c3da04231571217516aabdd0dc71609e216e66b40c38c68b5f0209cf57ec4075f15e211c1b941fa5ed651d58a6443fc10906bc73710ba9ea66e69369dc7
 DIST pdns-3.4.0.tar.bz2 1234318 SHA256 0780f7a7fe768f9debc9decadb5d3a555b716eed14296e7c41f355bf8db4825e SHA512 2bc20d290366708cb6580d9bd4a6cbbb27534168e83f380118ba005ec2f2c7777a96cc86e24ef4efc974043d3eeeb56d830479a6d900a00c047ee378130bf7a5 WHIRLPOOL 8b6242b44a384604ee3581e1786f739d2b7be2ddd19f542557a5f90818455ab96782c35b6afca6afbd66c8d98bc20fe839ab8eb41929aa05125c5cb7a9d0c66e
 EBUILD pdns-3.3.1.ebuild 5256 SHA256 61deaa9d450c40ce8d82fb5ca5356bc30da828323188e1c4e895fd98d216de3b SHA512 f46270b3f6434c8058ab5b8f73ad3163074256cae17099b4cbea4b394dd38cf2083cd4a75b9f9c67cde7887ce6c118c8c22c4d2a88cdac4d005ba3db8f07cc63 WHIRLPOOL 0dde97b1d6c92c9dd99f9a6cfdb4d5afac2ddc7c7e61f2955bab27334e9914549c82d3cb1b8f286f6e0dc7c95dda82d1f7f072fc74a36c5e5973467d95691c06
+EBUILD pdns-3.4.0-r1.ebuild 5043 SHA256 0e2387503b8075cab1d4ccaeb3db812484b2645c8928651dedb4de79cd876571 SHA512 83909839031be589ae75361945c33f44b8829bca67cc72093751731c90e269818b70b3d4a9f055e8ed54c104b60108732946978ea39fb7a7c453550af3c363d0 WHIRLPOOL 3bd08f8dcd04c918bca9661f79922b527d082dfc16fbba6c36196a22c9c81d5b77641060cbdfac51a69faa5c34c493cb60af0cb1095bf320f601e477f2c23df0
 EBUILD pdns-3.4.0.ebuild 4879 SHA256 14176b22ff87823bf1ee137de712ed0e11eb794ae198373c87e4c458001bb2ea SHA512 cd03b15fb0c096ba05e023d7c8f87c653a8de300bd3e057f0fb0c7a0b7897e0f3b765017e608578b305555ebb628a772b8fe83b3016aa4028869fdf636c45fa7 WHIRLPOOL e748db23ce0fddd36de12f3984e4fc5975d38084f1d42fd5e20871126dfb932388e3076f5d2c09fc7432f417cf197b3c67e29d2e584ae7ea5b7db83cdcfceea9
-MISC ChangeLog 15956 SHA256 28d65c9a7609a1529265981c90346301653c8f8e8934fca9f4d153cb7432868b SHA512 57901461b8e8425c2c25519ef94ff7196baa7f6292d54adbdaa3600ce04519e44769d94e235e2e0496eebce7288bfd7140975eb3829f53f48c25d739d8641a4c WHIRLPOOL 14161c6c30d02465cab2668e2dcf6ec89727fb1bb15f549c39cfe823c62c20bb02b35f8fb7892c38ce45a938a229fc2bb11af9e56dd11c3d1e5a55486a9ff2fd
+MISC ChangeLog 16125 SHA256 b5b71678b71325c4c6aad091c132b4274a9ffb3a72f024ff2d70d1083d3b1801 SHA512 7df316562b1082bfeac957ba2f25b74330c9064afda4740e5e8201d0557c36150f74fe9e846969c0f318c20a355d39ba859afa6297f3e3dbe3919355597fea55 WHIRLPOOL bd162b7180cf8baa857831f4636cc489af2a38e92fb89133c6973768983049b9f6744697642d25360027e318d9525ec9a02ec9ba1ce27a50d96be4c53cc55a29
 MISC metadata.xml 1496 SHA256 62f11762f2f33be179a8a11f9c061750b16e735712479ed53048b2dd81844f6a SHA512 a547fd6064efa6c3681f43a3d9427e256d2a18d065c240548c0d6663d586d5c5c3e20ee3993fb6490191517385b9f95a7475c586e1eaf12dafe97bd94845e8d8 WHIRLPOOL 623e25c6a52203d38aba761e8e41d94bd5e63d01bcb3c1969828b68125c0ae8cbf5290ec36b6cf166f2360441902162d31370f3b6cffb49f80ca130e6edba77f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRXhB8ACgkQVxOqA9G7/aATnAD/eV0AkGu2iqJZGgxl5GUXq96j
-T4IF7fYzx9aKa3m85poA/RpvLZ1EYStcpx8ITx8/+SEQemaC/C4eX22KstH4YnAg
-=8iB0
+iEYEAREIAAYFAlSHTbwACgkQI1lqEGTUzyQTrQCcDRSubPrOVVB7zgTrDxeg9wqW
+9T4An09GydFzLcfNQN/+rKPC3ALOG9ob
+=lOD4
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdns/pdns-3.4.0-r1.ebuild b/net-dns/pdns/pdns-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..b08fefe01d8d
--- /dev/null
+++ b/net-dns/pdns/pdns-3.4.0-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.4.0-r1.ebuild,v 1.1 2014/12/09 19:30:05 swegener Exp $
+
+EAPI=5
+
+inherit eutils multilib systemd user toolchain-funcs versionator
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="http://www.powerdns.com/"
+SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# other possible flags:
+# db2: we lack the dep
+# oracle: dito (need Oracle Client Libraries)
+# xdb: (almost) dead, surely not supported
+
+IUSE="botan cryptopp debug doc geoip ldap lua mydns mysql odbc opendbx postgres remote sqlite static tools tinydns test"
+
+REQUIRED_USE="mydns? ( mysql )"
+
+RDEPEND="!static? (
+		net-libs/polarssl
+		>=dev-libs/boost-1.34:=
+		botan? ( =dev-libs/botan-1.10* )
+		cryptopp? ( dev-libs/crypto++ )
+		lua? ( dev-lang/lua )
+		mysql? ( virtual/mysql )
+		postgres? ( virtual/postgresql:= )
+		ldap? ( >=net-nds/openldap-2.0.27-r4 )
+		sqlite? ( dev-db/sqlite:3 )
+		odbc? ( dev-db/unixODBC )
+		opendbx? ( dev-db/opendbx )
+		geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip )
+		tinydns? ( dev-db/cdb ) )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static? (
+		>=net-libs/polarssl-1.3.0[static-libs(+)]
+		>=dev-libs/boost-1.34[static-libs(+)]
+		botan? ( =dev-libs/botan-1.10*[static-libs(+)] )
+		cryptopp? ( dev-libs/crypto++[static-libs(+)] )
+		lua? ( dev-lang/lua[static-libs(+)] )
+		mysql? ( virtual/mysql[static-libs(+)] )
+		postgres? ( virtual/postgresql[static-libs(+)] )
+		ldap? ( >=net-nds/openldap-2.0.27-r4[static-libs(+)] )
+		sqlite? ( dev-db/sqlite:3[static-libs(+)] )
+		odbc? ( dev-db/unixODBC[static-libs(+)] )
+		opendbx? ( dev-db/opendbx[static-libs(+)] )
+		geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip[static-libs(+)] )
+		tinydns? ( dev-db/cdb ) )
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local dynmodules="pipe geo" # the default backends, always enabled
+	local modules=""
+
+	#use db2 && dynmodules+=" db2"
+	use ldap && dynmodules+=" ldap"
+	use lua && dynmodules+=" lua"
+	use mydns && dynmodules+=" mydns"
+	use mysql && dynmodules+=" gmysql"
+	use odbc && dynmodules+=" godbc"
+	use opendbx && dynmodules+=" opendbx"
+	#use oracle && dynmodules+=" goracle oracle"
+	use postgres && dynmodules+=" gpgsql"
+	use remote && dynmodules+=" remote"
+	use sqlite && dynmodules+=" gsqlite3"
+	use tinydns && dynmodules+=" tinydns"
+	use geoip && dynmodules+=" geoip"
+	#use xdb && dynmodules+=" xdb"
+
+	if use static ; then
+		modules="${dynmodules}"
+		dynmodules=""
+	fi
+
+	use botan && myconf+=" --enable-botan1.10"
+	use cryptopp && myconf+=" --enable-cryptopp"
+	use debug && myconf+=" --enable-verbose-logging"
+
+	econf \
+		--with-system-polarssl \
+		--disable-static \
+		--sysconfdir=/etc/powerdns \
+		--libdir=/usr/$(get_libdir)/powerdns \
+		--with-modules="${modules}" \
+		--with-dynmodules="${dynmodules}" \
+		--with-pgsql-includes=/usr/include \
+		--with-pgsql-lib=/usr/$(get_libdir) \
+		--with-mysql-lib=/usr/$(get_libdir) \
+		$(use_enable test unit-tests) \
+		$(use_with lua) \
+		$(use_enable static static-binaries) \
+		$(use_enable tools) \
+		${myconf}
+}
+
+src_compile() {
+	default
+	use doc && emake -C codedocs codedocs
+}
+
+src_install () {
+	default
+
+	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+	fperms 0700 /etc/powerdns
+	fperms 0600 /etc/powerdns/pdns.conf
+
+	# 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
+	systemd_newunit contrib/systemd-pdns.service pdns.service
+
+	keepdir /var/empty
+
+	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
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/dnsdomain2.schema
+	fi
+
+	prune_libtool_files --all
+}
+
+pkg_preinst() {
+	enewgroup pdns
+	enewuser pdns -1 -1 /var/empty pdns
+}
+
+pkg_postinst() {
+	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."
+
+	if use ldap ; then
+		ewarn "The official LDAP backend module is only compile-tested by upstream."
+		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
+	fi
+
+	local fix_perms=0
+
+	for rv in ${REPLACING_VERSIONS} ; do
+		version_compare ${rv} 3.2
+		[[ $? -eq 1 ]] && fix_perms=1
+	done
+
+	if [[ $fix_perms -eq 1 ]] ; then
+		ewarn "To fix a security bug (bug #458018) had the following"
+		ewarn "files/directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/etc/pdns"
+		ewarn "  ${EPREFIX}/etc/pdns/pdns.conf"
+		ewarn "Check if this is correct for your setup"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		chmod o-rwx "${EPREFIX}"/etc/pdns/{,pdns.conf}
+	fi
+
+}