gentoo resync : 15.12.2019

4 files changed, 180 insertions, 2 deletions

diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 06ec1b84960c..9d00f4edd76e 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -2,6 +2,8 @@ AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf40345342288
 AUX pdns-r1 2533 BLAKE2B 0d4af8f9cd4568cde40b44c72cb10a29662daa514df1a1d8174dd02f2ad4324cb7c99a05736bac7cbe80e1b9081832cac95d8c482eb4d1a8c344a6b55da623e3 SHA512 6392f59f82b82621b6cab6823f7761cd875bc6818c48db846df289057c02d8119a1024c5ecdf70a5ca8a55c00a2c3c56240d36b42cc038a25e8616ab9b966dd6
 DIST pdns-4.1.13.tar.bz2 1117990 BLAKE2B 95fa26d872fe138d1cde7e586881010dd27211c4186d0a99693d2fd90bdc3fd939da09805898d469daec6fe8c3493166346cf18b528760f3b25274fe10f45ad2 SHA512 94d80b1c6b78e93dd856631d391225c521485c3fb6b4123b28f9f58e178a7f6eb03f24189eaa261873e7e29962761b513c1fcf092101d68ad81dac73249a54d4
 DIST pdns-4.2.0.tar.bz2 1249282 BLAKE2B 56b3639004abd05ab9df4541cc46f155ce76426b35a29d9a4cedd16428c5852bf9306e14b77440b8239e823cb0603b4747a8ae7729f964f415a529f17706eb1f SHA512 ee67c132458e539d522aaa5835237dc64d92ad546f51e0ef86366964f7105631f2bd1e6c5d19d85466d95e1982f6410aeb14932c265fddfd301e403e76542624
-EBUILD pdns-4.1.13.ebuild 4703 BLAKE2B 6b6d49e55745519af07c3bba4a964e4bc40536fd1189f681699075b79f6f690368f635c6f65f699875ace38065b18afff0739fae715e2c9163a9246d3e96ac86 SHA512 acaab7c3256e09e54b56f5fde789d0776bdc6320ec4489158119d00659d18d9747b87c8df2e2ad2c7ec8fca6658c916ca0b636e261c9565269b844fa527ad83e
-EBUILD pdns-4.2.0.ebuild 4698 BLAKE2B b44da7a37397340af4af678dc9a05c2e1aba2676a1058c348926483ab0fb5f69617dcc331659f70a1d308166cce40c5ec717caf8acae84d61f2a304153b84397 SHA512 a1086874a1c1b60306504274f700131be47d1022abbb2d2057cc3cb2c6f3a0cbbb9725f5561b09fe5508ca208f275c53f3f3bfbcb6cd6f68b9f7d75de51b5574
+DIST pdns-4.2.1.tar.bz2 1252829 BLAKE2B e5cfcdd0c3011fe43e5abe52e5308b5e6346d186c5d5046c862468ecf810db7e5ab64bd36a9c62f251fbf63948572c5193ed354b8e98d647111e9373578c54ef SHA512 40b5533c755d7c0d41cfb273b704a45a3006dafc98c79bf41cae43d9e2d03bbd7a663996a7f209c390a89c5f7161f2f6246389beef18fbac48e95907e1b7936a
+EBUILD pdns-4.1.13.ebuild 4730 BLAKE2B 30e7d3a402ce3f95e29f787ea74bbe3dac6a7f995eb50a8843acc64faab3198d68bb79838b68dbc3877a623705447d1884a395a8bbba468eec179af7914b5122 SHA512 659759a07c3f0003de18d9a4711a48245ec39b9389f513ba2b1c720e8aad148d6710defbac7b7302bc97d8607bf411ab32c2131b7ec7884e4c39f321f8e90db3
+EBUILD pdns-4.2.0.ebuild 4725 BLAKE2B 4967ae6d766a7e83086c9d67679871540c103e0d88d35f7fe9fbae40ea77a10dddbf880687cdab4a8f23253c24fc544dd3901e833606cb20471b046b68455a99 SHA512 d865cd6f4d80cb2604120391601a8ac385db701bcb91ec48a696f8e66c6d541a382662bc90e83affcbdc78d1747f21e1745ef67f49d54c08fe04be958a0fafd6
+EBUILD pdns-4.2.1.ebuild 4725 BLAKE2B 4967ae6d766a7e83086c9d67679871540c103e0d88d35f7fe9fbae40ea77a10dddbf880687cdab4a8f23253c24fc544dd3901e833606cb20471b046b68455a99 SHA512 d865cd6f4d80cb2604120391601a8ac385db701bcb91ec48a696f8e66c6d541a382662bc90e83affcbdc78d1747f21e1745ef67f49d54c08fe04be958a0fafd6
 MISC metadata.xml 1383 BLAKE2B fd622facab46aaba7d1e54529574ec0d0531254fcbed8c454bc21438212a9d7f0ce744417b24461e1dc144a3daded8d252d805011b77bc5f396bb59297cf55c4 SHA512 6301ccaa19d82478a7e338cf1ad3b586cbdc4c2b98298bb306e7913399efab4e30305756cc7dcf6df4d81520733f2095c4bf61f65ac83763e38f375c2cc0b2a7
