- Update to 1.2.0

- Remove patch that was upstreamed
- Switch from devel/llvm39 to devel/llvm40 when building on 10.3
- Update WWW in pkg-descr

Changes: https://mailman.powerdns.com/pipermail/dnsdist/2017-August/000358.html

MFH:		2017Q3
Security:	CVE-2016-7069
Security:	CVE-2017-7557

1 files changed, 0 insertions, 36 deletions

diff --git a/dns/dnsdist/files/patch-ext_json11_json11.cpp b/dns/dnsdist/files/patch-ext_json11_json11.cpp
deleted file mode 100644
index 600308eaa51b..000000000000
--- a/dns/dnsdist/files/patch-ext_json11_json11.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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({}) {}
- };
- 
- /* * * * * * * * * * * * * * * * * * * *