[pkgsrc/trunk]: pkgsrc/net/powerdns-recursor Merge patch from powerdns packag...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a0f88c48476f
branches:  trunk
changeset: 362709:a0f88c48476f
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon May 22 23:41:52 2017 +0000

description:
Merge patch from powerdns package to avoid ordering nullptrs.

diffstat:

 net/powerdns-recursor/distinfo                            |   3 +-
 net/powerdns-recursor/patches/patch-ext_json11_json11.cpp |  30 +++++++++++++++
 2 files changed, 32 insertions(+), 1 deletions(-)

diffs (50 lines):

diff -r ec0318e80439 -r a0f88c48476f net/powerdns-recursor/distinfo
--- a/net/powerdns-recursor/distinfo    Mon May 22 23:41:22 2017 +0000
+++ b/net/powerdns-recursor/distinfo    Mon May 22 23:41:52 2017 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.17 2017/03/31 19:41:13 fhajny Exp $
+$NetBSD: distinfo,v 1.18 2017/05/22 23:41:52 joerg Exp $
 
 SHA1 (pdns-recursor-4.0.4.tar.bz2) = e3d2f18e0ea929e425bc9da4256f76331797f691
 RMD160 (pdns-recursor-4.0.4.tar.bz2) = 12b1b7239156d9b898199c02a1edd6875301a7b1
 SHA512 (pdns-recursor-4.0.4.tar.bz2) = 9473dfe9abc509b2bb953139dd7892de2027ee1508902fa0c2cd30dd9a88878fcf44370b8372d573cbab12de32bb8c604005d3b39ea34db2ef86786e689d36ab
 Size (pdns-recursor-4.0.4.tar.bz2) = 1050596 bytes
 SHA1 (patch-dns.hh) = 7e9c1b10a066a605b74ebdbee2d894aed50f6c68
+SHA1 (patch-ext_json11_json11.cpp) = 2de8ea8b51556bd3e3c1a88f681697eff239ab1a
 SHA1 (patch-iputils.hh) = ab1c952d27648b6db9fd74eba987d10b79837517
 SHA1 (patch-kqueuemplexer.cc) = 87b3b6670393ee60fc96cf91c5acf575adfd06c0
 SHA1 (patch-qtype.hh) = f14eb9ad7efc7dd4a0ce220c1f93044ef69e99c2
diff -r ec0318e80439 -r a0f88c48476f net/powerdns-recursor/patches/patch-ext_json11_json11.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/powerdns-recursor/patches/patch-ext_json11_json11.cpp Mon May 22 23:41:52 2017 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-ext_json11_json11.cpp,v 1.1 2017/05/22 23:41:52 joerg Exp $
+
+Clang rejects ordering relations for nullptr, so introduce a template
+indirection.
+
+--- ext/json11/json11.cpp.orig 2017-01-13 08:55:55.000000000 +0000
++++ ext/json11/json11.cpp
+@@ -132,6 +132,13 @@ void Json::dump(string &out) const {
+  * Value wrappers
+  */
+ 
++template <typename T> bool json11_less(T a, T b) {
++  return a < b;
++}
++template <> bool json11_less(const std::nullptr_t a, const std::nullptr_t b) {
++  return false;
++}
++
+ template <Json::Type tag, typename T>
+ class Value : public JsonValue {
+ protected:
+@@ -150,7 +157,7 @@ protected:
+         return m_value == static_cast<const Value<tag, T> *>(other)->m_value;
+     }
+     bool less(const JsonValue * other) const override {
+-        return m_value < static_cast<const Value<tag, T> *>(other)->m_value;
++        return json11_less(m_value, static_cast<const Value<tag, T> *>(other)->m_value);
+     }
+ 
+     const T m_value;