public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/, net-dns/pdns-recursor/files/
@ 2016-07-19 22:03 Sven Wegener
  0 siblings, 0 replies; 14+ messages in thread
From: Sven Wegener @ 2016-07-19 22:03 UTC (permalink / raw
  To: gentoo-commits

commit:     ff3fb60e40daf53c31d241107e8ffb3497d11583
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 21:08:11 2016 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 22:02:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff3fb60e

net-dns/pdns-recursor: Switch src_install() to upstream automake

Package-Manager: portage-2.2.28
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 net-dns/pdns-recursor/files/pdns-recursor        |  4 ++--
 net-dns/pdns-recursor/pdns-recursor-4.0.0.ebuild | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/net-dns/pdns-recursor/files/pdns-recursor b/net-dns/pdns-recursor/files/pdns-recursor
index 151176b..f114d5b 100644
--- a/net-dns/pdns-recursor/files/pdns-recursor
+++ b/net-dns/pdns-recursor/files/pdns-recursor
@@ -17,12 +17,12 @@ start() {
 
 stop() {
 	ebegin "Stopping PowerDNS Recursor"
-	/usr/sbin/rec_control quit &>/dev/null
+	/usr/bin/rec_control quit &>/dev/null
 	eend $?
 }
 
 ping() {
 	ebegin "Pinging PowerDNS Recursor"
-	/usr/sbin/rec_control ping &>/dev/null
+	/usr/bin/rec_control ping &>/dev/null
 	eend $?
 }

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.0.0.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.0.0.ebuild
index 4fd1a47..3927726 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.0.0.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.0.0.ebuild
@@ -44,11 +44,16 @@ src_configure() {
 }
 
 src_install() {
-	dosbin pdns_recursor rec_control
-	doman pdns_recursor.1 rec_control.1
+	default
 
-	insinto /etc/powerdns
-	doins "${FILESDIR}"/recursor.conf
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
+		-e 's/^# quiet=/quiet=on/' \
+		-e 's/^# chroot=/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
 
 	doinitd "${FILESDIR}"/pdns-recursor
 


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/, net-dns/pdns-recursor/files/
@ 2016-11-20 21:08 Sven Wegener
  0 siblings, 0 replies; 14+ messages in thread
From: Sven Wegener @ 2016-11-20 21:08 UTC (permalink / raw
  To: gentoo-commits

commit:     4bcf4c432dcff57befea68d05a7fe6f0ff87ab41
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 21:07:06 2016 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 21:07:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bcf4c43

net-dns/pdns-recursor: Fix building with disabled ECDSA support, bug #590370

Package-Manager: portage-2.3.0

 .../files/pdns-recursor-4.0.3-ecdsa.patch          | 29 ++++++++++++++++++++++
 net-dns/pdns-recursor/pdns-recursor-4.0.3.ebuild   |  1 +
 2 files changed, 30 insertions(+)

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.0.3-ecdsa.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.0.3-ecdsa.patch
new file mode 100644
index 00000000..52826c9
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.0.3-ecdsa.patch
@@ -0,0 +1,29 @@
+commit 3d59c6f7d83f54d5c73013de5ab61e9a0ecd1460
+Author: Remi Gacogne <remi.gacogne@powerdns.com>
+Date:   Mon Oct 17 10:07:26 2016 +0200
+
+    Fix building with ECDSA support disabled in libcrypto
+    
+    (cherry picked from commit aa74d164ae29269168d048d2cc8d7e1f984774c4)
+
+diff --git a/opensslsigners.cc b/opensslsigners.cc
+index 9e919a0..acf8f08 100644
+--- a/opensslsigners.cc
++++ b/opensslsigners.cc
+@@ -128,6 +128,7 @@ static inline int RSA_set0_crt_params(RSA* rsakey, BIGNUM* dmp1, BIGNUM* dmq1, B
+   return 1;
+ }
+ 
++#ifdef HAVE_LIBCRYPTO_ECDSA
+ static inline void ECDSA_SIG_get0(const ECDSA_SIG* signature, const BIGNUM** pr, const BIGNUM** ps) {
+   *pr = signature->r;
+   *ps = signature->s;
+@@ -140,6 +141,8 @@ static inline int ECDSA_SIG_set0(ECDSA_SIG* signature, BIGNUM* pr, BIGNUM* ps) {
+   signature->s = ps;
+   return 1;
+ }
++#endif /* HAVE_LIBCRYPTO_ECDSA */
++
+ #else
+ void openssl_thread_setup() {}
+ void openssl_thread_cleanup() {}

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.0.3.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.0.3.ebuild
index 321a847..954fcbd 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.0.3.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.0.3.ebuild
@@ -32,6 +32,7 @@ S="${WORKDIR}"/${P/_/-}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-boost-1.61-fcontext.patch
+	"${FILESDIR}"/${P}-ecdsa.patch
 )
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/, net-dns/pdns-recursor/files/
@ 2017-05-25 15:04 Sven Wegener
  0 siblings, 0 replies; 14+ messages in thread
From: Sven Wegener @ 2017-05-25 15:04 UTC (permalink / raw
  To: gentoo-commits

commit:     38f6898fabe5d0954bed1b965a9217679b5b43d7
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 13:26:33 2017 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Thu May 25 15:04:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38f6898f

net-dns/pdns-recursor: Update init script

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-dns/pdns-recursor/files/pdns-recursor-r1       | 37 +++++++++++
 .../pdns-recursor/pdns-recursor-4.0.4-r1.ebuild    | 75 ++++++++++++++++++++++
 2 files changed, 112 insertions(+)

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-r1 b/net-dns/pdns-recursor/files/pdns-recursor-r1
new file mode 100644
index 00000000000..57c9df1eaa4
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-r1
@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PDNS_CONFIGDIR="${PDNS_CONFIGDIR:-/etc/powerdns}"
+
+PDNS_CONFIG="${PDNS_CONFIGDIR}/recursor.conf"
+PDNS_CHROOTDIR="$( awk -F = '$1 == "chroot" { print $2 }' "${PDNS_CONFIG}" )"
+PDNS_SOCKETDIR="$( awk -F = '$1 == "socket-dir" { print $2 }' "${PDNS_CONFIG}" )"
+[ -z "${PDNS_SOCKETDIR}" -a -z "${PDNS_CHROOTDIR}" ] && PDNS_SOCKETDIR="/var/run"
+
+name="PowerDNS Recursor"
+description="Recursive name server"
+
+extra_started_commands="ping"
+description_ping="Ping the PowerDNS instance"
+
+command="/usr/sbin/pdns_recursor"
+command_args="--config-dir=${PDNS_CONFIGDIR}"
+command_args_foreground="--daemon=no"
+command_args_background="--daemon=yes"
+yesno ${rc_verbose} || command_args_background="${command_args_background} >/dev/null 2>&1"
+
+pidfile="${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}/pdns_recursor.pid"
+
+control_command="/usr/bin/rec_control"
+control_command_args="${command_args}"
+
+depend() {
+	need net
+}
+
+ping() {
+	ebegin "Pinging ${name}"
+	${control_command} ${control_command_args} ping >/dev/null 2>&1
+	eend $?
+}

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.0.4-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.0.4-r1.ebuild
new file mode 100644
index 00000000000..b748e27b710
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.0.4-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs flag-o-matic eutils versionator
+
+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="lua luajit protobuf systemd"
+REQUIRED_USE="?? ( lua luajit )"
+
+DEPEND="lua? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:= )
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42
+	)
+	systemd? ( sys-apps/systemd:0= )
+	>=dev-libs/boost-1.35"
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		$(use_enable systemd) \
+		$(use_with lua) \
+		$(use_with luajit) \
+		$(use_with protobuf)
+}
+
+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=nobody/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
+
+	keepdir /var/lib/powerdns
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		version_compare ${old} 4.0.0-r1
+		[[ $? -eq 1 ]] || 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
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/, net-dns/pdns-recursor/files/
@ 2017-10-30 13:27 Sven Wegener
  0 siblings, 0 replies; 14+ messages in thread
From: Sven Wegener @ 2017-10-30 13:27 UTC (permalink / raw
  To: gentoo-commits

commit:     ab156804ebf6f4d95dd19e8db0cef23a4f034f9d
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 30 10:22:39 2017 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 13:27:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab156804

net-dns/pdns-recursor: Cleanup

Package-Manager: Portage-2.3.8, Repoman-2.3.4

 net-dns/pdns-recursor/Manifest                     |   2 -
 net-dns/pdns-recursor/files/pdns-recursor          |  27 ----
 .../pdns-recursor-4.0.3-boost-1.61-fcontext.patch  | 152 ---------------------
 .../files/pdns-recursor-4.0.3-ecdsa.patch          |  29 ----
 .../pdns-recursor/pdns-recursor-4.0.4-r1.ebuild    |  75 ----------
 net-dns/pdns-recursor/pdns-recursor-4.0.4.ebuild   |  75 ----------
 net-dns/pdns-recursor/pdns-recursor-4.0.5.ebuild   |  75 ----------
 7 files changed, 435 deletions(-)

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index a8614864042..4ab0dbb01b1 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,4 +1,2 @@
-DIST pdns-recursor-4.0.4.tar.bz2 1050596 SHA256 2338778f49ccd03401e65f6f4b39047890e691c8ff6d810ecee45321fb4f1e4d SHA512 9473dfe9abc509b2bb953139dd7892de2027ee1508902fa0c2cd30dd9a88878fcf44370b8372d573cbab12de32bb8c604005d3b39ea34db2ef86786e689d36ab WHIRLPOOL b205ff800e49cba87f4796c7c2e4b5835119480dbcf07e404d37f86c65e7f45095fb2a936df0f82f85e6e869a87ec0355b1e5ddc5d29480e07397fc823fb1f6a
-DIST pdns-recursor-4.0.5.tar.bz2 1066145 SHA256 ba43ce4280b3a06afebe58c5d63680f51dd525c63d1de7f3b229b380e6b1b7af SHA512 30d41033d4650a496b2a699b03c8cb5adb3e803420330f09159cf7ca2ce1bab4818f4a9c9ce7a99d2676e31b1e30289198af1f049cd1f309b93f6aa1a05d4cb5 WHIRLPOOL e03097c44df5ca5222b33b9477a5f3e67334508a830b13054eed249ffb0cb254d66e7f3c6b302e5450b86cdee48146f12847348ac5e49777caf0094af34ad252
 DIST pdns-recursor-4.0.6.tar.bz2 1105423 SHA256 f2182ac644268bb08b865a71351f11d75c5015ac0608a1469eb4c1cd5494d60d SHA512 2203fd96469deded1da677344485da221eec036b1ad9fb418a89cd4477d73f2a6fcf984a39b574561df6946f440ddf1982de20cd39d7204da9c27e74216d1159 WHIRLPOOL a2eece8a6cdfcd6c791cb6fa42053d524b4e54f1431d78345640d7f2d9f3079939c7905767abe65abb977bce45647fb7232d1148dac13737625ee4bfae221da8
 DIST pdns-recursor-4.1.0-rc1.tar.bz2 1179746 SHA256 62c601ef0e591aebcae6be09b746f8384680a2b772a75dc23f0d8f4b4e54af77 SHA512 1dd602bf9ca089c94c8a2b76422e4a78ca734b11869e8f0a9d5e6e0c60d84aaf75c93ac2c4c578a6fb3659862b95d187ad13d15a64436b32339f309dcf74f7b1 WHIRLPOOL bf3ac171e0901476cb563ef20006f2a207412d799675313b66cc26aca9bd18810fd04ffe2d4b4abc8bde3589ec051d9604ab1420ebddc1d47ecd7a9329af8551

diff --git a/net-dns/pdns-recursor/files/pdns-recursor b/net-dns/pdns-recursor/files/pdns-recursor
deleted file mode 100644
index ebff2b02b85..00000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="ping"
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting PowerDNS Recursor"
-	/usr/sbin/pdns_recursor --daemon=yes >/dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping PowerDNS Recursor"
-	/usr/bin/rec_control quit >/dev/null 2>&1
-	eend $?
-}
-
-ping() {
-	ebegin "Pinging PowerDNS Recursor"
-	/usr/bin/rec_control ping >/dev/null 2>&1
-	eend $?
-}

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.0.3-boost-1.61-fcontext.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.0.3-boost-1.61-fcontext.patch
deleted file mode 100644
index c6cd9a32631..00000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-4.0.3-boost-1.61-fcontext.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-diff --git a/mtasker_fcontext.cc b/mtasker_fcontext.cc
-index bc37e76..8d96fa1 100644
---- a/mtasker_fcontext.cc
-+++ b/mtasker_fcontext.cc
-@@ -23,14 +23,15 @@
- #include <exception>
- #include <cassert>
- #include <type_traits>
--#if BOOST_VERSION > 106100
--#include <boost/context/detail/fcontext.hpp>
--#else
--#include <boost/context/fcontext.hpp>
--#endif
- #include <boost/version.hpp>
--
-+#if BOOST_VERSION < 106100
-+#include <boost/context/fcontext.hpp>
- using boost::context::make_fcontext;
-+#else
-+#include <boost/context/detail/fcontext.hpp>
-+using boost::context::detail::make_fcontext;
-+#endif /* BOOST_VERSION < 106100 */
-+
- 
- #if BOOST_VERSION < 105600
- /* Note: This typedef means functions taking fcontext_t*, like jump_fcontext(),
-@@ -61,8 +62,15 @@ jump_fcontext (fcontext_t* const ofc, fcontext_t const nfc,
-     }
- }
- #else
-+
-+#if BOOST_VERSION < 106100
- using boost::context::fcontext_t;
- using boost::context::jump_fcontext;
-+#else
-+using boost::context::detail::fcontext_t;
-+using boost::context::detail::jump_fcontext;
-+using boost::context::detail::transfer_t;
-+#endif /* BOOST_VERSION < 106100 */
- 
- static_assert (std::is_pointer<fcontext_t>::value,
-                "Boost Context has changed the fcontext_t type again :-(");
-@@ -72,7 +80,9 @@ static_assert (std::is_pointer<fcontext_t>::value,
-  * jump. args_t simply provides a way to pass more by reference.
-  */
- struct args_t {
-+#if BOOST_VERSION < 106100
-     fcontext_t prev_ctx = nullptr;
-+#endif
-     pdns_ucontext_t* self = nullptr;
-     boost::function<void(void)>* work = nullptr;
- };
-@@ -80,7 +90,11 @@ struct args_t {
- extern "C" {
- static
- void
-+#if BOOST_VERSION < 106100
- threadWrapper (intptr_t const xargs) {
-+#else
-+threadWrapper (transfer_t const t) {
-+#endif
-     /* Access the args passed from pdns_makecontext, and copy them directly from
-      * the calling stack on to ours (we're now using the MThreads stack).
-      * This saves heap allocating an args object, at the cost of an extra
-@@ -90,11 +104,28 @@ threadWrapper (intptr_t const xargs) {
-      * the behaviour of the System V implementation, which can inherently only
-      * be passed ints and pointers.
-      */
-+#if BOOST_VERSION < 106100
-     auto args = reinterpret_cast<args_t*>(xargs);
-+#else
-+    auto args = reinterpret_cast<args_t*>(t.data);
-+#endif
-     auto ctx = args->self;
-     auto work = args->work;
-+    /* we switch back to pdns_makecontext() */
-+#if BOOST_VERSION < 106100
-     jump_fcontext (reinterpret_cast<fcontext_t*>(&ctx->uc_mcontext),
-                    static_cast<fcontext_t>(args->prev_ctx), 0);
-+#else
-+    transfer_t res = jump_fcontext (t.fctx, 0);
-+    /* we got switched back from pdns_swapcontext() */
-+    if (res.data) {
-+      /* if res.data is not a nullptr, it holds a pointer to the context
-+         we just switched from, and we need to fill it to be able to
-+         switch back to it later. */
-+      fcontext_t* ptr = static_cast<fcontext_t*>(res.data);
-+      *ptr = res.fctx;
-+    }
-+#endif
-     args = nullptr;
- 
-     try {
-@@ -106,9 +137,14 @@ threadWrapper (intptr_t const xargs) {
- 
-     /* Emulate the System V uc_link feature. */
-     auto const next_ctx = ctx->uc_link->uc_mcontext;
-+#if BOOST_VERSION < 106100
-     jump_fcontext (reinterpret_cast<fcontext_t*>(&ctx->uc_mcontext),
-                    static_cast<fcontext_t>(next_ctx),
-                    static_cast<bool>(ctx->exception));
-+#else
-+    jump_fcontext (static_cast<fcontext_t>(next_ctx), 0);
-+#endif
-+
- #ifdef NDEBUG
-     __builtin_unreachable();
- #endif
-@@ -129,10 +165,27 @@ pdns_ucontext_t::~pdns_ucontext_t
- void
- pdns_swapcontext
- (pdns_ucontext_t& __restrict octx, pdns_ucontext_t const& __restrict ctx) {
-+  /* we either switch back to threadwrapper() if it's the first time,
-+     or we switch back to pdns_swapcontext(),
-+     in both case we will be returning from a call to jump_fcontext(). */
-+#if BOOST_VERSION < 106100
-     if (jump_fcontext (reinterpret_cast<fcontext_t*>(&octx.uc_mcontext),
-                        static_cast<fcontext_t>(ctx.uc_mcontext), 0)) {
-         std::rethrow_exception (ctx.exception);
-     }
-+#else
-+  transfer_t res = jump_fcontext (static_cast<fcontext_t>(ctx.uc_mcontext), &octx.uc_mcontext);
-+  if (res.data) {
-+    /* if res.data is not a nullptr, it holds a pointer to the context
-+       we just switched from, and we need to fill it to be able to
-+       switch back to it later. */
-+    fcontext_t* ptr = static_cast<fcontext_t*>(res.data);
-+    *ptr = res.fctx;
-+  }
-+  if (ctx.exception) {
-+    std::rethrow_exception (ctx.exception);
-+  }
-+#endif
- }
- 
- void
-@@ -146,7 +199,15 @@ pdns_makecontext
-     args_t args;
-     args.self = &ctx;
-     args.work = &start;
-+    /* jumping to threadwrapper */
-+#if BOOST_VERSION < 106100
-     jump_fcontext (reinterpret_cast<fcontext_t*>(&args.prev_ctx),
-                    static_cast<fcontext_t>(ctx.uc_mcontext),
-                    reinterpret_cast<intptr_t>(&args));
-+#else
-+    transfer_t res = jump_fcontext (static_cast<fcontext_t>(ctx.uc_mcontext),
-+                                    &args);
-+    /* back from threadwrapper, updating the context */
-+    ctx.uc_mcontext = res.fctx;
-+#endif
- }

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.0.3-ecdsa.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.0.3-ecdsa.patch
deleted file mode 100644
index 52826c9617a..00000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-4.0.3-ecdsa.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 3d59c6f7d83f54d5c73013de5ab61e9a0ecd1460
-Author: Remi Gacogne <remi.gacogne@powerdns.com>
-Date:   Mon Oct 17 10:07:26 2016 +0200
-
-    Fix building with ECDSA support disabled in libcrypto
-    
-    (cherry picked from commit aa74d164ae29269168d048d2cc8d7e1f984774c4)
-
-diff --git a/opensslsigners.cc b/opensslsigners.cc
-index 9e919a0..acf8f08 100644
---- a/opensslsigners.cc
-+++ b/opensslsigners.cc
-@@ -128,6 +128,7 @@ static inline int RSA_set0_crt_params(RSA* rsakey, BIGNUM* dmp1, BIGNUM* dmq1, B
-   return 1;
- }
- 
-+#ifdef HAVE_LIBCRYPTO_ECDSA
- static inline void ECDSA_SIG_get0(const ECDSA_SIG* signature, const BIGNUM** pr, const BIGNUM** ps) {
-   *pr = signature->r;
-   *ps = signature->s;
-@@ -140,6 +141,8 @@ static inline int ECDSA_SIG_set0(ECDSA_SIG* signature, BIGNUM* pr, BIGNUM* ps) {
-   signature->s = ps;
-   return 1;
- }
-+#endif /* HAVE_LIBCRYPTO_ECDSA */
-+
- #else
- void openssl_thread_setup() {}
- void openssl_thread_cleanup() {}

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.0.4-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.0.4-r1.ebuild
deleted file mode 100644
index b748e27b710..00000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.0.4-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs flag-o-matic eutils versionator
-
-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="lua luajit protobuf systemd"
-REQUIRED_USE="?? ( lua luajit )"
-
-DEPEND="lua? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42
-	)
-	systemd? ( sys-apps/systemd:0= )
-	>=dev-libs/boost-1.35"
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		$(use_enable systemd) \
-		$(use_with lua) \
-		$(use_with luajit) \
-		$(use_with protobuf)
-}
-
-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=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		version_compare ${old} 4.0.0-r1
-		[[ $? -eq 1 ]] || 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.0.4.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.0.4.ebuild
deleted file mode 100644
index 8b3e1791ecd..00000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.0.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs flag-o-matic eutils versionator
-
-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="lua luajit protobuf systemd"
-REQUIRED_USE="?? ( lua luajit )"
-
-DEPEND="lua? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42
-	)
-	systemd? ( sys-apps/systemd:0= )
-	>=dev-libs/boost-1.35"
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		$(use_enable systemd) \
-		$(use_with lua) \
-		$(use_with luajit) \
-		$(use_with protobuf)
-}
-
-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=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	doinitd "${FILESDIR}"/pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		version_compare ${old} 4.0.0-r1
-		[[ $? -eq 1 ]] || 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.0.5.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.0.5.ebuild
deleted file mode 100644
index b748e27b710..00000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.0.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs flag-o-matic eutils versionator
-
-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="lua luajit protobuf systemd"
-REQUIRED_USE="?? ( lua luajit )"
-
-DEPEND="lua? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42
-	)
-	systemd? ( sys-apps/systemd:0= )
-	>=dev-libs/boost-1.35"
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		$(use_enable systemd) \
-		$(use_with lua) \
-		$(use_with luajit) \
-		$(use_with protobuf)
-}
-
-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=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		version_compare ${old} 4.0.0-r1
-		[[ $? -eq 1 ]] || 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
-}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/, net-dns/pdns-recursor/files/
@ 2017-11-27 17:37 Sven Wegener
  0 siblings, 0 replies; 14+ messages in thread
From: Sven Wegener @ 2017-11-27 17:37 UTC (permalink / raw
  To: gentoo-commits

commit:     fe96aad50c79942fdd5fa760b018b44e2eb68df1
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 17:32:38 2017 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 17:36:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe96aad5

net-dns/pdns-recursor: Revision bump, security bug #638568

Package-Manager: Portage-2.3.14, Repoman-2.3.6
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 net-dns/pdns-recursor/Manifest                     |  4 +-
 .../pdns-recursor/files/CVE-2017-15090-4.0.6.patch | 15 ++++
 .../pdns-recursor/files/CVE-2017-15092-4.0.6.patch | 85 ++++++++++++++++++++++
 .../pdns-recursor/files/CVE-2017-15093-4.0.6.patch | 47 ++++++++++++
 .../pdns-recursor/files/CVE-2017-15094-4.0.6.patch | 28 +++++++
 .../pdns-recursor/pdns-recursor-4.0.6-r1.ebuild    | 79 ++++++++++++++++++++
 6 files changed, 256 insertions(+), 2 deletions(-)

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 6d455d53240..add5cf30b79 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,2 +1,2 @@
-DIST pdns-recursor-4.0.6.tar.bz2 1105423 SHA256 f2182ac644268bb08b865a71351f11d75c5015ac0608a1469eb4c1cd5494d60d SHA512 2203fd96469deded1da677344485da221eec036b1ad9fb418a89cd4477d73f2a6fcf984a39b574561df6946f440ddf1982de20cd39d7204da9c27e74216d1159 WHIRLPOOL a2eece8a6cdfcd6c791cb6fa42053d524b4e54f1431d78345640d7f2d9f3079939c7905767abe65abb977bce45647fb7232d1148dac13737625ee4bfae221da8
-DIST pdns-recursor-4.1.0-rc3.tar.bz2 1191353 SHA256 0b8bc3fec4cd39c62e53993ab7a87fc1f2b3d200df071a401775f33e47392169 SHA512 141e3fcbf5e7c81ae0228fb7a15c599ef5ae41e2c2d169e2f7b4f57c6c832ac40d3e20302d219ba565c4a514b1297906684247a1a56cd740e3ea0bff4a7da51d WHIRLPOOL b6e1c3cb233aff0ac10e1d0d4b5e3de508cf657e1f3fa27c3692e38c90f7af82cc6afe499915d1dbd78cdd5d5eb2ec814b2f3ae86ae6a3f353321abfbe191691
+DIST pdns-recursor-4.0.6.tar.bz2 1105423 BLAKE2B 50cc52f118630d4d8ce9876c2e11494a3c972ec90003c40fea36801eb08bd8b6173f876e6f53eb672ad8ff3da04e669946740a50f653a21459f25c1137d91297 SHA512 2203fd96469deded1da677344485da221eec036b1ad9fb418a89cd4477d73f2a6fcf984a39b574561df6946f440ddf1982de20cd39d7204da9c27e74216d1159
+DIST pdns-recursor-4.1.0-rc3.tar.bz2 1191353 BLAKE2B fcbc6f08f962c9c2f459448770406734eff2caab43b615690e9d910b65327e45182aa2c9bcadadeaa6eb3984a8cb463849d5e001ffb98bb618966da5b8557a8a SHA512 141e3fcbf5e7c81ae0228fb7a15c599ef5ae41e2c2d169e2f7b4f57c6c832ac40d3e20302d219ba565c4a514b1297906684247a1a56cd740e3ea0bff4a7da51d

diff --git a/net-dns/pdns-recursor/files/CVE-2017-15090-4.0.6.patch b/net-dns/pdns-recursor/files/CVE-2017-15090-4.0.6.patch
new file mode 100644
index 00000000000..fa0bfd099ab
--- /dev/null
+++ b/net-dns/pdns-recursor/files/CVE-2017-15090-4.0.6.patch
@@ -0,0 +1,15 @@
+diff -ru pdns-recursor-4.0.6.orig/validate-recursor.cc pdns-recursor-4.0.6/validate-recursor.cc
+--- pdns-recursor-4.0.6.orig/validate-recursor.cc	2017-07-04 17:43:07.000000000 +0200
++++ pdns-recursor-4.0.6/validate-recursor.cc	2017-11-02 18:29:16.612520450 +0100
+@@ -87,6 +87,11 @@
+     bool first = true;
+     for(const auto& csp : cspmap) {
+       for(const auto& sig : csp.second.signatures) {
++
++        if (!csp.first.first.isPartOf(sig->d_signer)) {
++          return increaseDNSSECStateCounter(Bogus);
++        }
++
+         vState newState = getKeysFor(sro, sig->d_signer, keys); // XXX check validity here
+ 
+         if (newState == Bogus) // No hope

diff --git a/net-dns/pdns-recursor/files/CVE-2017-15092-4.0.6.patch b/net-dns/pdns-recursor/files/CVE-2017-15092-4.0.6.patch
new file mode 100644
index 00000000000..1425c33586c
--- /dev/null
+++ b/net-dns/pdns-recursor/files/CVE-2017-15092-4.0.6.patch
@@ -0,0 +1,85 @@
+diff -ru pdns-recursor-4.0.6.orig/html/local.js pdns-recursor-4.0.6/html/local.js
+--- pdns-recursor-4.0.6.orig/html/local.js	2017-07-04 17:43:07.000000000 +0200
++++ pdns-recursor-4.0.6/html/local.js	2017-11-02 18:26:04.624586674 +0100
+@@ -63,7 +63,7 @@
+ 
+ 	$.getJSON(qstring,
+ 		  function(data) {
+-		      var bouw="<table><tr><th>Number</th><th>Domain</th><th>Type</th></tr>";
++		      var table = $('<table><tr><th>Number</th><th>Domain</th><th>Type</th></tr></table>');
+ 		      var num=0;
+ 		      var total=0, rest=0;
+ 		      $.each(data["entries"], function(a,b) {
+@@ -75,12 +75,26 @@
+ 			  if(b[1].length > 25)
+ 			      b[1]=b[1].substring(0,25);
+ 
+-			  bouw=bouw+("<tr><td>"+b[0]+"</td><td>"+b[1]+"</td><td>"+b[2]+"</td></tr>");
+-		      });
+-		      bouw+="<tr><td>"+rest+"</td><td>Rest</td></tr>";
+-		      bouw=bouw+"</table>";
+-		      $("#queryring").html(bouw);
+-
++			  var line = $('<tr />');
++			  var number = $('<td />');
++			  number.text(b[0]);
++			  var domain = $('<td />');
++			  domain.text(b[1]);
++			  var type = $('<td />');
++			  type.text(b[2]);
++			  line.append(number);
++			  line.append(domain);
++			  line.append(type);
++			  table.append(line);
++                      });
++		      var line = $('<tr />');
++		      var number = $('<td />');
++		      number.text(rest);
++		      var label = $('<td>Rest</td>');
++		      line.append(number);
++		      line.append(label);
++		      table.append(line);
++		      $("#queryring").html(table);
+ 		  });
+ 
+ 	filtered=$("#filter2").is(':checked')
+@@ -91,7 +105,7 @@
+ 
+ 	$.getJSON(qstring, 
+ 		  function(data) {
+-		      var bouw="<table><tr><th>Number</th><th>Servfail domain</th><th>Type</th></tr>";
++		      var table = $('<table><tr><th>Number</th><th>Servfail domain</th><th>Type</th></tr></table>');
+ 		      var num=0, total=0, rest=0;
+ 		      $.each(data["entries"], function(a,b) {
+ 			  total+=b[0];
+@@ -101,11 +115,26 @@
+ 			  }
+ 			  if(b[1].length > 25)
+ 			      b[1]=b[1].substring(0,25);
+-			  bouw=bouw+("<tr><td>"+b[0]+"</td><td>"+b[1]+"</td><td>"+b[2]+"</td></tr>");
++			  var line = $('<tr />');
++			  var number = $('<td />');
++			  number.text(b[0]);
++			  var domain = $('<td />');
++			  domain.text(b[1]);
++			  var type = $('<td />');
++			  type.text(b[2]);
++			  line.append(number);
++			  line.append(domain);
++			  line.append(type);
++			  table.append(line);
+ 		      });
+-		      bouw+="<tr><td>"+rest+"</td><td>Rest</td></tr>";
+-		      bouw=bouw+"</table>";
+-		      $("#servfailqueryring").html(bouw);
++		      var line = $('<tr />');
++		      var number = $('<td />');
++		      number.text(rest);
++		      var label = $('<td>Rest</td>');
++		      line.append(number);
++		      line.append(label);
++		      table.append(line);
++		      $("#servfailqueryring").html(table);
+ 
+ 		  });
+ 

diff --git a/net-dns/pdns-recursor/files/CVE-2017-15093-4.0.6.patch b/net-dns/pdns-recursor/files/CVE-2017-15093-4.0.6.patch
new file mode 100644
index 00000000000..2695830b442
--- /dev/null
+++ b/net-dns/pdns-recursor/files/CVE-2017-15093-4.0.6.patch
@@ -0,0 +1,47 @@
+diff -ru pdns-recursor-4.0.6.orig/ws-recursor.cc pdns-recursor-4.0.6/ws-recursor.cc
+--- pdns-recursor-4.0.6.orig/ws-recursor.cc	2017-07-04 17:43:07.000000000 +0200
++++ pdns-recursor-4.0.6/ws-recursor.cc	2017-11-02 18:13:55.762458134 +0100
+@@ -76,10 +76,11 @@
+       throw ApiException("'value' must be an array");
+     }
+ 
++    NetmaskGroup nmg;
+     for (auto value : jlist.array_items()) {
+       try {
+-        Netmask(value.string_value());
+-      } catch (NetmaskException &e) {
++        nmg.addMask(value.string_value());
++      } catch (const NetmaskException &e) {
+         throw ApiException(e.reason);
+       }
+     }
+@@ -91,9 +92,7 @@
+ 
+     // Clear allow-from, and provide a "parent" value
+     ss << "allow-from=" << endl;
+-    for (auto value : jlist.array_items()) {
+-      ss << "allow-from+=" << value.string_value() << endl;
+-    }
++    ss << "allow-from+=" << nmg.toString() << endl;
+ 
+     apiWriteConfigFile("allow-from", ss.str());
+ 
+@@ -201,10 +200,15 @@
+       if (server == "") {
+         throw ApiException("Forwarded-to server must not be an empty string");
+       }
+-      if (!serverlist.empty()) {
+-        serverlist += ";";
++      try {
++        ComboAddress ca = parseIPAndPort(server, 53);
++        if (!serverlist.empty()) {
++          serverlist += ";";
++        }
++        serverlist += ca.toStringWithPort();
++      } catch (const PDNSException &e) {
++        throw ApiException(e.reason);
+       }
+-      serverlist += server;
+     }
+     if (serverlist == "")
+       throw ApiException("Need at least one upstream server when forwarding");

diff --git a/net-dns/pdns-recursor/files/CVE-2017-15094-4.0.6.patch b/net-dns/pdns-recursor/files/CVE-2017-15094-4.0.6.patch
new file mode 100644
index 00000000000..ee7cf6878d9
--- /dev/null
+++ b/net-dns/pdns-recursor/files/CVE-2017-15094-4.0.6.patch
@@ -0,0 +1,28 @@
+diff -ru pdns-recursor-4.0.6.orig/opensslsigners.cc pdns-recursor-4.0.6/opensslsigners.cc
+--- pdns-recursor-4.0.6.orig/opensslsigners.cc	2017-07-04 17:43:07.000000000 +0200
++++ pdns-recursor-4.0.6/opensslsigners.cc	2017-11-02 18:18:37.489408103 +0100
+@@ -474,7 +474,7 @@
+   if (iqmp == NULL) {
+     RSA_free(key);
+     BN_clear_free(dmq1);
+-    BN_clear_free(iqmp);
++    BN_clear_free(dmp1);
+     throw runtime_error(getName()+" allocation of BIGNUM iqmp failed");
+   }
+   RSA_set0_crt_params(key, dmp1, dmq1, iqmp);
+@@ -562,6 +562,7 @@
+   BIGNUM *n = BN_bin2bn((unsigned char*)modulus.c_str(), modulus.length(), NULL);
+   if (!n) {
+     RSA_free(key);
++    BN_clear_free(e);
+     throw runtime_error(getName()+" error loading n value of public key");
+   }
+ 
+@@ -866,6 +867,7 @@
+ 
+   int ret = EC_POINT_oct2point(d_ecgroup, pub_key, (unsigned char*) ecdsaPoint.c_str(), ecdsaPoint.length(), d_ctx);
+   if (ret != 1) {
++    EC_POINT_free(pub_key);
+     throw runtime_error(getName()+" reading ECP point from binary failed");
+   }
+ 

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.0.6-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.0.6-r1.ebuild
new file mode 100644
index 00000000000..f9b248316b3
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.0.6-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs flag-o-matic eutils versionator
+
+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="lua luajit protobuf systemd"
+REQUIRED_USE="?? ( lua luajit )"
+
+DEPEND="lua? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:= )
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	systemd? ( sys-apps/systemd:0= )
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/CVE-2017-{15090,15092,15093,15094}-4.0.6.patch
+)
+
+pkg_setup() {
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		$(use_enable systemd) \
+		$(use_with lua) \
+		$(use_with luajit) \
+		$(use_with protobuf)
+}
+
+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=nobody/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
+
+	keepdir /var/lib/powerdns
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		version_compare ${old} 4.0.0-r1
+		[[ $? -eq 1 ]] || 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
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/, net-dns/pdns-recursor/files/
@ 2017-12-03 22:42 Sven Wegener
  0 siblings, 0 replies; 14+ messages in thread
From: Sven Wegener @ 2017-12-03 22:42 UTC (permalink / raw
  To: gentoo-commits

commit:     35bcdfdde75be76491c9e2c9e2b4263c0be411da
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 22:41:10 2017 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 22:41:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35bcdfdd

net-dns/pdns-recursor: Cleanup

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 net-dns/pdns-recursor/Manifest                     |  1 -
 .../pdns-recursor/files/CVE-2017-15090-4.0.6.patch | 15 ----
 .../pdns-recursor/files/CVE-2017-15092-4.0.6.patch | 85 ----------------------
 .../pdns-recursor/pdns-recursor-4.0.6-r1.ebuild    | 81 ---------------------
 net-dns/pdns-recursor/pdns-recursor-4.0.6.ebuild   | 77 --------------------
 5 files changed, 259 deletions(-)

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index d508e86709a..587e95d0995 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,3 +1,2 @@
-DIST pdns-recursor-4.0.6.tar.bz2 1105423 BLAKE2B 50cc52f118630d4d8ce9876c2e11494a3c972ec90003c40fea36801eb08bd8b6173f876e6f53eb672ad8ff3da04e669946740a50f653a21459f25c1137d91297 SHA512 2203fd96469deded1da677344485da221eec036b1ad9fb418a89cd4477d73f2a6fcf984a39b574561df6946f440ddf1982de20cd39d7204da9c27e74216d1159
 DIST pdns-recursor-4.0.7.tar.bz2 1107546 BLAKE2B 3ccda73878599e3ade69e4dc6b0787e588a8403fb7cacfbe574409513b8723cbfd29a3c73d857120def801da60a4bedbc0f0c396e6642adb0287204cde301331 SHA512 0c8873adcce5ed9b41f161bc71635da23496b4ae48dbffff7dcdf9c5181e720f9aa94e18bd64e0dff9fa03eae8410dc93585a74d13f0c16d38b0d1c0f4146bb2
 DIST pdns-recursor-4.1.0-rc3.tar.bz2 1191353 BLAKE2B fcbc6f08f962c9c2f459448770406734eff2caab43b615690e9d910b65327e45182aa2c9bcadadeaa6eb3984a8cb463849d5e001ffb98bb618966da5b8557a8a SHA512 141e3fcbf5e7c81ae0228fb7a15c599ef5ae41e2c2d169e2f7b4f57c6c832ac40d3e20302d219ba565c4a514b1297906684247a1a56cd740e3ea0bff4a7da51d

diff --git a/net-dns/pdns-recursor/files/CVE-2017-15090-4.0.6.patch b/net-dns/pdns-recursor/files/CVE-2017-15090-4.0.6.patch
deleted file mode 100644
index fa0bfd099ab..00000000000
--- a/net-dns/pdns-recursor/files/CVE-2017-15090-4.0.6.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru pdns-recursor-4.0.6.orig/validate-recursor.cc pdns-recursor-4.0.6/validate-recursor.cc
---- pdns-recursor-4.0.6.orig/validate-recursor.cc	2017-07-04 17:43:07.000000000 +0200
-+++ pdns-recursor-4.0.6/validate-recursor.cc	2017-11-02 18:29:16.612520450 +0100
-@@ -87,6 +87,11 @@
-     bool first = true;
-     for(const auto& csp : cspmap) {
-       for(const auto& sig : csp.second.signatures) {
-+
-+        if (!csp.first.first.isPartOf(sig->d_signer)) {
-+          return increaseDNSSECStateCounter(Bogus);
-+        }
-+
-         vState newState = getKeysFor(sro, sig->d_signer, keys); // XXX check validity here
- 
-         if (newState == Bogus) // No hope

diff --git a/net-dns/pdns-recursor/files/CVE-2017-15092-4.0.6.patch b/net-dns/pdns-recursor/files/CVE-2017-15092-4.0.6.patch
deleted file mode 100644
index 1425c33586c..00000000000
--- a/net-dns/pdns-recursor/files/CVE-2017-15092-4.0.6.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -ru pdns-recursor-4.0.6.orig/html/local.js pdns-recursor-4.0.6/html/local.js
---- pdns-recursor-4.0.6.orig/html/local.js	2017-07-04 17:43:07.000000000 +0200
-+++ pdns-recursor-4.0.6/html/local.js	2017-11-02 18:26:04.624586674 +0100
-@@ -63,7 +63,7 @@
- 
- 	$.getJSON(qstring,
- 		  function(data) {
--		      var bouw="<table><tr><th>Number</th><th>Domain</th><th>Type</th></tr>";
-+		      var table = $('<table><tr><th>Number</th><th>Domain</th><th>Type</th></tr></table>');
- 		      var num=0;
- 		      var total=0, rest=0;
- 		      $.each(data["entries"], function(a,b) {
-@@ -75,12 +75,26 @@
- 			  if(b[1].length > 25)
- 			      b[1]=b[1].substring(0,25);
- 
--			  bouw=bouw+("<tr><td>"+b[0]+"</td><td>"+b[1]+"</td><td>"+b[2]+"</td></tr>");
--		      });
--		      bouw+="<tr><td>"+rest+"</td><td>Rest</td></tr>";
--		      bouw=bouw+"</table>";
--		      $("#queryring").html(bouw);
--
-+			  var line = $('<tr />');
-+			  var number = $('<td />');
-+			  number.text(b[0]);
-+			  var domain = $('<td />');
-+			  domain.text(b[1]);
-+			  var type = $('<td />');
-+			  type.text(b[2]);
-+			  line.append(number);
-+			  line.append(domain);
-+			  line.append(type);
-+			  table.append(line);
-+                      });
-+		      var line = $('<tr />');
-+		      var number = $('<td />');
-+		      number.text(rest);
-+		      var label = $('<td>Rest</td>');
-+		      line.append(number);
-+		      line.append(label);
-+		      table.append(line);
-+		      $("#queryring").html(table);
- 		  });
- 
- 	filtered=$("#filter2").is(':checked')
-@@ -91,7 +105,7 @@
- 
- 	$.getJSON(qstring, 
- 		  function(data) {
--		      var bouw="<table><tr><th>Number</th><th>Servfail domain</th><th>Type</th></tr>";
-+		      var table = $('<table><tr><th>Number</th><th>Servfail domain</th><th>Type</th></tr></table>');
- 		      var num=0, total=0, rest=0;
- 		      $.each(data["entries"], function(a,b) {
- 			  total+=b[0];
-@@ -101,11 +115,26 @@
- 			  }
- 			  if(b[1].length > 25)
- 			      b[1]=b[1].substring(0,25);
--			  bouw=bouw+("<tr><td>"+b[0]+"</td><td>"+b[1]+"</td><td>"+b[2]+"</td></tr>");
-+			  var line = $('<tr />');
-+			  var number = $('<td />');
-+			  number.text(b[0]);
-+			  var domain = $('<td />');
-+			  domain.text(b[1]);
-+			  var type = $('<td />');
-+			  type.text(b[2]);
-+			  line.append(number);
-+			  line.append(domain);
-+			  line.append(type);
-+			  table.append(line);
- 		      });
--		      bouw+="<tr><td>"+rest+"</td><td>Rest</td></tr>";
--		      bouw=bouw+"</table>";
--		      $("#servfailqueryring").html(bouw);
-+		      var line = $('<tr />');
-+		      var number = $('<td />');
-+		      number.text(rest);
-+		      var label = $('<td>Rest</td>');
-+		      line.append(number);
-+		      line.append(label);
-+		      table.append(line);
-+		      $("#servfailqueryring").html(table);
- 
- 		  });
- 

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.0.6-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.0.6-r1.ebuild
deleted file mode 100644
index 30f31e4cc5b..00000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.0.6-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs flag-o-matic eutils versionator
-
-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="libressl lua luajit protobuf systemd"
-REQUIRED_USE="?? ( lua luajit )"
-
-DEPEND="lua? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-PATCHES=(
-	"${FILESDIR}"/CVE-2017-{15090,15092,15093,15094}-4.0.6.patch
-)
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		$(use_enable systemd) \
-		$(use_with lua) \
-		$(use_with luajit) \
-		$(use_with protobuf)
-}
-
-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=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		version_compare ${old} 4.0.0-r1
-		[[ $? -eq 1 ]] || 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.0.6.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.0.6.ebuild
deleted file mode 100644
index 8ad027121b3..00000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.0.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs flag-o-matic eutils versionator
-
-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="libressl lua luajit protobuf systemd"
-REQUIRED_USE="?? ( lua luajit )"
-
-DEPEND="lua? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:= )
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	systemd? ( sys-apps/systemd:0= )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		$(use_enable systemd) \
-		$(use_with lua) \
-		$(use_with luajit) \
-		$(use_with protobuf)
-}
-
-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=nobody/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		version_compare ${old} 4.0.0-r1
-		[[ $? -eq 1 ]] || 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
-}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/, net-dns/pdns-recursor/files/
@ 2017-12-04 15:46 Sven Wegener
  0 siblings, 0 replies; 14+ messages in thread
