diff options
author | Sven Wegener <swegener@gentoo.org> | 2015-11-03 19:30:13 +0000 |
---|---|---|
committer | Sven Wegener <swegener@gentoo.org> | 2015-11-03 19:30:13 +0000 |
commit | 88153f4d34a0719cee3960acb6423d7a6a7845cb (patch) | |
tree | e2afda8880a6df3757efe837c19d3722f3f55561 /net-dns/pdns-recursor | |
parent | media-fonts/infinality-ultimate-meta: Update to use new media-fonts/nanum ebuild (diff) | |
download | gentoo-88153f4d34a0719cee3960acb6423d7a6a7845cb.tar.gz gentoo-88153f4d34a0719cee3960acb6423d7a6a7845cb.tar.bz2 gentoo-88153f4d34a0719cee3960acb6423d7a6a7845cb.zip |
net-dns/pdns-recursor: cleanup
Signed-off-by: Sven Wegener <swegener@gentoo.org>
Diffstat (limited to 'net-dns/pdns-recursor')
8 files changed, 0 insertions, 421 deletions
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.7.2-error-message.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.7.2-error-message.patch deleted file mode 100644 index 7fdf208037cd..000000000000 --- a/net-dns/pdns-recursor/files/pdns-recursor-3.1.7.2-error-message.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pdns-recursor-3.1.7.2/rec_channel.cc -+++ pdns-recursor-3.1.7.2/rec_channel.cc -@@ -100,7 +100,7 @@ - strcpy(remote.sun_path,(path+"/"+fname).c_str()); - if(::connect(d_fd, (sockaddr*)&remote, sizeof(remote)) < 0) { - unlink(d_local.sun_path); -- throw AhuException("Unable to connect to remote '"+path+fname+"': "+string(strerror(errno))); -+ throw AhuException("Unable to connect to remote '"+path+"/"+fname+"': "+string(strerror(errno))); - } - } - diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.5.3-fdlimit.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.5.3-fdlimit.patch deleted file mode 100644 index 3b6e8e25d972..000000000000 --- a/net-dns/pdns-recursor/files/pdns-recursor-3.5.3-fdlimit.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- pdns-recursor-3.5.3/misc.cc -+++ pdns-recursor-3.5.3/misc.cc -@@ -22,6 +22,7 @@ - #include <netdb.h> - #include <sys/time.h> - #include <time.h> -+#include <sys/resource.h> - #include <netinet/in.h> - #include <unistd.h> - #endif // WIN32 -@@ -697,3 +698,22 @@ - } while(!strchr(buffer, '\n')); - return true; - } -+ -+unsigned int getFilenumLimit(bool hardOrSoft) -+{ -+ struct rlimit rlim; -+ if(getrlimit(RLIMIT_NOFILE, &rlim) < 0) -+ unixDie("Requesting number of available file descriptors"); -+ return hardOrSoft ? rlim.rlim_max : rlim.rlim_cur; -+} -+ -+void setFilenumLimit(unsigned int lim) -+{ -+ struct rlimit rlim; -+ -+ if(getrlimit(RLIMIT_NOFILE, &rlim) < 0) -+ unixDie("Requesting number of available file descriptors"); -+ rlim.rlim_cur=lim; -+ if(setrlimit(RLIMIT_NOFILE, &rlim) < 0) -+ unixDie("Setting number of available file descriptors"); -+} ---- pdns-recursor-3.5.3/misc.hh -+++ pdns-recursor-3.5.3/misc.hh -@@ -445,4 +445,6 @@ - regex_t d_preg; - }; - -+unsigned int getFilenumLimit(bool hardOrSoft=0); -+void setFilenumLimit(unsigned int lim); - #endif ---- pdns-recursor-3.5.3/pdns_recursor.cc -+++ pdns-recursor-3.5.3/pdns_recursor.cc -@@ -1740,7 +1740,21 @@ - - g_tcpTimeout=::arg().asNum("client-tcp-timeout"); - g_maxTCPPerClient=::arg().asNum("max-tcp-per-client"); -- g_maxMThreads=::arg().asNum("max-mthreads"); -+ g_maxMThreads=::arg().asNum("max-mthreads"); -+ unsigned int availFDs=getFilenumLimit(); -+ if(g_maxMThreads * g_numThreads > availFDs) { -+ if(getFilenumLimit(true) >= g_maxMThreads * g_numThreads) { -+ setFilenumLimit(g_maxMThreads * g_numThreads); -+ L<<Logger::Warning<<"Raised soft limit on number of filedescriptors to "<<g_maxMThreads * g_numThreads<<" to match max-mthreads and threads settings"<<endl; -+ } -+ else { -+ int newval = getFilenumLimit(true) / g_numThreads; -+ L<<Logger::Warning<<"Insufficient number of filedescriptors available for max-mthreads*threads setting! ("<<availFDs<<" < "<<g_maxMThreads*g_numThreads<<"), reducing max-mthreads to "<<newval<<endl; -+ g_maxMThreads = newval; -+ } -+ -+ -+ } - - if(g_numThreads == 1) { - L<<Logger::Warning<<"Operating unthreaded"<<endl; diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.6.1-CVE-2014-8601.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.6.1-CVE-2014-8601.patch deleted file mode 100644 index 44ccc2803848..000000000000 --- a/net-dns/pdns-recursor/files/pdns-recursor-3.6.1-CVE-2014-8601.patch +++ /dev/null @@ -1,52 +0,0 @@ -https://downloads.powerdns.com/patches/2014-02/3.6.1.patch - -diff --git a/pdns_recursor.cc b/pdns_recursor.cc -index f1ef93c..8e43d6e 100644 ---- a/pdns_recursor.cc -+++ b/pdns_recursor.cc -@@ -550,7 +550,14 @@ void startDoResolve(void *p) - - // if there is a RecursorLua active, and it 'took' the query in preResolve, we don't launch beginResolve - if(!t_pdl->get() || !(*t_pdl)->preresolve(dc->d_remote, g_listenSocketsAddresses[dc->d_socket], dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), ret, res, &variableAnswer)) { -- res = sr.beginResolve(dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), dc->d_mdp.d_qclass, ret); -+ try { -+ res = sr.beginResolve(dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), dc->d_mdp.d_qclass, ret); -+ } -+ catch(ImmediateServFailException &e) { -+ L<<Logger::Error<<"Sending SERVFAIL during resolve of '"<<dc->d_mdp.d_qname<<"' because: "<<e.reason<<endl; -+ -+ res = RCode::ServFail; -+ } - - if(t_pdl->get()) { - if(res == RCode::NoError) { -diff --git a/syncres.cc b/syncres.cc -index 4dc78b4..d09e44b 100644 ---- a/syncres.cc -+++ b/syncres.cc -@@ -923,6 +923,7 @@ int SyncRes::doResolveAt(set<string, CIStringCompare> nameservers, string auth, - } - else { - s_outqueries++; d_outqueries++; -+ if(d_outqueries > 50) throw ImmediateServFailException("more than 50 queries sent while resolving "+qname); - TryTCP: - if(doTCP) { - LOG(prefix<<qname<<": using TCP with "<< remoteIP->toStringWithPort() <<endl); -diff --git a/syncres.hh b/syncres.hh -index 5182527..b22de89 100644 ---- a/syncres.hh -+++ b/syncres.hh -@@ -593,6 +593,13 @@ private: - static AtomicCounter s_currentConnections; //!< total number of current TCP connections - }; - -+class ImmediateServFailException -+{ -+public: -+ ImmediateServFailException(string r){reason=r;}; -+ -+ string reason; //! Print this to tell the user what went wrong -+}; - - struct RemoteKeeper - { diff --git a/net-dns/pdns-recursor/pdns-recursor-3.6.1-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.6.1-r1.ebuild deleted file mode 100644 index c90dfa2b2c19..000000000000 --- a/net-dns/pdns-recursor/pdns-recursor-3.6.1-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit toolchain-funcs flag-o-matic eutils - -DESCRIPTION="The PowerDNS Recursor" -HOMEPAGE="http://www.powerdns.com/" -SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="lua" - -DEPEND="lua? ( >=dev-lang/lua-5.1 )" -RDEPEND="${DEPEND} - !<net-dns/pdns-2.9.20-r1" -DEPEND="${DEPEND} - >=dev-libs/boost-1.33.1" - -pkg_setup() { - filter-flags -ftree-vectorize -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-CVE-2014-8601.patch -} - -src_configure() { - true -} - -src_compile() { - emake \ - LOCALSTATEDIR=/var/lib/powerdns \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - OPTFLAGS="" \ - LUA_LIBS_CONFIG="-llua" \ - LUA_CPPFLAGS_CONFIG="" \ - LUA="$(use lua && echo 1)" -} - -src_install() { - dosbin pdns_recursor rec_control - doman pdns_recursor.1 rec_control.1 - - insinto /etc/powerdns - doins "${FILESDIR}"/recursor.conf - - doinitd "${FILESDIR}"/precursor - - # Pretty ugly, uh? - dodir /var/lib/powerdns/var/lib - dosym ../.. /var/lib/powerdns/var/lib/powerdns -} diff --git a/net-dns/pdns-recursor/pdns-recursor-3.6.2.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.6.2.ebuild deleted file mode 100644 index cb321f43f0f4..000000000000 --- a/net-dns/pdns-recursor/pdns-recursor-3.6.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit toolchain-funcs flag-o-matic eutils - -DESCRIPTION="The PowerDNS Recursor" -HOMEPAGE="http://www.powerdns.com/" -SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="lua" - -DEPEND="lua? ( >=dev-lang/lua-5.1 )" -RDEPEND="${DEPEND} - !<net-dns/pdns-2.9.20-r1" -DEPEND="${DEPEND} - >=dev-libs/boost-1.33.1" - -pkg_setup() { - filter-flags -ftree-vectorize -} - -src_configure() { - true -} - -src_compile() { - emake \ - LOCALSTATEDIR=/var/lib/powerdns \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - OPTFLAGS="" \ - LUA_LIBS_CONFIG="-llua" \ - LUA_CPPFLAGS_CONFIG="" \ - LUA="$(use lua && echo 1)" -} - -src_install() { - dosbin pdns_recursor rec_control - doman pdns_recursor.1 rec_control.1 - - insinto /etc/powerdns - doins "${FILESDIR}"/recursor.conf - - doinitd "${FILESDIR}"/precursor - - # Pretty ugly, uh? - dodir /var/lib/powerdns/var/lib - dosym ../.. /var/lib/powerdns/var/lib/powerdns -} diff --git a/net-dns/pdns-recursor/pdns-recursor-3.6.3.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.6.3.ebuild deleted file mode 100644 index bb2f19e8323e..000000000000 --- a/net-dns/pdns-recursor/pdns-recursor-3.6.3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit toolchain-funcs flag-o-matic eutils - -DESCRIPTION="The PowerDNS Recursor" -HOMEPAGE="http://www.powerdns.com/" -SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="lua" - -DEPEND="lua? ( >=dev-lang/lua-5.1 )" -RDEPEND="${DEPEND} - !<net-dns/pdns-2.9.20-r1" -DEPEND="${DEPEND} - >=dev-libs/boost-1.33.1" - -pkg_setup() { - filter-flags -ftree-vectorize -} - -src_configure() { - true -} - -src_compile() { - emake \ - LOCALSTATEDIR=/var/lib/powerdns \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - OPTFLAGS="" \ - LUA_LIBS_CONFIG="-llua" \ - LUA_CPPFLAGS_CONFIG="" \ - LUA="$(use lua && echo 1)" -} - -src_install() { - dosbin pdns_recursor rec_control - doman pdns_recursor.1 rec_control.1 - - insinto /etc/powerdns - doins "${FILESDIR}"/recursor.conf - - doinitd "${FILESDIR}"/precursor - - # Pretty ugly, uh? - dodir /var/lib/powerdns/var/lib - dosym ../.. /var/lib/powerdns/var/lib/powerdns -} diff --git a/net-dns/pdns-recursor/pdns-recursor-3.7.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.7.1.ebuild deleted file mode 100644 index 5b5d2c80a043..000000000000 --- a/net-dns/pdns-recursor/pdns-recursor-3.7.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit toolchain-funcs flag-o-matic eutils - -DESCRIPTION="The PowerDNS Recursor" -HOMEPAGE="http://www.powerdns.com/" -SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="lua" - -DEPEND="lua? ( >=dev-lang/lua-5.1 )" -RDEPEND="${DEPEND} - !<net-dns/pdns-2.9.20-r1" -DEPEND="${DEPEND} - >=dev-libs/boost-1.33.1" - -pkg_setup() { - filter-flags -ftree-vectorize -} - -src_configure() { - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - OPTFLAGS="" \ - LUA_LIBS_CONFIG="-llua" \ - LUA_CPPFLAGS_CONFIG="" \ - LUA="$(use lua && echo 1)" \ - ./configure -} - -src_compile() { - emake \ - LOCALSTATEDIR=/var/lib/powerdns \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - OPTFLAGS="" \ - LUA_LIBS_CONFIG="-llua" \ - LUA_CPPFLAGS_CONFIG="" \ - LUA="$(use lua && echo 1)" -} - -src_install() { - dosbin pdns_recursor rec_control - doman pdns_recursor.1 rec_control.1 - - insinto /etc/powerdns - doins "${FILESDIR}"/recursor.conf - - doinitd "${FILESDIR}"/precursor - - # Pretty ugly, uh? - dodir /var/lib/powerdns/var/lib - dosym ../.. /var/lib/powerdns/var/lib/powerdns -} diff --git a/net-dns/pdns-recursor/pdns-recursor-3.7.2.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.7.2.ebuild deleted file mode 100644 index 5b5d2c80a043..000000000000 --- a/net-dns/pdns-recursor/pdns-recursor-3.7.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit toolchain-funcs flag-o-matic eutils - -DESCRIPTION="The PowerDNS Recursor" -HOMEPAGE="http://www.powerdns.com/" -SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="lua" - -DEPEND="lua? ( >=dev-lang/lua-5.1 )" -RDEPEND="${DEPEND} - !<net-dns/pdns-2.9.20-r1" -DEPEND="${DEPEND} - >=dev-libs/boost-1.33.1" - -pkg_setup() { - filter-flags -ftree-vectorize -} - -src_configure() { - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - OPTFLAGS="" \ - LUA_LIBS_CONFIG="-llua" \ - LUA_CPPFLAGS_CONFIG="" \ - LUA="$(use lua && echo 1)" \ - ./configure -} - -src_compile() { - emake \ - LOCALSTATEDIR=/var/lib/powerdns \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - OPTFLAGS="" \ - LUA_LIBS_CONFIG="-llua" \ - LUA_CPPFLAGS_CONFIG="" \ - LUA="$(use lua && echo 1)" -} - -src_install() { - dosbin pdns_recursor rec_control - doman pdns_recursor.1 rec_control.1 - - insinto /etc/powerdns - doins "${FILESDIR}"/recursor.conf - - doinitd "${FILESDIR}"/precursor - - # Pretty ugly, uh? - dodir /var/lib/powerdns/var/lib - dosym ../.. /var/lib/powerdns/var/lib/powerdns -} |