diff --git a/net-dns/pdns/pdns-4.1.13.ebuild b/net-dns/pdns/pdns-4.1.13.ebuild
index ae6ae070db07..41fbabb111d2 100644
--- a/net-dns/pdns/pdns-4.1.13.ebuild
+++ b/net-dns/pdns/pdns-4.1.13.ebuild
@@ -19,6 +19,7 @@ KEYWORDS="amd64 x86"
 # xdb: (almost) dead, surely not supported
 
 IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="mydns? ( mysql )"
 
diff --git a/net-dns/pdns/pdns-4.2.0.ebuild b/net-dns/pdns/pdns-4.2.0.ebuild
index e1229b5437f0..5c7378bfdf75 100644
--- a/net-dns/pdns/pdns-4.2.0.ebuild
+++ b/net-dns/pdns/pdns-4.2.0.ebuild
@@ -19,6 +19,7 @@ KEYWORDS="~amd64 ~x86"
 # xdb: (almost) dead, surely not supported
 
 IUSE="debug doc geoip ldap libressl lua luajit lua-records mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="lua-records? ( lua ) mydns? ( mysql )"
 
diff --git a/net-dns/pdns/pdns-4.2.1.ebuild b/net-dns/pdns/pdns-4.2.1.ebuild
new file mode 100644
index 000000000000..5c7378bfdf75
--- /dev/null
+++ b/net-dns/pdns/pdns-4.2.1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib user
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://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="debug doc geoip ldap libressl lua luajit lua-records mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="lua-records? ( lua ) mydns? ( mysql )"
+
+RDEPEND="
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:=
+	lua? (
+		!luajit? ( dev-lang/lua:= )
+		luajit? ( dev-lang/luajit:= )
+	)
+	lua-records? ( >=net-misc/curl-7.21.3 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
+	sqlite? ( dev-db/sqlite:3 )
+	opendbx? ( dev-db/opendbx )
+	geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
+	sodium? ( dev-libs/libsodium:= )
+	tinydns? ( >=dev-db/tinycdb-0.77 )
+	protobuf? ( dev-libs/protobuf )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}"/${P/_/-}
+
+src_configure() {
+	local dynmodules="pipe bind" # the default backends, always enabled
+
+	#use db2 && dynmodules+=" db2"
+	use ldap && dynmodules+=" ldap"
+	use lua && dynmodules+=" lua"
+	use mydns && dynmodules+=" mydns"
+	use mysql && dynmodules+=" gmysql"
+	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"
+
+	econf \
+		--disable-static \
+		--sysconfdir=/etc/powerdns \
+		--libdir=/usr/$(get_libdir)/powerdns \
+		--with-modules= \
+		--with-dynmodules="${dynmodules}" \
+		--with-mysql-lib=/usr/$(get_libdir) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable lua-records) \
+		$(use_enable test unit-tests) \
+		$(use_enable tools) \
+		$(use_enable systemd) \
+		$(use_with sodium libsodium) \
+		$(use_with lua lua $(usex luajit luajit lua)) \
+		$(use_with protobuf) \
+		${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
+
+	newinitd "${FILESDIR}"/pdns-r1 pdns
+
+	keepdir /var/empty
+
+	if use doc; then
+		docinto html
+		dodoc -r codedocs/html/.
+	fi
+
+	# 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
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+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
+		echo
+		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 old
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 3.2 || continue
+
+		echo
+		ewarn "To fix a security bug (bug #458018) had the following"
+		ewarn "files/directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/etc/powerdns"
+		ewarn "  ${EPREFIX}/etc/powerdns/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/powerdns/{,pdns.conf}
+
+		break
+	done
+
+	if use postgres; then
+		for old in ${REPLACING_VERSIONS}; do
+			ver_test ${old} -lt 4.1.11-r1 || continue
+
+			echo
+			ewarn "PowerDNS 4.1.11 contains a security fix for the PostgreSQL backend."
+			ewarn "This security fix needs to be applied manually to the database schema."
+			ewarn "Please refer to the official security advisory for more information:"
+			ewarn
+			ewarn "  https://doc.powerdns.com/authoritative/security-advisories/powerdns-advisory-2019-06.html"
+
+			break
+		done
+	fi
+}