Attachment 214843 Details for Bug 246655 – Update to PowerDNS Recursor 4.3.1

[patch] Update to PowerDNS Recursor 4.3.1

powerdns-recursor-4.3.1.diff (text/plain), 6.82 KB, created by Ralf van der Enden on 2020-05-25 12:25:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf van der Enden

Created: 2020-05-25 12:25:33 UTC

Size: 6.82 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 536425)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	recursor
>-DISTVERSION=	4.3.0
>+DISTVERSION=	4.3.1
> CATEGORIES=	dns
> MASTER_SITES=	http://downloads.powerdns.com/releases/
> PKGNAMEPREFIX=	powerdns-
>@@ -16,6 +16,7 @@
> 
> BROKEN_armv6=	fails to compile: use of overloaded operator << is ambiguous
> BROKEN_armv7=	fails to compile: use of overloaded operator << is ambiguous
>+BROKEN_i386=	crashes on startup (SIGSEGV)
> BROKEN_sparc64=	fails to compile: json11.cpp: undefined reference to std::__throw_out_of_range_fmt
> 
> BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
>Index: distinfo
>===================================================================
>--- distinfo	(revision 536425)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1583454090
>-SHA256 (pdns-recursor-4.3.0.tar.bz2) = 2bc130f287dfdb32e03d0b38a4ac24baf1117f96eca9b407611c847fa08a628f
>-SIZE (pdns-recursor-4.3.0.tar.bz2) = 1349359
>+TIMESTAMP = 1589879472
>+SHA256 (pdns-recursor-4.3.1.tar.bz2) = 54230852fcad3c6291651069c383f7ea88c5d29ce3c561decb2f40a063f52fd9
>+SIZE (pdns-recursor-4.3.1.tar.bz2) = 1334817
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 536425)
>+++ files/patch-configure	(working copy)
>@@ -1,6 +1,6 @@
>---- configure.orig	2020-03-02 07:50:20.000000000 -0500
>-+++ configure	2020-03-02 07:50:20.000000000 -0500
>-@@ -21139,8 +21139,10 @@
>+--- configure.orig	2020-05-08 09:56:25 UTC
>++++ configure
>+@@ -21467,8 +21467,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
>Index: files/patch-dns_random.cc
>===================================================================
>--- files/patch-dns_random.cc	(revision 536425)
>+++ files/patch-dns_random.cc	(nonexistent)
>@@ -1,12 +0,0 @@
>---- dns_random.cc.orig	2018-11-29 12:53:42 UTC
>-+++ dns_random.cc
>-@@ -40,7 +40,9 @@
>- #include <openssl/rand.h>
>- #endif
>- #if defined(HAVE_GETRANDOM)
>-+extern "C" {
>- #include <sys/random.h>
>-+}
>- #endif
>- 
>- static enum DNS_RNG {
>
>Property changes on: files/patch-dns_random.cc
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-dnsname.hh
>===================================================================
>--- files/patch-dnsname.hh	(revision 536425)
>+++ files/patch-dnsname.hh	(working copy)
>@@ -1,5 +1,5 @@
>---- dnsname.hh.orig	2020-03-02 07:49:54.000000000 -0500
>-+++ dnsname.hh	2020-03-02 07:49:54.000000000 -0500
>+--- dnsname.hh.orig	2020-05-08 09:31:59 UTC
>++++ dnsname.hh
> @@ -33,7 +33,7 @@
>  #include <boost/version.hpp>
>  
>@@ -9,7 +9,7 @@
>  #include <boost/container/string.hpp>
>  #endif
>  
>-@@ -138,7 +138,7 @@
>+@@ -138,7 +138,7 @@ class DNSName (public)
>    inline bool canonCompare(const DNSName& rhs) const;
>    bool slowCanonCompare(const DNSName& rhs) const;  
>  
>Index: files/patch-hostnamemax
>===================================================================
>--- files/patch-hostnamemax	(nonexistent)
>+++ files/patch-hostnamemax	(working copy)
>@@ -0,0 +1,90 @@
>+diff --git misc.cc misc.cc
>+index f9248af42a..5cb4dbe812 100644
>+--- misc.cc
>++++ misc.cc
>+@@ -57,6 +57,7 @@
>+ #include <sys/types.h>
>+ #include <pwd.h>
>+ #include <grp.h>
>++#include <limits.h>
>+ #ifdef __FreeBSD__
>+ #  include <pthread_np.h>
>+ #endif
>+@@ -1563,3 +1564,39 @@ bool setPipeBufferSize(int fd, size_t size)
>+   return false;
>+ #endif /* F_SETPIPE_SZ */
>+ }
>++
>++static size_t getMaxHostNameSize()
>++{
>++#if defined(HOST_NAME_MAX)
>++  return HOST_NAME_MAX;
>++#endif
>++
>++#if defined(_SC_HOST_NAME_MAX)
>++  auto tmp = sysconf(_SC_HOST_NAME_MAX);
>++  if (tmp != -1) {
>++    return tmp;
>++  }
>++#endif
>++
>++  /* _POSIX_HOST_NAME_MAX */
>++  return 255;
>++}
>++
>++std::string getCarbonHostName()
>++{
>++  std::string hostname;
>++  hostname.resize(getMaxHostNameSize() + 1, 0);
>++
>++  if (gethostname(const_cast<char*>(hostname.c_str()), hostname.size()) != 0) {
>++    throw std::runtime_error(stringerror());
>++  }
>++
>++  auto pos = hostname.find(".");
>++  if (pos != std::string::npos) {
>++    hostname.resize(pos);
>++  }
>++
>++  boost::replace_all(hostname, ".", "_");
>++
>++  return hostname;
>++}
>+diff --git misc.hh misc.hh
>+index 4bd9439a87..795e8ec855 100644
>+--- misc.hh
>++++ misc.hh
>+@@ -607,3 +607,5 @@ bool isSettingThreadCPUAffinitySupported();
>+ int mapThreadToCPUList(pthread_t tid, const std::set<int>& cpus);
>+ 
>+ std::vector<ComboAddress> getResolvers(const std::string& resolvConfPath);
>++
>++std::string getCarbonHostName();
>+diff --git rec-carbon.cc rec-carbon.cc
>+index 4e0cedb00f..458a25d5ca 100644
>+--- rec-carbon.cc
>++++ rec-carbon.cc
>+@@ -32,17 +32,13 @@ try
>+   if(namespace_name.empty()) {
>+     namespace_name="pdns";
>+   }
>+-  if(hostname.empty()) {
>+-    char tmp[HOST_NAME_MAX+1];
>+-    memset(tmp, 0, sizeof(tmp));
>+-    if (gethostname(tmp, sizeof(tmp)) != 0) {
>+-      throw std::runtime_error("The 'carbon-ourname' setting has not been set and we are unable to determine the system's hostname: " + stringerror());
>++  if (hostname.empty()) {
>++    try {
>++      hostname = getCarbonHostName();
>++    }
>++    catch(const std::exception& e) {
>++      throw std::runtime_error(std::string("The 'carbon-ourname' setting has not been set and we are unable to determine the system's hostname: ") + e.what());
>+     }
>+-    char *p = strchr(tmp, '.');
>+-    if(p) *p=0;
>+-
>+-    hostname=tmp;
>+-    boost::replace_all(hostname, ".", "_");    
>+   }
>+   if(instance_name.empty()) {
>+     instance_name="recursor";
>
>Property changes on: files/patch-hostnamemax
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-pdns_recursor.cc
>===================================================================
>--- files/patch-pdns_recursor.cc	(revision 536425)
>+++ files/patch-pdns_recursor.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- pdns_recursor.cc.orig	2020-03-02 07:49:54.000000000 -0500
>-+++ pdns_recursor.cc	2020-03-02 07:49:54.000000000 -0500
>-@@ -4639,12 +4639,12 @@
>+--- pdns_recursor.cc.orig	2020-05-08 09:31:59 UTC
>++++ pdns_recursor.cc
>+@@ -4640,12 +4640,12 @@ int main(int argc, char **argv)
>  #define SYSTEMD_SETID_MSG ". When running inside systemd, use the User and Group settings in the unit-file!"
>          SYSTEMD_SETID_MSG
>  #endif

Flags:

tremere: maintainer-approval+

Actions: View | Diff

Attachments on bug 246655: 214751 | 214752 | 214821 | 214843 | 214959