Attachment 179021 Details for Bug 216069 – patch

[patch] patch

patch-dnsdist.diff (text/plain), 2.01 KB, created by Carlos J. Puga Medina on 2017-01-18 01:57:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J. Puga Medina

Created: 2017-01-18 01:57:16 UTC

Size: 2.01 KB

patch

obsolete

>Index: dns/dnsdist/Makefile
>===================================================================
>--- dns/dnsdist/Makefile	(revision 431778)
>+++ dns/dnsdist/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	dnsdist
> DISTVERSION=	1.1.0
>+PORTREVISION=	1
> CATEGORIES=	dns net
> MASTER_SITES=	https://downloads.powerdns.com/releases/ \
> 		LOCAL/cpm
>Index: dns/dnsdist/files/patch-ext_json11_json11.cpp
>===================================================================
>--- dns/dnsdist/files/patch-ext_json11_json11.cpp	(nonexistent)
>+++ dns/dnsdist/files/patch-ext_json11_json11.cpp	(working copy)
>@@ -0,0 +1,36 @@
>+--- ext/json11/json11.cpp.orig	2017-01-18 02:13:48 UTC
>++++ ext/json11/json11.cpp
>+@@ -37,11 +37,20 @@ using std::make_shared;
>+ using std::initializer_list;
>+ using std::move;
>+ 
>++/* Helper for representing null - just a do-nothing struct, plus comparison
>++ * operators so the helpers in JsonValue work. We can't use nullptr_t because
>++ * it may not be orderable.
>++*/
>++struct NullStruct {
>++    bool operator==(NullStruct) const { return true; }
>++    bool operator<(NullStruct) const { return false; }
>++};
>++
>+ /* * * * * * * * * * * * * * * * * * * *
>+  * Serialization
>+  */
>+ 
>+-static void dump(std::nullptr_t, string &out) {
>++static void dump(NullStruct, string &out) {
>+     out += "null";
>+ }
>+ 
>+@@ -204,9 +213,9 @@ public:
>+     explicit JsonObject(Json::object &&value)      : Value(move(value)) {}
>+ };
>+ 
>+-class JsonNull final : public Value<Json::NUL, std::nullptr_t> {
>++class JsonNull final : public Value<Json::NUL, NullStruct> {
>+ public:
>+-    JsonNull() : Value(nullptr) {}
>++    JsonNull() : Value({}) {}
>+ };
>+ 
>+ /* * * * * * * * * * * * * * * * * * * *
>
>Property changes on: dns/dnsdist/files/patch-ext_json11_json11.cpp
>___________________________________________________________________
>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:

cpm: maintainer-approval+

Actions: View | Diff

Attachments on bug 216069: 179021