Attachment 177223 Details for Bug 214470 – std::string workaround

[patch] std::string workaround

pdns_recursor.boost162.partial-crashfix.diff (text/plain), 1.93 KB, created by Jan Beich on 2016-11-21 04:47:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-11-21 04:47:15 UTC

Size: 1.93 KB

patch

obsolete

>From 27960477ecf7f6efc1ebe9983927eaf7f67a517d Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Mon, 21 Nov 2016 04:39:15 +0000
>Subject: dns/powerdns-recursor: work around crash with boost 1.62
>
>Assertion failed: (this != &x), function operator=, file /usr/local/include/boost/container/string.hpp, line 830.
>
>PR:		214470
>Approved by:	portmgr blanket
>---
> dns/powerdns-recursor/Makefile               |  1 +
> dns/powerdns-recursor/files/patch-dnsname.hh | 20 ++++++++++++++++++++
> 2 files changed, 21 insertions(+)
> create mode 100644 dns/powerdns-recursor/files/patch-dnsname.hh
>
>diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile
>index b84f782..2861b47 100644
>--- a/dns/powerdns-recursor/Makefile
>+++ b/dns/powerdns-recursor/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	recursor
> PORTVERSION=	4.0.3
>+PORTREVISION=	1
> CATEGORIES=	dns ipv6
> MASTER_SITES=	http://downloads.powerdns.com/releases/
> PKGNAMEPREFIX=	powerdns-
>diff --git a/dns/powerdns-recursor/files/patch-dnsname.hh b/dns/powerdns-recursor/files/patch-dnsname.hh
>new file mode 100644
>index 0000000..fc7993f
>--- /dev/null
>+++ b/dns/powerdns-recursor/files/patch-dnsname.hh
>@@ -0,0 +1,20 @@
>+--- dnsname.hh.orig	2016-09-06 12:50:29 UTC
>++++ dnsname.hh
>+@@ -30,7 +30,7 @@
>+ #include <boost/version.hpp>
>+ 
>+ // it crashes on OSX and doesn't compile on OpenBSD
>+-#if BOOST_VERSION >= 104800 && ! defined( __APPLE__ ) && ! defined(__OpenBSD__)
>++#if BOOST_VERSION >= 104800 && ! defined(_LIBCPP_VERSION) && ! defined(__OpenBSD__)
>+ #include <boost/container/string.hpp>
>+ #endif
>+ 
>+@@ -133,7 +133,7 @@ public:
>+   inline bool canonCompare(const DNSName& rhs) const;
>+   bool slowCanonCompare(const DNSName& rhs) const;  
>+ 
>+-#if BOOST_VERSION >= 104800 && ! defined( __APPLE__ ) && ! defined(__OpenBSD__)
>++#if BOOST_VERSION >= 104800 && ! defined(_LIBCPP_VERSION) && ! defined(__OpenBSD__)
>+   typedef boost::container::string string_t;
>+ #else
>+   typedef std::string string_t;

Actions: View | Diff

Attachments on bug 214470: 177195 | 177198 | 177222 | 177223