From: Sven Wegener @ 2017-12-04 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     c5edd5a90d920ff49ad549fe840599e3dc63fc0f
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  4 15:41:21 2017 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Mon Dec  4 15:41:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5edd5a9

net-dns/pdns-recursor: Version bump

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 net-dns/pdns-recursor/Manifest                     |  2 +-
 .../pdns-recursor/files/CVE-2017-15093-4.0.6.patch | 47 ----------------------
 .../pdns-recursor/files/CVE-2017-15094-4.0.6.patch | 28 -------------
 ....0_rc3-r1.ebuild => pdns-recursor-4.1.0.ebuild} |  4 --
 4 files changed, 1 insertion(+), 80 deletions(-)

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 587e95d0995..c9752e96db9 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,2 +1,2 @@
 DIST pdns-recursor-4.0.7.tar.bz2 1107546 BLAKE2B 3ccda73878599e3ade69e4dc6b0787e588a8403fb7cacfbe574409513b8723cbfd29a3c73d857120def801da60a4bedbc0f0c396e6642adb0287204cde301331 SHA512 0c8873adcce5ed9b41f161bc71635da23496b4ae48dbffff7dcdf9c5181e720f9aa94e18bd64e0dff9fa03eae8410dc93585a74d13f0c16d38b0d1c0f4146bb2
