Attachment 216129 Details for Bug 247707 – Update to PowerDNS Recursor 4.3.2

[patch] Update to PowerDNS Recursor 4.3.2

powerdns-recursor-4.3.2.diff (text/plain), 3.76 KB, created by Ralf van der Enden on 2020-07-02 08:44:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf van der Enden

Created: 2020-07-02 08:44:36 UTC

Size: 3.76 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 541001)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	recursor
>-DISTVERSION=	4.3.1
>-PORTREVISION=	1
>+DISTVERSION=	4.3.2
> CATEGORIES=	dns
> MASTER_SITES=	http://downloads.powerdns.com/releases/
> PKGNAMEPREFIX=	powerdns-
>Index: distinfo
>===================================================================
>--- distinfo	(revision 541001)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1589879472
>-SHA256 (pdns-recursor-4.3.1.tar.bz2) = 54230852fcad3c6291651069c383f7ea88c5d29ce3c561decb2f40a063f52fd9
>-SIZE (pdns-recursor-4.3.1.tar.bz2) = 1334817
>+TIMESTAMP = 1593608910
>+SHA256 (pdns-recursor-4.3.2.tar.bz2) = fcaeba94d5005ec3b973c1800d22eee686f785d3e635ad495d6f44067a4561e1
>+SIZE (pdns-recursor-4.3.2.tar.bz2) = 1354549
>Index: files/patch-hostnamemax
>===================================================================
>--- files/patch-hostnamemax	(revision 541001)
>+++ files/patch-hostnamemax	(nonexistent)
>@@ -1,90 +0,0 @@
>-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
>___________________________________________________________________
>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

Flags:

tremere: maintainer-approval+

Actions: View | Diff

Attachments on bug 247707: 216129 | 216130