summaryrefslogtreecommitdiff
path: root/net-dns/pdns-recursor
diff options
context:
space:
mode:
Diffstat (limited to 'net-dns/pdns-recursor')
-rw-r--r--net-dns/pdns-recursor/Manifest8
-rw-r--r--net-dns/pdns-recursor/files/pdns-recursor-4.3.1-gcc-10.patch61
-rw-r--r--net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild83
-rw-r--r--net-dns/pdns-recursor/pdns-recursor-4.3.2.ebuild2
-rw-r--r--net-dns/pdns-recursor/pdns-recursor-4.3.3.ebuild (renamed from net-dns/pdns-recursor/pdns-recursor-4.3.1-r1.ebuild)3
5 files changed, 5 insertions, 152 deletions
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index f18b744e42af..1f4642b269c1 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,9 +1,7 @@
AUX pdns-recursor-4.3.1-boost-1.73.0.patch 4563 BLAKE2B 81f5f33939f9937b78235c3ff3859f09ac162350f8b855c28e0235e0ca414716c03d0866c13d055ac55d8896c11c6c1b149b5f29baa105be7b3338c06081a886 SHA512 8dd57a7423cdf4b33c59dece2ee63829c9d88ee60635a7441c6e17e0fac5762319b5c913ed4454f38926c0b3cc9489a9d12360b35f3c632607cd26f7b7b2018b
-AUX pdns-recursor-4.3.1-gcc-10.patch 2592 BLAKE2B da68e0311a30ba894cfa82b1140dca85b2547cc0885d9fec6dd0721c38f531777e06d27ede7bdc92996e60bfb621351bab66c1ce19cc923f8fc3b1b44a4bde05 SHA512 16a81afc5a3a7cdac4acee52b30ff61cea97ef1c543fc0858897c2caa19fedd1e71f9787c4674122ee7f96d4130d6b5f37b0cdcc6bcd44d14765845877c02ab4
AUX pdns-recursor-r2 1251 BLAKE2B 391f52b9c9b8ee1d01ca57b5e73106f350f474e12c5ca957cfe857a0a8f672a1347393d15c343601769ce58fc12034833fb5f012f7ae7b1d41d76d493be5ca71 SHA512 a607ac4e6edb095d7d097e255779ea574191793bbbdce1df7113e17dc777dfd8929a9332fc6cd4e98b59fe826e020efcf35a011ff4cef70433117fab4998584c
-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
-EBUILD pdns-recursor-4.3.1-r1.ebuild 1976 BLAKE2B 349a1e9ece84876f4942fbd71e2a4627e10ae2095794540ed8537314d614d9cbc3705d889493c188acb73583d144fc4afa8cdb15c71b0b557d99d0b96dd58a37 SHA512 87ec69617de53ee96947d566475753499f0997a5597e8e48ebbc84e2dcd10992e5bb920980c4567fd68c9d02aa75d855f73feaa990d68720196b828fbcadc5f8
-EBUILD pdns-recursor-4.3.1.ebuild 1871 BLAKE2B 41b5d33da55a8a0fabfd0d69666ad23a7104f10343d10bc949b269596ed8238f9c9cd3f573a2a026f876046fce42cf7787ac264cf1fe69bd8822c8605a19c544 SHA512 26fca6db80aa43334985e27161a64a893d150f0e746fe0bb834b5341096f0eed79524c432b8b95ad06bce152ef65fcc76b7befc4a2dd100729b7ffa077c0471e
-EBUILD pdns-recursor-4.3.2.ebuild 1950 BLAKE2B 3d4ca29820d37d1bd97f1d247a2384a4cbc59747eccec10d8851fc12dba7401fb4a0b2b5cb0995205d9c69e9cde11e28ac927923f82e9341c4f920c88827cf2c SHA512 b2c36166659af410264681fc2c0c55e258bf6c03bff1a95f7917f8da709f20a7606a89de2a886eb240f7be7b190036e76505c5a094ff50367e140961736e0d31
+DIST pdns-recursor-4.3.3.tar.bz2 1357853 BLAKE2B fa57776bbdb77d1f13f04fdd1fb5ceb07539f851704dc627443a7c814d6640b1e7890333b6d7214a201f5d3f83a54a7840adb6450ffb7696e58722625b7c57c5 SHA512 285f12d3cb2edaca7507dd9dad1356b60076d43af678458346489562ea8933a01d61d2430d5282b6afd213839ee684ad83e5f523c9a272f382d74ccc238bd9d5
+EBUILD pdns-recursor-4.3.2.ebuild 1948 BLAKE2B 55673baa5e17e3ea95e049bd6901a86b657e55ef8e7980acb52a902642da29b33d4d4b7c87e40d454d7e66692757820faf59cd87ce0d86adb07c5a9082f261de SHA512 3f5e5e8d8fdce3eaba2410a2d953ca6ba84ee8008a3c7ca106843691705b31fc51eb84c0591420bc8b31e911463a9a301f01bd21b507ecf062daf9a9b52ac36b
+EBUILD pdns-recursor-4.3.3.ebuild 1950 BLAKE2B 3d4ca29820d37d1bd97f1d247a2384a4cbc59747eccec10d8851fc12dba7401fb4a0b2b5cb0995205d9c69e9cde11e28ac927923f82e9341c4f920c88827cf2c SHA512 b2c36166659af410264681fc2c0c55e258bf6c03bff1a95f7917f8da709f20a7606a89de2a886eb240f7be7b190036e76505c5a094ff50367e140961736e0d31
MISC metadata.xml 1008 BLAKE2B 1c82fd9262358bcf1ff0f8503bc8dfe9b640023133ca48711bc576df00312312b5e37a36ff10aac561ef1c71e20f64c5f0a4c431c60ca029220732fba0ee1bf9 SHA512 2deab5a88c42d3416b3da5b6d9d3ed9b2db0a5dcb3d8b7fc4c7a13b2219fd7df786bfef42ff5e3d7c2b40058592e892f380d126a0254013534e66e65499e7105
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 8244a456e643..000000000000
--- 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 <shoentjen@antagonist.nl>
-Date: Mon Dec 16 22:44:43 2019 +0100
-
- Fix build with gcc-10
-
- From an e-mail from Jeff Law <law@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.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild
deleted file mode 100644
index 378e02c50a60..000000000000
--- 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
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.2.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.2.ebuild
index cb9a0daba0e2..bffba0080a4c 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.3.2.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="debug dnstap libressl luajit protobuf snmp sodium systemd"
REQUIRED_USE="dnstap? ( protobuf )"
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.1-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.3.ebuild
index c2393a2b27e5..cb9a0daba0e2 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.3.1-r1.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.3.3.ebuild
@@ -37,8 +37,7 @@ BDEPEND="virtual/pkgconfig"
S="${WORKDIR}"/${P/_/-}
PATCHES=(
- "${FILESDIR}"/${P}-boost-1.73.0.patch
- "${FILESDIR}"/${P}-gcc-10.patch
+ "${FILESDIR}"/${PN}-4.3.1-boost-1.73.0.patch
)
pkg_setup() {