-DIST pdns-recursor-4.1.0-rc3.tar.bz2 1191353 BLAKE2B fcbc6f08f962c9c2f459448770406734eff2caab43b615690e9d910b65327e45182aa2c9bcadadeaa6eb3984a8cb463849d5e001ffb98bb618966da5b8557a8a SHA512 141e3fcbf5e7c81ae0228fb7a15c599ef5ae41e2c2d169e2f7b4f57c6c832ac40d3e20302d219ba565c4a514b1297906684247a1a56cd740e3ea0bff4a7da51d
+DIST pdns-recursor-4.1.0.tar.bz2 1222751 BLAKE2B b2b5a7dee227b28eb3a1451a4d07cb1804e039e6b405c332f30fbb8df39f395906607f3c074b2469b01885b702d12e86e4ffd6114811404134c16956905c744f SHA512 1e4d70f3794005c3f45b2ec0ab580c3697e7de3096f3378b9b9d1cd53f10f95e577522ca9f634eb235b166f007e8a2bfa99f312ddf19f266ad4bb0965167fd7c

diff --git a/net-dns/pdns-recursor/files/CVE-2017-15093-4.0.6.patch b/net-dns/pdns-recursor/files/CVE-2017-15093-4.0.6.patch
deleted file mode 100644
index 2695830b442..00000000000
--- a/net-dns/pdns-recursor/files/CVE-2017-15093-4.0.6.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ru pdns-recursor-4.0.6.orig/ws-recursor.cc pdns-recursor-4.0.6/ws-recursor.cc
---- pdns-recursor-4.0.6.orig/ws-recursor.cc	2017-07-04 17:43:07.000000000 +0200
-+++ pdns-recursor-4.0.6/ws-recursor.cc	2017-11-02 18:13:55.762458134 +0100
-@@ -76,10 +76,11 @@
-       throw ApiException("'value' must be an array");
-     }
- 
-+    NetmaskGroup nmg;
-     for (auto value : jlist.array_items()) {
-       try {
--        Netmask(value.string_value());
--      } catch (NetmaskException &e) {
-+        nmg.addMask(value.string_value());
-+      } catch (const NetmaskException &e) {
-         throw ApiException(e.reason);
-       }
-     }
-@@ -91,9 +92,7 @@
- 
-     // Clear allow-from, and provide a "parent" value
-     ss << "allow-from=" << endl;
--    for (auto value : jlist.array_items()) {
--      ss << "allow-from+=" << value.string_value() << endl;
--    }
-+    ss << "allow-from+=" << nmg.toString() << endl;
- 
-     apiWriteConfigFile("allow-from", ss.str());
- 
-@@ -201,10 +200,15 @@
-       if (server == "") {
-         throw ApiException("Forwarded-to server must not be an empty string");
-       }
--      if (!serverlist.empty()) {
--        serverlist += ";";
-+      try {
-+        ComboAddress ca = parseIPAndPort(server, 53);
-+        if (!serverlist.empty()) {
-+          serverlist += ";";
-+        }
-+        serverlist += ca.toStringWithPort();
-+      } catch (const PDNSException &e) {
-+        throw ApiException(e.reason);
-       }
--      serverlist += server;
-     }
-     if (serverlist == "")
-       throw ApiException("Need at least one upstream server when forwarding");

