CVS commit: [pkgsrc-2017Q1] pkgsrc/net/powerdns-recursor

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Jun  3 18:21:33 UTC 2017

Modified Files:
        pkgsrc/net/powerdns-recursor [pkgsrc-2017Q1]: distinfo
Added Files:
        pkgsrc/net/powerdns-recursor/patches [pkgsrc-2017Q1]:
            patch-ext_json11_json11.cpp

Log Message:
Pullup ticket #5461 - requested by sevan
net/powerdns-recursor: build fix

Revisions pulled up:
- net/powerdns-recursor/distinfo                                1.18
- net/powerdns-recursor/patches/patch-ext_json11_json11.cpp     1.1

---
   Module Name:    pkgsrc
   Committed By:   joerg
   Date:           Mon May 22 23:41:52 UTC 2017

   Modified Files:
           pkgsrc/net/powerdns-recursor: distinfo
   Added Files:
           pkgsrc/net/powerdns-recursor/patches: patch-ext_json11_json11.cpp

   Log Message:
   Merge patch from powerdns package to avoid ordering nullptrs.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.2.1 pkgsrc/net/powerdns-recursor/distinfo
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/net/powerdns-recursor/patches/patch-ext_json11_json11.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/powerdns-recursor/distinfo
diff -u pkgsrc/net/powerdns-recursor/distinfo:1.16 pkgsrc/net/powerdns-recursor/distinfo:1.16.2.1
--- pkgsrc/net/powerdns-recursor/distinfo:1.16  Thu Mar  9 13:43:49 2017
+++ pkgsrc/net/powerdns-recursor/distinfo       Sat Jun  3 18:21:33 2017
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.16 2017/03/09 13:43:49 fhajny Exp $
+$NetBSD: distinfo,v 1.16.2.1 2017/06/03 18:21:33 bsiegert 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) = aaf3b913fbe26f5daa9c2b16ff24cc9a7a1d7de0
 SHA1 (patch-kqueuemplexer.cc) = 87b3b6670393ee60fc96cf91c5acf575adfd06c0
 SHA1 (patch-qtype.hh) = f14eb9ad7efc7dd4a0ce220c1f93044ef69e99c2

Added files:

Index: pkgsrc/net/powerdns-recursor/patches/patch-ext_json11_json11.cpp
diff -u /dev/null pkgsrc/net/powerdns-recursor/patches/patch-ext_json11_json11.cpp:1.1.2.2
--- /dev/null   Sat Jun  3 18:21:33 2017
+++ pkgsrc/net/powerdns-recursor/patches/patch-ext_json11_json11.cpp    Sat Jun  3 18:21:33 2017
@@ -0,0 +1,30 @@
+$NetBSD: patch-ext_json11_json11.cpp,v 1.1.2.2 2017/06/03 18:21:33 bsiegert 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;