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

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

commit:     9f06d066a951b3f5de9b33d60198ba6cb0c944ce
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 27 21:03:15 2021 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sun Jun 27 21:07:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f06d066

net-dns/pdns: Fix support for boost-1.76

Boost 1.76 uses different exceptions for the containers, force it back to
standard exceptions.

Closes: https://bugs.gentoo.org/794532
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 net-dns/pdns/files/pdns-4.4.1-boost-1.76.patch |  26 ++++
 net-dns/pdns/pdns-4.4.1-r1.ebuild              | 172 +++++++++++++++++++++++++
 2 files changed, 198 insertions(+)

diff --git a/net-dns/pdns/files/pdns-4.4.1-boost-1.76.patch b/net-dns/pdns/files/pdns-4.4.1-boost-1.76.patch
new file mode 100644
index 00000000000..0e440020541
--- /dev/null
+++ b/net-dns/pdns/files/pdns-4.4.1-boost-1.76.patch
@@ -0,0 +1,26 @@
+From 42cec1e5948e828fb2b941107c4fce9ec847f9a8 Mon Sep 17 00:00:00 2001
+From: Peter van Dijk <peter.van.dijk@powerdns.com>
+Date: Fri, 23 Apr 2021 15:40:43 +0200
+Subject: [PATCH] boost 1.76 containers: use standard exceptions
+
+(cherry picked from commit 311f26839819062ced8697686372b6c6b2210bdf)
+---
+ pdns/Makefile.am              | 3 ++-
+ pdns/dnsdistdist/Makefile.am  | 2 +-
+ pdns/recursordist/Makefile.am | 3 ++-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/pdns/Makefile.am b/pdns/Makefile.am
+index 237a48f501f..f073f052600 100644
+--- a/pdns/Makefile.am
++++ b/pdns/Makefile.am
+@@ -6,7 +6,8 @@ AM_CPPFLAGS += \
+ 	$(LIBEDIT_CFLAGS) \
+ 	$(LIBCRYPTO_INCLUDES) \
+ 	$(SYSTEMD_CFLAGS) \
+-	$(YAML_CFLAGS)
++	$(YAML_CFLAGS) \
++	-DBOOST_CONTAINER_USE_STD_EXCEPTIONS
+ 
+ AM_CXXFLAGS = \
+ 	-DSYSCONFDIR=\"$(sysconfdir)\" \

diff --git a/net-dns/pdns/pdns-4.4.1-r1.ebuild b/net-dns/pdns/pdns-4.4.1-r1.ebuild
new file mode 100644
index 00000000000..bb6301e4a13
--- /dev/null
+++ b/net-dns/pdns/pdns-4.4.1-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit autotools lua-single
+
+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 lua-records mydns mysql postgres protobuf remote sodium sqlite systemd tools tinydns test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	mydns? ( mysql )"
+
+DEPEND="${LUA_DEPS}
+	dev-libs/openssl:=
+	>=dev-libs/boost-1.35:=
+	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 )
+	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 )"
+RDEPEND="${DEPEND}
+	acct-user/pdns
+	acct-group/pdns"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}"/${P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-boost-1.76.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local dynmodules="pipe bind" # the default backends, always enabled
+
+	#use db2 && dynmodules+=" db2"
+	use ldap && dynmodules+=" ldap"
+	use mydns && dynmodules+=" mydns"
+	use mysql && dynmodules+=" gmysql"
+	#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-service-user=pdns \
+		--with-service-group=pdns \
+		--with-modules= \
+		--with-dynmodules="${dynmodules}" \
+		--with-mysql-lib=/usr/$(get_libdir) \
+		--with-lua="${ELUA}" \
+		$(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 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_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."
+
+	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
+}