diff --git a/net-dns/pdns-recursor/files/CVE-2017-15094-4.0.6.patch b/net-dns/pdns-recursor/files/CVE-2017-15094-4.0.6.patch
deleted file mode 100644
index ee7cf6878d9..00000000000
--- a/net-dns/pdns-recursor/files/CVE-2017-15094-4.0.6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru pdns-recursor-4.0.6.orig/opensslsigners.cc pdns-recursor-4.0.6/opensslsigners.cc
---- pdns-recursor-4.0.6.orig/opensslsigners.cc	2017-07-04 17:43:07.000000000 +0200
-+++ pdns-recursor-4.0.6/opensslsigners.cc	2017-11-02 18:18:37.489408103 +0100
-@@ -474,7 +474,7 @@
-   if (iqmp == NULL) {
-     RSA_free(key);
-     BN_clear_free(dmq1);
--    BN_clear_free(iqmp);
-+    BN_clear_free(dmp1);
-     throw runtime_error(getName()+" allocation of BIGNUM iqmp failed");
-   }
-   RSA_set0_crt_params(key, dmp1, dmq1, iqmp);
-@@ -562,6 +562,7 @@
-   BIGNUM *n = BN_bin2bn((unsigned char*)modulus.c_str(), modulus.length(), NULL);
-   if (!n) {
-     RSA_free(key);
-+    BN_clear_free(e);
-     throw runtime_error(getName()+" error loading n value of public key");
-   }
- 
-@@ -866,6 +867,7 @@
- 
-   int ret = EC_POINT_oct2point(d_ecgroup, pub_key, (unsigned char*) ecdsaPoint.c_str(), ecdsaPoint.length(), d_ctx);
-   if (ret != 1) {
-+    EC_POINT_free(pub_key);
-     throw runtime_error(getName()+" reading ECP point from binary failed");
-   }
- 

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.0_rc3-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.0.ebuild
similarity index 96%
rename from net-dns/pdns-recursor/pdns-recursor-4.1.0_rc3-r1.ebuild
rename to net-dns/pdns-recursor/pdns-recursor-4.1.0.ebuild
index 224ae2f7537..346091e0ec1 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.1.0_rc3-r1.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.0.ebuild
@@ -33,10 +33,6 @@ DEPEND="${DEPEND}
 
 S="${WORKDIR}"/${P/_/-}
 
