Attachment 201722 Details for Bug 235392 – Update to 4.11, add buffer fix for rec_control and remove CONFLICTS_INSTALL

[patch] Update to 4.11, add buffer fix for rec_control and remove CONFLICTS_INSTALL

powerdns-recursor-4.1.11.diff (text/plain), 3.27 KB, created by Ralf van der Enden on 2019-02-04 15:43:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf van der Enden

Created: 2019-02-04 15:43:09 UTC

Size: 3.27 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 492089)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	recursor
>-DISTVERSION=	4.1.10
>+DISTVERSION=	4.1.11
> CATEGORIES=	dns ipv6
> MASTER_SITES=	http://downloads.powerdns.com/releases/
> PKGNAMEPREFIX=	powerdns-
>@@ -22,8 +22,6 @@
> LIB_DEPENDS=	libboost_context.so:devel/boost-libs \
> 		libprotobuf.so:devel/protobuf
> 
>-CONFLICTS_INSTALL=	powerdns-recursor40
>-
> USES=		compiler:c++11-lib cpe gmake localbase:ldflags pkgconfig ssl tar:bzip2
> GNU_CONFIGURE=	YES
> CXXFLAGS+=	-D_GLIBCXX_USE_C99
>Index: distinfo
>===================================================================
>--- distinfo	(revision 492089)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1548341968
>-SHA256 (pdns-recursor-4.1.10.tar.bz2) = f22dc09dae32fbf394a80831f7e7a2fde2e5a2a5ac572e134de9935629817f01
>-SIZE (pdns-recursor-4.1.10.tar.bz2) = 1238148
>+TIMESTAMP = 1549022270
>+SHA256 (pdns-recursor-4.1.11.tar.bz2) = 9ec7d52b545d3ea4498b17ea5433a686aa0d82e882608dcdcea9a116a3f4d670
>+SIZE (pdns-recursor-4.1.11.tar.bz2) = 1239986
>Index: files/patch-dnsname.hh
>===================================================================
>--- files/patch-dnsname.hh	(revision 492089)
>+++ files/patch-dnsname.hh	(working copy)
>@@ -1,4 +1,4 @@
>---- dnsname.hh.orig	2017-01-17 03:18:41 UTC
>+--- dnsname.hh.orig	2019-01-31 19:43:44 UTC
> +++ dnsname.hh
> @@ -30,7 +30,7 @@
>  #include <boost/version.hpp>
>@@ -9,7 +9,7 @@
>  #include <boost/container/string.hpp>
>  #endif
>  
>-@@ -133,7 +133,7 @@ public:
>+@@ -135,7 +135,7 @@ class DNSName (public)
>    inline bool canonCompare(const DNSName& rhs) const;
>    bool slowCanonCompare(const DNSName& rhs) const;  
>  
>Index: files/patch-rec__channel.cc
>===================================================================
>--- files/patch-rec__channel.cc	(nonexistent)
>+++ files/patch-rec__channel.cc	(working copy)
>@@ -0,0 +1,27 @@
>+$OpenBSD: patch-rec_channel_cc,v 1.1.1.1 2018/12/29 14:29:08 sthen Exp $
>+
>+Index: rec_channel.cc
>+--- rec_channel.cc.orig	2019-01-31 19:43:44 UTC
>++++ rec_channel.cc
>+@@ -54,6 +54,10 @@ int RecursorControlChannel::listen(const string& fname
>+   if(bind(d_fd, (sockaddr*)&d_local,sizeof(d_local))<0) 
>+     throw PDNSException("Unable to bind to controlsocket '"+fname+"': "+stringerror());
>+ 
>++  int bufsz = 60*1024;
>++  setsockopt(d_fd, SOL_SOCKET, SO_SNDBUF, &bufsz, sizeof(bufsz));
>++  bufsz = 64*1024;
>++  setsockopt(d_fd, SOL_SOCKET, SO_RCVBUF, &bufsz, sizeof(bufsz));
>+   return d_fd;
>+ }
>+ 
>+@@ -99,6 +103,10 @@ void RecursorControlChannel::connect(const string& pat
>+ 	unlink(d_local.sun_path);
>+       throw PDNSException("Unable to connect to remote '"+string(remote.sun_path)+"': "+stringerror());
>+     }
>++    int bufsz = 60*1024;
>++    setsockopt(d_fd, SOL_SOCKET, SO_SNDBUF, &bufsz, sizeof(bufsz));
>++    bufsz = 64*1024;
>++    setsockopt(d_fd, SOL_SOCKET, SO_RCVBUF, &bufsz, sizeof(bufsz));
>+ 
>+   } catch (...) {
>+     close(d_fd);
>
>Property changes on: files/patch-rec__channel.cc
>___________________________________________________________________
>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

Flags:

tremere: maintainer-approval+

Actions: View | Diff

Attachments on bug 235392: 201600 | 201722