Version bump, bug #539990.

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

3 files changed, 191 insertions, 6 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index 2253a1d9ebee..6883430a2b04 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.103 2014/12/28 16:19:25 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.104 2015/02/14 16:51:48 swegener Exp $
+
+*pdns-3.4.2 (14 Feb 2015)
+
+  14 Feb 2015; Sven Wegener <swegener@gentoo.org> +pdns-3.4.2.ebuild:
+  Version bump, bug #539990.
 
   28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org> pdns-3.3.1.ebuild,
   pdns-3.4.0.ebuild, pdns-3.4.0-r1.ebuild, pdns-3.4.1.ebuild:
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 2dbc202bef64..db3a7d9fe925 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -7,16 +7,18 @@ 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
 DIST pdns-3.4.1.tar.bz2 1237002 SHA256 13e32a31759e7fd341b98c89fe551723a5c6a768350b3609c576f70602deb24a SHA512 5c65a52bbf5ab72f6887c5b862d75b0f712323c6f682eda3dd337f6cbdc0c5824306eb620d97b40d76912392751a170c3783b14e4308cba855c4288291ff4c14 WHIRLPOOL 8c9daaa27b1d434956ce76357f98ad8f24f0a291e7252598ba13acbafbd25acd2e9d9d2f327fe7b4348f3d39d435bc315bfedf9719a395e754c1e0248f68367c
+DIST pdns-3.4.2.tar.bz2 1331062 SHA256 a6ab05459a0118cb921092deee06362722c45fa69ed0166ebc3696d526014b5b SHA512 e04e0d0a9d6a10f6104a1b4e399e1b84b66aaa5561696281f85898f900bcbcbd41e49a110cddffc12e1f5043d60663ce679af91e4b76f8e1823528a5f38098ed WHIRLPOOL 84d8cd1ec0604e2dd7cb80ef8c7b0379569576e0a48541fcfa0eaaf31fc1d976129bf4d4cb0fb055940236bdcc8a791d56f78d68a94dd9a2e563f5faaeb7eb73
 EBUILD pdns-3.3.1.ebuild 5254 SHA256 b2707c073bf15a02242073df61b650b3e3c377d929459d0e5b255ab145617761 SHA512 e3f2df7c7e5c3b182cf6de2f058ef57c985cff0e1477bf1bb78168ceaf0ccd22051f4f5020abf2b6b0600564d604625e855868e40027c7ef88d5b636114b8995 WHIRLPOOL 9d43c11d79baff0ea098babf16696b4d33886161dd51dd9bee87328638534a49385169a429b2d6a84e3c1e5de7e958ffb2e47dbf53b9bbec318af5e9da2cedf9
 EBUILD pdns-3.4.0-r1.ebuild 5048 SHA256 10a2684e1a10226b2f0b0573921ebf1d69619c02ad5703dacaff6681ad2641ee SHA512 5c27dd3193dc342703d12efe8ee93b2877a81c42e0aa1db3b58f5a370afa81e624d26fc9fb5c65c5950bff41bc84e1bdcbb0954bc16ac6c981bb62ee3a9b4785 WHIRLPOOL cb99b5283da1bef15e22179c836b51157dd0a2c547a47638869a667399746b2377a5577e45e5b5842b4bba9d82237b7c87489091e61f0d0f622e3f47646b654f
 EBUILD pdns-3.4.0.ebuild 4877 SHA256 eaffac6fb15491451df8964323557617bf5f162b0f51fbbdd161d6eb21425f2d SHA512 b4edb18008bea2a60d80cea537257775f18961df80a352adcb8a77e7d7b54fcc59eafd38e6408ec2c30a0ee5ef429e490b81d327340b2c9e92f9676f3d9c36a4 WHIRLPOOL 10f863d3f63b5a260ead6a9505616fbd0c429a25dc319f8500757d02ef80e1705c71a9bfd693be751fe4a3970bede725c745208ffd50877cabe4b864fadd1556
 EBUILD pdns-3.4.1.ebuild 5045 SHA256 91dafd5fb33e766f49f416bc9c9144666845d2a282ee36b8056e1aa6ed1ea761 SHA512 b441bdba192e68f7c32564e98d531844dbf5786ab7ce7fa2b3151dd6a63efea31adcbd730b193f247a4e97738ff334fe779ae16973c4a821d6be091ce799c34d WHIRLPOOL 9feeb67662e190077bff982e08971f4c4a03bfc95db94ece4a9a99a1e9b1643cd1852e97aff27e7415c785d42e8f64ff623481e950384fadf830d8d128c13286
