Date: Fri, 17 Jan 2020 18:01:31 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r523342 - in head/dns/powerdns: . files Message-ID: <202001171801.00HI1VLo089317@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Fri Jan 17 18:01:31 2020 New Revision: 523342 URL: https://svnweb.freebsd.org/changeset/ports/523342 Log: dns/powerdns: update to 4.2.1 4.2.1 release notes: This release fixes several bugs and makes a few features more robust or intuitive. It also contains a few performance improvements for API users. For a full list of changes look here: https://doc.powerdns.com/authoritative/changelog/4.2.html#change-4.2.1 PR: 242519 Submitted by: Ralf van der Enden <tremere@cainites.net> (maintainer) Added: head/dns/powerdns/files/patch-fix_memleak_bindbackend (contents, props changed) Modified: head/dns/powerdns/Makefile head/dns/powerdns/distinfo head/dns/powerdns/files/patch-configure Modified: head/dns/powerdns/Makefile ============================================================================== --- head/dns/powerdns/Makefile Fri Jan 17 17:30:01 2020 (r523341) +++ head/dns/powerdns/Makefile Fri Jan 17 18:01:31 2020 (r523342) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= powerdns -DISTVERSION= 4.2.0 -PORTREVISION= 1 +DISTVERSION= 4.2.1 CATEGORIES= dns MASTER_SITES= https://downloads.powerdns.com/releases/ DISTNAME= pdns-${DISTVERSION} @@ -69,7 +68,7 @@ GEOIP_VARS= MODULES+=geoip LUABACKEND_VARS= MODULES+=lua2 -LUAJIT_LIB_DEPENDS= libluajit-5.1.so.2:lang/luajit +LUAJIT_LIB_DEPENDS= libluajit-5.1.so.2:lang/luajit-openresty LUAJIT_USES_OFF= lua LUAJIT_CONFIGURE_ON= --with-lua=luajit @@ -126,7 +125,7 @@ LIB_DEPENDS+= libdecaf.so:security/libdecaf \ post-install:: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @${STAGEDIR}${LOCALBASE}/sbin/pdns_server --module-dir=${STAGEDIR}${LOCALBASE}/lib/pdns --launch="pipe bind ${MODULES}" --config > ${STAGEDIR}${EXAMPLESDIR}/pdns.conf + @${STAGEDIR}${PREFIX}/sbin/pdns_server --module-dir=${STAGEDIR}${PREFIX}/lib/pdns --launch="pipe bind ${MODULES}" --config > ${STAGEDIR}${EXAMPLESDIR}/pdns.conf @${REINPLACE_CMD} -e 's;${STAGEDIR};;' -i '' ${STAGEDIR}${EXAMPLESDIR}/pdns.conf .include <bsd.port.post.mk> Modified: head/dns/powerdns/distinfo ============================================================================== --- head/dns/powerdns/distinfo Fri Jan 17 17:30:01 2020 (r523341) +++ head/dns/powerdns/distinfo Fri Jan 17 18:01:31 2020 (r523342) @@ -1,3 +1,3 @@ -TIMESTAMP = 1567076172 -SHA256 (pdns-4.2.0.tar.bz2) = 222007f25e25aad71ac7d8b7f1797a4bcb30781e456d74ed00396e53828a903a -SIZE (pdns-4.2.0.tar.bz2) = 1249282 +TIMESTAMP = 1575879679 +SHA256 (pdns-4.2.1.tar.bz2) = f65019986b8fcbb1c6fffebcded04b2b397b84395830f4c63e8d119bcfa1aa28 +SIZE (pdns-4.2.1.tar.bz2) = 1252829 Modified: head/dns/powerdns/files/patch-configure ============================================================================== --- head/dns/powerdns/files/patch-configure Fri Jan 17 17:30:01 2020 (r523341) +++ head/dns/powerdns/files/patch-configure Fri Jan 17 18:01:31 2020 (r523342) @@ -1,6 +1,6 @@ ---- configure.orig 2019-03-22 11:48:09 UTC +--- configure.orig 2019-11-29 19:23:06 UTC +++ configure -@@ -18170,8 +18170,10 @@ fi +@@ -19757,8 +19757,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl/crypto.h in $ssldir" >&5 $as_echo_n "checking for openssl/crypto.h in $ssldir... " >&6; } if test -f "$ssldir/include/openssl/crypto.h"; then Added: head/dns/powerdns/files/patch-fix_memleak_bindbackend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/powerdns/files/patch-fix_memleak_bindbackend Fri Jan 17 18:01:31 2020 (r523342) @@ -0,0 +1,80 @@ +------------------------------------------------------------------------------------------ +bind backend: pthread_mutex_t should be inited and destroyed and not be copied #8350 + +To make our live easier, use a native C++ mutex. +Fixes #8161 + +https://github.com/PowerDNS/pdns/pull/8350 +------------------------------------------------------------------------------------------ +--- modules/bindbackend/bindbackend2.cc.orig 2019-11-29 15:11:44 UTC ++++ modules/bindbackend/bindbackend2.cc +@@ -80,6 +80,9 @@ pthread_mutex_t Bind2Backend::s_supermaster_config_loc + pthread_mutex_t Bind2Backend::s_startup_lock=PTHREAD_MUTEX_INITIALIZER; + string Bind2Backend::s_binddirectory; + ++template <typename T> ++std::mutex LookButDontTouch<T>::s_lock; ++ + BB2DomainInfo::BB2DomainInfo() + { + d_loaded=false; +--- modules/bindbackend/bindbackend2.hh.orig 2019-11-29 15:11:44 UTC ++++ modules/bindbackend/bindbackend2.hh +@@ -29,6 +29,7 @@ + #include <pthread.h> + #include <time.h> + #include <fstream> ++#include <mutex> + #include <boost/utility.hpp> + + #include <boost/tuple/tuple.hpp> +@@ -103,22 +104,18 @@ template <typename T> + class LookButDontTouch // : public boost::noncopyable + { + public: +- LookButDontTouch() ++ LookButDontTouch() + { +- pthread_mutex_init(&d_lock, 0); +- pthread_mutex_init(&d_swaplock, 0); + } + LookButDontTouch(shared_ptr<T> records) : d_records(records) + { +- pthread_mutex_init(&d_lock, 0); +- pthread_mutex_init(&d_swaplock, 0); + } + + shared_ptr<const T> get() + { + shared_ptr<const T> ret; + { +- Lock l(&d_lock); ++ std::lock_guard<std::mutex> lock(s_lock); + ret = d_records; + } + return ret; +@@ -128,22 +125,14 @@ class LookButDontTouch // : public boost::noncopyable + { + shared_ptr<T> ret; + { +- Lock l(&d_lock); ++ std::lock_guard<std::mutex> lock(s_lock); + ret = d_records; + } + return ret; + } + +- +- void swap(shared_ptr<T> records) +- { +- Lock l(&d_lock); +- Lock l2(&d_swaplock); +- d_records.swap(records); +- } +- pthread_mutex_t d_lock; +- pthread_mutex_t d_swaplock; + private: ++ static std::mutex s_lock; + shared_ptr<T> d_records; + }; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001171801.00HI1VLo089317>