-PATCHES=(
-	"${FILESDIR}"/CVE-2017-{15093,15094}-4.0.6.patch
-)
-
 pkg_setup() {
 	filter-flags -ftree-vectorize
 }


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/, net-dns/pdns-recursor/files/
@ 2020-03-11 13:43 Sven Wegener
  0 siblings, 0 replies; 14+ messages in thread
From: Sven Wegener @ 2020-03-11 13:43 UTC (permalink / raw
  To: gentoo-commits

commit:     393659df4d7ee528efa246d674038918e551d3e4
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 11 13:26:18 2020 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Wed Mar 11 13:43:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=393659df

net-dns/pdns-recursor: Revision bump for new acct packages

This also uses the new users for dropping privileges.

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 net-dns/pdns-recursor/files/pdns-recursor-r2       | 41 ++++++++++++++++++++++
 ...-4.3.0.ebuild => pdns-recursor-4.3.0-r1.ebuild} | 10 +++---
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-r2 b/net-dns/pdns-recursor/files/pdns-recursor-r2
new file mode 100644
index 00000000000..01ce79167bb
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-r2
@@ -0,0 +1,41 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+PDNS_CONFIGDIR="${PDNS_CONFIGDIR:-/etc/powerdns}"
+
+PDNS_CONFIG="${PDNS_CONFIGDIR}/recursor.conf"
+PDNS_CHROOTDIR="$( awk -F = '$1 == "chroot" { print $2 }' "${PDNS_CONFIG}" )"
+PDNS_SOCKETDIR="$( awk -F = '$1 == "socket-dir" { print $2 }' "${PDNS_CONFIG}" )"
+[ -z "${PDNS_SOCKETDIR}" -a -z "${PDNS_CHROOTDIR}" ] && PDNS_SOCKETDIR="/var/run/pdns-recursor"
+
+name="PowerDNS Recursor"
+description="Recursive name server"
+
+extra_started_commands="ping"
+description_ping="Ping the PowerDNS instance"
+
+command="/usr/sbin/pdns_recursor"
+command_args="--config-dir=${PDNS_CONFIGDIR} --write-pid=yes"
+command_args_foreground="--daemon=no"
+command_args_background="--daemon=yes"
+yesno ${rc_verbose} || command_args_background="${command_args_background} >/dev/null 2>&1"
+
+pidfile="${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}/pdns_recursor.pid"
+
+control_command="/usr/bin/rec_control"
+control_command_args="${command_args}"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	checkpath --directory --mode 750 "${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}"
+}
+
+ping() {
+	ebegin "Pinging ${name}"
+	${control_command} ${control_command_args} ping >/dev/null 2>&1
+	eend $?
+}

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.0.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.0-r1.ebuild
similarity index 91%
rename from net-dns/pdns-recursor/pdns-recursor-4.3.0.ebuild
rename to net-dns/pdns-recursor/pdns-recursor-4.3.0-r1.ebuild
index d3ed153e567..fa5437a3d38 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.3.0.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.3.0-r1.ebuild
@@ -27,7 +27,9 @@ DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
 	!libressl? ( dev-libs/openssl:= )
 	>=dev-libs/boost-1.35:="
 RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
