commit: e431db86a3509b26293116c304cac99aa65f0cef Author: Sven Wegener <swegener <AT> gentoo <DOT> org> AuthorDate: Wed Jul 22 19:37:26 2020 +0000 Commit: Sven Wegener <swegener <AT> gentoo <DOT> org> CommitDate: Wed Jul 22 19:38:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e431db86
net-dns/pdns-recursor: Cleanup Bug: https://bugs.gentoo.org/730362 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Sven Wegener <swegener <AT> gentoo.org> net-dns/pdns-recursor/Manifest | 1 - .../files/pdns-recursor-4.3.1-gcc-10.patch | 61 --------------- .../pdns-recursor/pdns-recursor-4.3.1-r1.ebuild | 86 ---------------------- net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild | 83 --------------------- 4 files changed, 231 deletions(-) diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest index 60eadac846c..1b129461da1 100644 --- a/net-dns/pdns-recursor/Manifest +++ b/net-dns/pdns-recursor/Manifest @@ -1,3 +1,2 @@ -DIST pdns-recursor-4.3.1.tar.bz2 1334817 BLAKE2B 1972259e42b1cefd9069a36d2bb235652ce234d525a2e3f19c96a93bf26f34063e6d04240146bba0560573c1d2ad042a579d6ab557fc7ac0aadee09fa15ee397 SHA512 49ae4957ef202f94ec87e6449dfa9c147689b5576ca1002e0155319099d698300c113e221571f6d41cb1cdc1649619621c2ccf8105620c25452ac30bd83e46b8 DIST pdns-recursor-4.3.2.tar.bz2 1354549 BLAKE2B 253f9a6ec3b7bfb4d3a97953c9f65458b479bdaa20fcc28d980a1cf4c1f15f80ad35251687bb5410f14268be79de4bbcec8bc36663a0a8eb51894fa6e4242547 SHA512 d1ca566dc8785fda3764838a0ea598acc4106b6261ebdbbe43fc6a6e4a82c375f7ef3f6d23fbd9b216067eb9cf56fcae6d460bfc7957ba4c201d466ad15d75d7 DIST pdns-recursor-4.3.3.tar.bz2 1357853 BLAKE2B fa57776bbdb77d1f13f04fdd1fb5ceb07539f851704dc627443a7c814d6640b1e7890333b6d7214a201f5d3f83a54a7840adb6450ffb7696e58722625b7c57c5 SHA512 285f12d3cb2edaca7507dd9dad1356b60076d43af678458346489562ea8933a01d61d2430d5282b6afd213839ee684ad83e5f523c9a272f382d74ccc238bd9d5 diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-gcc-10.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-gcc-10.patch deleted file mode 100644 index 8244a456e64..00000000000 --- a/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-gcc-10.patch +++ /dev/null @@ -1,61 +0,0 @@ -commit b35614ed8b45adba304bcddcb3f2db6cb36b1462 -Author: Sander Hoentjen <shoent...@antagonist.nl> -Date: Mon Dec 16 22:44:43 2019 +0100 - - Fix build with gcc-10 - - From an e-mail from Jeff Law <l...@redhat.com>: - - Subject: Minor problem in pdns, dnsdist and pdns-recursor packages in Fedora - - [ All three packages have embedded copies of the same problematic code - and the same patch fixes all three. ] - - Red Hat's compiler team continues to try and be proactive in identifying - issues that will arise as a result of the introduction of a new GCC - release into Fedora each spring. - - You're being contacted because a package you maintain in Fedora is going - to fail to build with gcc-10 in the spring. Yes, I know that's a few - months away, but it's far easier to fix this stuff proactively now than - wait. - - Fixing it now also means that your package will continue to be built - with testing versions of gcc-10 as we proceed through the development - process thus allowing additional issues to be caught early. - - Your particular package will fail due to an uninstantiated template for - AsyncLoader<Request>. These kinds of problems are relatively common due to - changes in the tuning of the inliner for gcc-10: - - > BUILDSTDERR: /usr/bin/ld: webserver.o: in function `WebServer::serveConnection(std::shared_ptr<Socket>) const': - > BUILDSTDERR: /builddir/build/BUILD/pdns-4.2.1/pdns/webserver.cc:373: undefined reference to `YaHTTP::AsyncLoader<YaHTTP::Request>::feed(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)' - > BUILDSTDERR: collect2: error: ld returned 1 exit status - > BUILDSTDERR: make[3]: *** [Makefile:2751: ixfrdist] Error 1 - > - - The attached patch arranges for an instance to be instantiated when - compiling reqresp.cpp and is sufficient to fix this problem. The - choice of reqresp.cpp fairly arbitrary IIRC. - - Ideally you'll with upstream to get this fixed, but a Fedora patch is - clearly OK as well. I'll install the attached fix into Fedora in a - week or so if I haven't heard from you. - - Jeff - - (cherry picked from commit ffb885e937c27bb1c62dee8f18c58ae0d5d52d39) - -diff --git a/ext/yahttp/yahttp/reqresp.cpp b/ext/yahttp/yahttp/reqresp.cpp -index 686a6c7bd..ca2154f6a 100644 ---- a/ext/yahttp/yahttp/reqresp.cpp -+++ b/ext/yahttp/yahttp/reqresp.cpp -@@ -2,6 +2,8 @@ - - namespace YaHTTP { - -+ template class AsyncLoader<Request>; -+ - bool isspace(char c) { - return std::isspace(c) != 0; - } diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.1-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.1-r1.ebuild deleted file mode 100644 index c2393a2b27e..00000000000 --- a/net-dns/pdns-recursor/pdns-recursor-4.3.1-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic - -DESCRIPTION="The PowerDNS Recursor" -HOMEPAGE="https://www.powerdns.com/"; -SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="debug dnstap libressl luajit protobuf snmp sodium systemd" -REQUIRED_USE="dnstap? ( protobuf )" - -DEPEND="!luajit? ( >=dev-lang/lua-5.1:= ) - luajit? ( dev-lang/luajit:= ) - protobuf? ( - dev-libs/protobuf - >=dev-libs/boost-1.42:= - ) - dnstap? ( dev-libs/fstrm ) - systemd? ( sys-apps/systemd:0= ) - snmp? ( net-analyzer/net-snmp ) - sodium? ( dev-libs/libsodium:= ) - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:= ) - >=dev-libs/boost-1.35:=" -RDEPEND="${DEPEND} - !<net-dns/pdns-2.9.20-r1 - acct-user/pdns - acct-group/pdns" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}"/${P/_/-} - -PATCHES=( - "${FILESDIR}"/${P}-boost-1.73.0.patch - "${FILESDIR}"/${P}-gcc-10.patch -) - -pkg_setup() { - filter-flags -ftree-vectorize -} - -src_configure() { - econf \ - --sysconfdir=/etc/powerdns \ - --with-lua=$(usex luajit luajit lua) \ - $(use_enable debug verbose-logging) \ - $(use_enable systemd) \ - $(use_enable dnstap dnstap) \ - $(use_with sodium libsodium) \ - $(use_with protobuf) \ - $(use_with snmp net-snmp) -} - -src_install() { - default - - mv "${D}"/etc/powerdns/recursor.conf{-dist,} - - # set defaults: setuid=nobody, setgid=nobody - sed -i \ - -e 's/^# set\([ug]\)id=$/set\1id=pdns/' \ - -e 's/^# quiet=$/quiet=on/' \ - -e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \ - "${D}"/etc/powerdns/recursor.conf - - newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor -} - -pkg_postinst() { - local old - - for old in ${REPLACING_VERSIONS}; do - ver_test ${old} -lt 4.0.0-r1 || continue - - ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor" - ewarn "to pdns-recursor, please update your runlevels accordingly." - - break - done -} diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild deleted file mode 100644 index 378e02c50a6..00000000000 --- a/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic - -DESCRIPTION="The PowerDNS Recursor" -HOMEPAGE="https://www.powerdns.com/"; -SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="debug libressl luajit protobuf snmp sodium systemd" - -DEPEND="!luajit? ( >=dev-lang/lua-5.1:= ) - luajit? ( dev-lang/luajit:= ) - protobuf? ( - dev-libs/protobuf - >=dev-libs/boost-1.42:= - ) - systemd? ( sys-apps/systemd:0= ) - snmp? ( net-analyzer/net-snmp ) - sodium? ( dev-libs/libsodium:= ) - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:= ) - >=dev-libs/boost-1.35:=" -RDEPEND="${DEPEND} - !<net-dns/pdns-2.9.20-r1 - acct-user/pdns - acct-group/pdns" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}"/${P/_/-} - -PATCHES=( - "${FILESDIR}"/${P}-boost-1.73.0.patch - "${FILESDIR}"/${P}-gcc-10.patch -) - -pkg_setup() { - filter-flags -ftree-vectorize -} - -src_configure() { - econf \ - --sysconfdir=/etc/powerdns \ - --with-lua=$(usex luajit luajit lua) \ - $(use_enable debug verbose-logging) \ - $(use_enable systemd) \ - $(use_with sodium libsodium) \ - $(use_with protobuf) \ - $(use_with snmp net-snmp) -} - -src_install() { - default - - mv "${D}"/etc/powerdns/recursor.conf{-dist,} - - # set defaults: setuid=nobody, setgid=nobody - sed -i \ - -e 's/^# set\([ug]\)id=$/set\1id=pdns/' \ - -e 's/^# quiet=$/quiet=on/' \ - -e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \ - "${D}"/etc/powerdns/recursor.conf - - newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor -} - -pkg_postinst() { - local old - - for old in ${REPLACING_VERSIONS}; do - ver_test ${old} -lt 4.0.0-r1 || continue - - ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor" - ewarn "to pdns-recursor, please update your runlevels accordingly." - - break - done -}