-MISC ChangeLog 16571 SHA256 5bbebca10e2435b9284caf6dd058d6c142a0fab266435ddea0ea9ea1874102ad SHA512 81293ce49774c7106ac3e34e39cd41257637dad729d3336cb5ef02d248695278eee397df3393a0de6836487790d536e58de21ae9c29c0af0f650f5a4b6370a64 WHIRLPOOL fffedc35cef6f8ae779b95abaef0f9785f6b4a1b3b98f93102530195382bd11654562637475a9586617b8c3028ca127e3402d46e5244d2428491adb92319dd1e
+EBUILD pdns-3.4.2.ebuild 5049 SHA256 dcffc9994b5367a91dd29c79ab4f81b76cbe1e16723ccc80fc757a522a725966 SHA512 3b5b46ed710ea2e024816ca03a645008e41759569adb4c382171c3a48d793a7dd6afa88fe27ec47d3a8b3f44d512d6f8997eeb751043ad3abe8575432cb98757 WHIRLPOOL 71e72a59571184435968bc57e7fe656129c35aafe7120ad2694d199b67670484c94c6eedb33b879c8df363b8eb469bc0d487597538209b52e0d8a3401afdd578
+MISC ChangeLog 16696 SHA256 76a5ca2ccf26887a89649de8c5d00bb61de9715e0f870fcf1b0b9c8de29f3562 SHA512 0c9d4acc69fded2bda973dbb6118231d77a82af0fcf693eb6330aa52d95cbabf62fa7b80aa969401156fe94528c1954f5e4759b741e67647c0ce66acb0f731e9 WHIRLPOOL e7d59e9f5e679a31eda9ef9878bd9b601aeb3e0b3a5c1d64355ba66034f05c8c0798046dfe49ab8b1082a990053b745d9537fa2ce9fd800ebbcd755ebc6287e2
 MISC metadata.xml 1496 SHA256 62f11762f2f33be179a8a11f9c061750b16e735712479ed53048b2dd81844f6a SHA512 a547fd6064efa6c3681f43a3d9427e256d2a18d065c240548c0d6663d586d5c5c3e20ee3993fb6490191517385b9f95a7475c586e1eaf12dafe97bd94845e8d8 WHIRLPOOL 623e25c6a52203d38aba761e8e41d94bd5e63d01bcb3c1969828b68125c0ae8cbf5290ec36b6cf166f2360441902162d31370f3b6cffb49f80ca130e6edba77f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSgLY8ACgkQVxOqA9G7/aDCYwD9GxS3Zu2qDyU3B5YEyI5OJ6KT
-0t01x/kg6qwH8XSfNmwBAIVAep+ocDpf1V7wTYF+gRTvnTQjUh2jcT8i91aCdxWP
-=d46E
+iEYEAREIAAYFAlTffSYACgkQI1lqEGTUzyR4rQCffsNJZPn/Sj3O4vrZWiFmsdFO
+ztYAn2J2TpGXOfVGLkQXMhJufrsTtZ1s
+=TmRa
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdns/pdns-3.4.2.ebuild b/net-dns/pdns/pdns-3.4.2.ebuild
new file mode 100644
index 000000000000..b3f2e555dd25
--- /dev/null
+++ b/net-dns/pdns/pdns-3.4.2.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.4.2.ebuild,v 1.1 2015/02/14 16:51:48 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? ( dev-db/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? ( dev-db/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 bind" # 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
+
+}