+	!<net-dns/pdns-2.9.20-r1
+	acct-user/pdns
+	acct-group/pdns"
 BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"/${P/_/-}
@@ -54,14 +56,12 @@ src_install() {
 
 	# set defaults: setuid=nobody, setgid=nobody
 	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
+		-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-r1 pdns-recursor
-
-	keepdir /var/lib/powerdns
+	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/, net-dns/pdns-recursor/files/
@ 2020-05-20 21:32 Sven Wegener
  0 siblings, 0 replies; 14+ messages in thread
From: Sven Wegener @ 2020-05-20 21:32 UTC (permalink / raw
  To: gentoo-commits

commit:     04738da286478377dba8c13b33f7a470698a3d84
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Wed May 20 21:27:05 2020 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Wed May 20 21:31:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04738da2

net-dns/pdns-recursor: Fix building with boost-1.73, bug #719926

Closes: https://bugs.gentoo.org/719926
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 .../files/pdns-recursor-4.3.1-boost-1.73.0.patch   | 89 ++++++++++++++++++++++
 net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild   |  4 +
 2 files changed, 93 insertions(+)

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-boost-1.73.0.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-boost-1.73.0.patch
new file mode 100644
index 00000000000..02b8df751ef
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.3.1-boost-1.73.0.patch
@@ -0,0 +1,89 @@
+From 71246536642590e8e8b21c11307ec4bd0e165066 Mon Sep 17 00:00:00 2001
+From: Remi Gacogne <remi.gacogne@powerdns.com>
+Date: Tue, 28 Apr 2020 17:51:47 +0200
+Subject: [PATCH] Replace boost's placeholders with the ones from the std
+ namespace
+
+Boost 1.73 moved boost::bind placeholders to the placeholders
+namespace which did not exist before 1.60, let's switch to
+std::bind and std::placeholders instead of doing per-version handling.
+---
+ pdns/ixfrdist-web.cc |  2 +-
+ pdns/webserver.cc    |  6 +++---
+ pdns/ws-auth.cc      |  4 ++--
+ pdns/ws-recursor.cc  | 12 ++++++------
+ 4 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/webserver.cc b/webserver.cc
+index eafd3059a0..b47cc6d7e0 100644
+--- a/webserver.cc
++++ b/webserver.cc
+@@ -107,7 +107,7 @@ static void bareHandlerWrapper(WebServer::HandlerFunction handler, YaHTTP::Reque
+ 
+ void WebServer::registerBareHandler(const string& url, HandlerFunction handler)
+ {
+-  YaHTTP::THandlerFunction f = boost::bind(&bareHandlerWrapper, handler, _1, _2);
++  YaHTTP::THandlerFunction f = std::bind(&bareHandlerWrapper, handler, std::placeholders::_1, std::placeholders::_2);
+   YaHTTP::Router::Any(url, f);
+ }
+ 
+@@ -179,7 +179,7 @@ void WebServer::apiWrapper(WebServer::HandlerFunction handler, HttpRequest* req,
+ }
+ 
+ void WebServer::registerApiHandler(const string& url, HandlerFunction handler, bool allowPassword) {
+-  HandlerFunction f = boost::bind(&WebServer::apiWrapper, this, handler, _1, _2, allowPassword);
++  HandlerFunction f = std::bind(&WebServer::apiWrapper, this, handler, std::placeholders::_1, std::placeholders::_2, allowPassword);
+   registerBareHandler(url, f);
+ }
+ 
+@@ -196,7 +196,7 @@ void WebServer::webWrapper(WebServer::HandlerFunction handler, HttpRequest* req,
+ }
+ 
+ void WebServer::registerWebHandler(const string& url, HandlerFunction handler) {
+-  HandlerFunction f = boost::bind(&WebServer::webWrapper, this, handler, _1, _2);
++  HandlerFunction f = std::bind(&WebServer::webWrapper, this, handler, std::placeholders::_1, std::placeholders::_2);
+   registerBareHandler(url, f);
+ }
+ 
+diff --git a/ws-recursor.cc b/ws-recursor.cc
+index cd8997309f..a074460c2f 100644
+--- a/ws-recursor.cc
++++ b/ws-recursor.cc
+@@ -382,9 +382,9 @@ static void apiServerCacheFlush(HttpRequest* req, HttpResponse* resp) {
+   DNSName canon = apiNameToDNSName(req->getvars["domain"]);
+   bool subtree = (req->getvars.count("subtree") > 0 && req->getvars["subtree"].compare("true") == 0);
+ 
+-  int count = broadcastAccFunction<uint64_t>(boost::bind(pleaseWipeCache, canon, subtree));
+-  count += broadcastAccFunction<uint64_t>(boost::bind(pleaseWipePacketCache, canon, subtree));
+-  count += broadcastAccFunction<uint64_t>(boost::bind(pleaseWipeAndCountNegCache, canon, subtree));
++  int count = broadcastAccFunction<uint64_t>(std::bind(pleaseWipeCache, canon, subtree));
++  count += broadcastAccFunction<uint64_t>(std::bind(pleaseWipePacketCache, canon, subtree));
++  count += broadcastAccFunction<uint64_t>(std::bind(pleaseWipeAndCountNegCache, canon, subtree));
+   resp->setBody(Json::object {
+     { "count", count },
+     { "result", "Flushed cache." }
+@@ -512,7 +512,7 @@ RecursorWebServer::RecursorWebServer(FDMultiplexer* fdm)
+   d_ws->bind();
+ 
+   // legacy dispatch
+-  d_ws->registerApiHandler("/jsonstat", boost::bind(&RecursorWebServer::jsonstat, this, _1, _2), true);
++  d_ws->registerApiHandler("/jsonstat", std::bind(&RecursorWebServer::jsonstat, this, std::placeholders::_1, std::placeholders::_2), true);
+   d_ws->registerApiHandler("/api/v1/servers/localhost/cache/flush", &apiServerCacheFlush);
+   d_ws->registerApiHandler("/api/v1/servers/localhost/config/allow-from", &apiServerConfigAllowFrom);
+   d_ws->registerApiHandler("/api/v1/servers/localhost/config", &apiServerConfig);
+@@ -664,7 +664,7 @@ void AsyncServerNewConnectionMT(void *p) {
+ void AsyncServer::asyncWaitForConnections(FDMultiplexer* fdm, const newconnectioncb_t& callback)
+ {
+   d_asyncNewConnectionCallback = callback;
+-  fdm->addReadFD(d_server_socket.getHandle(), boost::bind(&AsyncServer::newConnection, this));
++  fdm->addReadFD(d_server_socket.getHandle(), std::bind(&AsyncServer::newConnection, this));
+ }
+ 
+ void AsyncServer::newConnection()
+@@ -743,5 +743,5 @@ void AsyncWebServer::go() {
+   auto server = std::dynamic_pointer_cast<AsyncServer>(d_server);
+   if (!server)
+     return;
+-  server->asyncWaitForConnections(d_fdm, boost::bind(&AsyncWebServer::serveConnection, this, _1));
++  server->asyncWaitForConnections(d_fdm, std::bind(&AsyncWebServer::serveConnection, this, std::placeholders::_1));
+ }

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild
index fa5437a3d38..76d5e9e950d 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.3.1.ebuild
@@ -34,6 +34,10 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"/${P/_/-}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-boost-1.73.0.patch
+)
+
 pkg_setup() {
 	filter-flags -ftree-vectorize
 }


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/, net-dns/pdns-recursor/files/
@ 2020-07-22 19:38 Sven Wegener
  0 siblings, 0 replies; 14+ messages in thread
From: Sven Wegener @ 2020-07-22 19:38 UTC (permalink / raw
  To: gentoo-commits

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 <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-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
-}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/, net-dns/pdns-recursor/files/
@ 2022-04-02 14:09 Sven Wegener
  0 siblings, 0 replies; 14+ messages in thread
From: Sven Wegener @ 2022-04-02 14:09 UTC (permalink / raw
  To: gentoo-commits

commit:     fbcc363ce82b0b66f07e51825776e9a9a833aaad
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  2 14:02:37 2022 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 14:08:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbcc363c

net-dns/pdns-recursor: Revision bump, bug #713746 and #836580

Closes: https://bugs.gentoo.org/713746
Closes: https://bugs.gentoo.org/836580
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 .../files/pdns-recursor-4.6.1-parseACL.patch       | 13 +++
 .../pdns-recursor/pdns-recursor-4.6.1-r1.ebuild    | 92 ++++++++++++++++++++++
 2 files changed, 105 insertions(+)

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.6.1-parseACL.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.6.1-parseACL.patch
new file mode 100644
index 000000000000..0d29a24f160f
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.6.1-parseACL.patch
@@ -0,0 +1,13 @@
+diff --git i/pdns_recursor.cc w/pdns_recursor.cc
+index 1700a9fde..ed09f2680 100644
+--- i/pdns_recursor.cc
++++ w/pdns_recursor.cc
+@@ -4844,7 +4844,7 @@ void parseACLs()
+ 
+   auto allowFrom = parseACL("allow-from-file", "allow-from");
+ 
+-  if(allowFrom->size() == 0) {
++  if(allowFrom != nullptr && allowFrom->size() == 0) {
+     if(::arg()["local-address"]!="127.0.0.1" && ::arg().asNum("local-port")==53)
+       g_log<<Logger::Warning<<"WARNING: Allowing queries from all IP addresses - this can be a security risk!"<<endl;
+     allowFrom = nullptr;

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.6.1-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.6.1-r1.ebuild
new file mode 100644
index 000000000000..fff451a76927
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.6.1-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+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 snmp sodium systemd test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="${LUA_DEPS}
+	dnstap? ( dev-libs/fstrm )
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	elibc_glibc? (
+		arm? ( >=sys-libs/glibc-2.34 )
+		x86? ( >=sys-libs/glibc-2.34 )
+	)
+	dev-libs/openssl:=
+	>=dev-libs/boost-1.35:=[context]"
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1
+	acct-user/pdns
+	acct-group/pdns"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-parseACL.patch
+)
+
+pkg_setup() {
+	lua-single_pkg_setup
+	filter-flags -ftree-vectorize
+	append-lfs-flags
+	append-cppflags -D_TIME_BITS=64
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-nod-cache-dir=/var/lib/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
+		--with-lua="${ELUA}" \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable dnstap dnstap) \
+		$(use_enable test unit-tests) \
+		$(use_with sodium libsodium) \
+		$(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
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/, net-dns/pdns-recursor/files/
@ 2022-04-04 12:01 Sven Wegener
  0 siblings, 0 replies; 14+ messages in thread
From: Sven Wegener @ 2022-04-04 12:01 UTC (permalink / raw
  To: gentoo-commits

commit:     c370ac03c3cfa11c1a9899a50e0068d5d2b5d7ce
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 12:01:20 2022 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 12:01:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c370ac03

net-dns/pdns-recursor: Version bump to.4.6.2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 net-dns/pdns-recursor/Manifest                     |  1 +
 .../files/pdns-recursor-4.6.2-parseACL.patch       | 24 ++++++
 net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild   | 92 ++++++++++++++++++++++
 3 files changed, 117 insertions(+)

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 440508da8a66..9d82f3024287 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1 +1,2 @@
 DIST pdns-recursor-4.6.1.tar.bz2 1541000 BLAKE2B fede4f654cd9900780df8dcc39585e95d8b0536c6d14476fde6f33a2d307144f50fb7b51bf6e0c950dcaff74120a101effee0c92cf15c4acedfa94a2682b0c5c SHA512 b595dd382bb4bff5cd47bff854952c8ee40bedeafe4236f935c8eceeca7ac97e8668b884e1ec0ce490ce535fab10d161ffc53ca395c0bb02ffcf6005a692674b
+DIST pdns-recursor-4.6.2.tar.bz2 1552587 BLAKE2B 3e7fe59ebe9d776c012304fc1bf6ed723c1c15df0aaedcaa8ac538741e81c5b6ebac2528e763e1395a0ea383904e4a902319509580938caae85b3aef947cfc3d SHA512 20779a065720162f0a6223a4d92deeef7911892bb8aa1929f9c6a8a6ccd2f8756e7bd35c877dbf945bb7627a2a7d40626d02f0008c2e8a602b424d36c110fddc

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseACL.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseACL.patch
new file mode 100644
index 000000000000..ee58e055f09a
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseACL.patch
@@ -0,0 +1,24 @@
+--- a/pdns_recursor.cc
++++ b/pdns_recursor.cc
+@@ -4775,8 +4775,6 @@ static std::shared_ptr<NetmaskGroup> parseACL(const std::string& aclFile, const
+       result->addMask(line);
+     }
+     g_log<<Logger::Info<<"Done parsing "<<result->size()<<" "<<aclSetting<<" ranges from file '"<<::arg()[aclFile]<<"' - overriding '"<<aclSetting<<"' setting"<<endl;
+-
+-    return result;
+   }
+   else if(!::arg()[aclSetting].empty()) {
+     vector<string> ips;
+@@ -4790,11 +4788,9 @@ static std::shared_ptr<NetmaskGroup> parseACL(const std::string& aclFile, const
+       g_log<<Logger::Info<<*i;
+     }
+     g_log<<Logger::Info<<endl;
+-
+-    return result;
+   }
+ 
+-  return nullptr;
++  return result;
+ }
+ 
+ void parseACLs()

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild
new file mode 100644
index 000000000000..fff451a76927
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+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 snmp sodium systemd test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="${LUA_DEPS}
+	dnstap? ( dev-libs/fstrm )
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	elibc_glibc? (
+		arm? ( >=sys-libs/glibc-2.34 )
+		x86? ( >=sys-libs/glibc-2.34 )
+	)
+	dev-libs/openssl:=
+	>=dev-libs/boost-1.35:=[context]"
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1
+	acct-user/pdns
+	acct-group/pdns"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-parseACL.patch
+)
+
+pkg_setup() {
+	lua-single_pkg_setup
+	filter-flags -ftree-vectorize
+	append-lfs-flags
+	append-cppflags -D_TIME_BITS=64
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-nod-cache-dir=/var/lib/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
+		--with-lua="${ELUA}" \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable dnstap dnstap) \
+		$(use_enable test unit-tests) \
+		$(use_with sodium libsodium) \
+		$(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
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/, net-dns/pdns-recursor/files/
@ 2023-02-16 21:20 Sven Wegener
  0 siblings, 0 replies; 14+ messages in thread
From: Sven Wegener @ 2023-02-16 21:20 UTC (permalink / raw
  To: gentoo-commits

commit:     aea82df28d2def080c1aa982ea5dc1e7560120c0
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 21:09:23 2023 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 21:19:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aea82df2

net-dns/pdns-recursor: Fix building with gcc-13, bug #894618

Closes: https://bugs.gentoo.org/894618
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 .../files/pdns-recursor-4.7.4-gcc-13.patch             | 18 ++++++++++++++++++
 net-dns/pdns-recursor/pdns-recursor-4.7.4.ebuild       |  4 ++++
 2 files changed, 22 insertions(+)

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.7.4-gcc-13.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.7.4-gcc-13.patch
new file mode 100644
index 000000000000..ee15b35f9e4c
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.7.4-gcc-13.patch
@@ -0,0 +1,18 @@
+commit d8b4ea24dc5dbe7c53c24bfffba24bcae7f58e02
+Author: Peter van Dijk <peter.van.dijk@powerdns.com>
+Date:   Mon Jan 23 14:54:09 2023 +0100
+
+    lock.hh: include <stdexcept>
+
+diff --git a/lock.hh b/lock.hh
+index e8bd82988..a08951a26 100644
+--- a/lock.hh
++++ b/lock.hh
+@@ -22,6 +22,7 @@
+ #pragma once
+ #include <mutex>
+ #include <shared_mutex>
++#include <stdexcept>
+ 
+ /*
+   This file provides several features around locks:

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.7.4.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.7.4.ebuild
index 7f51d73cc251..a64f64448362 100644
--- a/net-dns/pdns-recursor/pdns-recursor-4.7.4.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-4.7.4.ebuild
@@ -37,6 +37,10 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"/${P/_/-}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-13.patch
+)
+
 pkg_setup() {
 	lua-single_pkg_setup
 	filter-flags -ftree-vectorize


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/, net-dns/pdns-recursor/files/
@ 2023-04-02 19:07 Sven Wegener
  0 siblings, 0 replies; 14+ messages in thread
From: Sven Wegener @ 2023-04-02 19:07 UTC (permalink / raw
  To: gentoo-commits

commit:     dc798cb5def157236a1ca88c669db26ba8f11316
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  2 19:06:36 2023 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sun Apr  2 19:07:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc798cb5

net-dns/pdns-recursor: drop 4.7.4

Bug: https://bugs.gentoo.org/903549
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 net-dns/pdns-recursor/Manifest                     |  1 -
 .../files/pdns-recursor-4.7.4-gcc-13.patch         | 18 -----
 net-dns/pdns-recursor/pdns-recursor-4.7.4.ebuild   | 92 ----------------------
 3 files changed, 111 deletions(-)

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 6ebaf251d112..bfb3294a86ca 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,2 +1 @@
-DIST pdns-recursor-4.7.4.tar.bz2 1609031 BLAKE2B b051a77f1c734546b26c3bb0030c0e57ee4621b14f0e92d7d294fb80fde599aa813f56a64750e1a00587fee8f05aa9ae1def94f3c3709b103223ed48124b66a7 SHA512 51ecccb557a5a9f3aa28144b60ab75b0fe5534bb2534b0a44662b474a01a0fae61f08b8ca787fc27f22b2a89b721ae66e1a954c4ceb829e66f89f286d5e174a8
 DIST pdns-recursor-4.8.4.tar.bz2 1528092 BLAKE2B d4cacbb6451ee4b835684855e6e6bcbb0eb6425840bce980ee5b2049a4eed3fe5c6be3d62133234adc3944f85d548ce9ee50885d65b2104c0eda91b4e46ca024 SHA512 1cfdf94bc10d01ebfae00780304f0d46b3388d824158195e1db2b04a08143cc8f36c4861a05ac8cbc05948349aafe1c9e822a27b15b470ef89a81e8bd584a5f2

diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.7.4-gcc-13.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.7.4-gcc-13.patch
deleted file mode 100644
index ee15b35f9e4c..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-4.7.4-gcc-13.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit d8b4ea24dc5dbe7c53c24bfffba24bcae7f58e02
-Author: Peter van Dijk <peter.van.dijk@powerdns.com>
-Date:   Mon Jan 23 14:54:09 2023 +0100
-
-    lock.hh: include <stdexcept>
-
-diff --git a/lock.hh b/lock.hh
-index e8bd82988..a08951a26 100644
---- a/lock.hh
-+++ b/lock.hh
-@@ -22,6 +22,7 @@
- #pragma once
- #include <mutex>
- #include <shared_mutex>
-+#include <stdexcept>
- 
- /*
-   This file provides several features around locks:

diff --git a/net-dns/pdns-recursor/pdns-recursor-4.7.4.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.7.4.ebuild
deleted file mode 100644
index a64f64448362..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.7.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-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 snmp sodium systemd test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="${LUA_DEPS}
-	dnstap? ( dev-libs/fstrm )
-	systemd? ( sys-apps/systemd:0= )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:= )
-	elibc_glibc? (
-		arm? ( >=sys-libs/glibc-2.34 )
-		x86? ( >=sys-libs/glibc-2.34 )
-	)
-	dev-libs/openssl:=
-	dev-libs/boost:=[context]"
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1
-	acct-user/pdns
-	acct-group/pdns"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-13.patch
-)
-
-pkg_setup() {
-	lua-single_pkg_setup
-	filter-flags -ftree-vectorize
-	append-lfs-flags
-	append-cppflags -D_TIME_BITS=64
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		--with-nod-cache-dir=/var/lib/powerdns \
-		--with-service-user=pdns \
-		--with-service-group=pdns \
-		--with-lua="${ELUA}" \
-		$(use_enable debug verbose-logging) \
-		$(use_enable systemd) \
-		$(use_enable dnstap dnstap) \
-		$(use_enable test unit-tests) \
-		$(use_with sodium libsodium) \
-		$(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
-}


^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2023-04-02 19:07 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-11 13:43 [gentoo-commits] repo/gentoo:master commit in: net-dns/pdns-recursor/, net-dns/pdns-recursor/files/ Sven Wegener
  -- strict thread matches above, loose matches on Subject: below --
2023-04-02 19:07 Sven Wegener
2023-02-16 21:20 Sven Wegener
2022-04-04 12:01 Sven Wegener
2022-04-02 14:09 Sven Wegener
2020-07-22 19:38 Sven Wegener
2020-05-20 21:32 Sven Wegener
2017-12-04 15:46 Sven Wegener
2017-12-03 22:42 Sven Wegener
2017-11-27 17:37 Sven Wegener
2017-10-30 13:27 Sven Wegener
2017-05-25 15:04 Sven Wegener
2016-11-20 21:08 Sven Wegener
2016-07-19 22:03 Sven Wegener

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox