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

["Sven Wegener" <swegener@gentoo.org>]

commit:     dd2e21b35b50caece13fff09204c090ecf88aff9
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 22:38:23 2017 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 22:38:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd2e21b3

net-dns/pdns: Cleanup

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 net-dns/pdns/Manifest                         |   1 -
 net-dns/pdns/files/CVE-2017-15091-4.0.4.patch |  30 -----
 net-dns/pdns/pdns-4.0.4-r1.ebuild             | 157 --------------------------
 net-dns/pdns/pdns-4.0.4.ebuild                | 153 -------------------------
 4 files changed, 341 deletions(-)

diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 5f74be659aa..59f3e99cdf8 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,3 +1,2 @@
-DIST pdns-4.0.4.tar.bz2 1320327 BLAKE2B 5c11a0245408f8448b41ed4229718e6f7244e0c8f36b60b07c280f82c7dea0065cce93c3814b3a396666be8d3b012ad4eb646cf55f531d22ce325190e0fd6e22 SHA512 4ef4705cd990b03976775167c7c37850d45907e198549feda5f5701172e008e3f1f74a35a9bebdb24b63dec15ff63cb2cc9dfc8f92e4e1012e0539c5a88b845b
 DIST pdns-4.0.5.tar.bz2 1323468 BLAKE2B 7e10cc98177bfa4f81888e2598ab4f0ce83ee45e6349372c065940424a74015302da879536dea8346fe7b86f35c0524a5449489bdf71d1a091b7c6a82fac4b6f SHA512 4b0fa932c1d9caf35b988916447aa21c64ebe2a58bdd84417cf09321a21b264cf1057206dc6993a45a3b591eb1dfa49463710c06b6bdfaf6fb17ae6dec6086d9
 DIST pdns-4.1.0.tar.bz2 1116905 BLAKE2B 91ec0f0cfa70966ff71dfb6302ed01355120ca1429d3c610c4abfb1b964cff78a6332700991bc259387e9095be03d3850da41750e93bb3ffe3db0e23562d156c SHA512 4b2b42f4893f8aac3cf07a6c8a3c999cb728a5907a710f1a5c9c8d08377ecb63e202e5eececbefc069c8f1d97a29b2aa607da7cf2bcc6335a72222418e409e77

diff --git a/net-dns/pdns/files/CVE-2017-15091-4.0.4.patch b/net-dns/pdns/files/CVE-2017-15091-4.0.4.patch
deleted file mode 100644
index a9506af8ef9..00000000000
--- a/net-dns/pdns/files/CVE-2017-15091-4.0.4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ru pdns-4.0.4.orig/pdns/ws-auth.cc pdns-4.0.4/pdns/ws-auth.cc
---- pdns-4.0.4.orig/pdns/ws-auth.cc	2017-06-22 22:07:25.000000000 +0200
-+++ pdns-4.0.4/pdns/ws-auth.cc	2017-11-02 18:07:20.986764858 +0100
-@@ -860,7 +860,7 @@
- static void apiServerZoneAxfrRetrieve(HttpRequest* req, HttpResponse* resp) {
-   DNSName zonename = apiZoneIdToName(req->parameters["id"]);
- 
--  if(req->method != "PUT")
-+  if(req->method != "PUT" || ::arg().mustDo("api-readonly"))
-     throw HttpMethodNotAllowedException();
- 
-   UeberBackend B;
-@@ -879,7 +879,7 @@
- static void apiServerZoneNotify(HttpRequest* req, HttpResponse* resp) {
-   DNSName zonename = apiZoneIdToName(req->parameters["id"]);
- 
--  if(req->method != "PUT")
-+  if(req->method != "PUT" || ::arg().mustDo("api-readonly"))
-     throw HttpMethodNotAllowedException();
- 
-   UeberBackend B;
-@@ -1191,7 +1191,7 @@
- }
- 
- void apiServerCacheFlush(HttpRequest* req, HttpResponse* resp) {
--  if(req->method != "PUT")
-+  if(req->method != "PUT" || ::arg().mustDo("api-readonly"))
-     throw HttpMethodNotAllowedException();
- 
-   DNSName canon = apiNameToDNSName(req->getvars["domain"]);

diff --git a/net-dns/pdns/pdns-4.0.4-r1.ebuild b/net-dns/pdns/pdns-4.0.4-r1.ebuild
deleted file mode 100644
index 9fa2350de53..00000000000
--- a/net-dns/pdns/pdns-4.0.4-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils multilib user toolchain-funcs versionator
-
-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="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sqlite systemd tools tinydns test"
-
-REQUIRED_USE="mydns? ( mysql ) ?? ( lua luajit )"
-
-RDEPEND="
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:=
-	botan? ( =dev-libs/botan-1.10*[threads] )
-	lua? ( dev-lang/lua:= )
-	luajit? ( dev-lang/luajit:= )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 )
-	sqlite? ( dev-db/sqlite:3 )
-	opendbx? ( dev-db/opendbx )
-	geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip )
-	tinydns? ( >=dev-db/tinycdb-0.77 )
-	protobuf? ( dev-libs/protobuf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/${P/_/-}
-
-PATCHES=(
-	"${FILESDIR}"/CVE-2017-15091-4.0.4.patch
-)
-
-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-pgsql-includes=/usr/include \
-		--with-pgsql-lib=/usr/$(get_libdir) \
-		--with-mysql-lib=/usr/$(get_libdir) \
-		$(use_enable botan botan1.10) \
-		$(use_enable debug verbose-logging) \
-		$(use_enable test unit-tests) \
-		$(use_enable tools) \
-		$(use_enable systemd) \
-		$(use_with lua) \
-		$(use_with luajit) \
-		$(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
-
-	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 old
-	for old in ${REPLACING_VERSIONS}; do
-		version_compare ${old} 3.2
-		[[ $? -eq 1 ]] || continue
-
-		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
-}

diff --git a/net-dns/pdns/pdns-4.0.4.ebuild b/net-dns/pdns/pdns-4.0.4.ebuild
deleted file mode 100644
index 43c8063885e..00000000000
--- a/net-dns/pdns/pdns-4.0.4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils multilib user toolchain-funcs versionator
-
-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="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sqlite systemd tools tinydns test"
-
-REQUIRED_USE="mydns? ( mysql ) ?? ( lua luajit )"
-
-RDEPEND="
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:=
-	botan? ( =dev-libs/botan-1.10*[threads] )
-	lua? ( dev-lang/lua:= )
-	luajit? ( dev-lang/luajit:= )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 )
-	sqlite? ( dev-db/sqlite:3 )
-	opendbx? ( dev-db/opendbx )
-	geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip )
-	tinydns? ( >=dev-db/tinycdb-0.77 )
-	protobuf? ( dev-libs/protobuf )"
-DEPEND="${RDEPEND}
-	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-pgsql-includes=/usr/include \
-		--with-pgsql-lib=/usr/$(get_libdir) \
-		--with-mysql-lib=/usr/$(get_libdir) \
-		$(use_enable botan botan1.10) \
-		$(use_enable debug verbose-logging) \
-		$(use_enable test unit-tests) \
-		$(use_enable tools) \
-		$(use_enable systemd) \
-		$(use_with lua) \
-		$(use_with luajit) \
-		$(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
-
-	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 old
-	for old in ${REPLACING_VERSIONS}; do
-		version_compare ${old} 3.2
-		[[ $? -eq 1 ]] || continue
-
-		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
-}