Compile tested only, it's too cold and the latency is too high at Elk
Lakes to throw it on my signer.
OK? (will test it on my signer before committing obv.)
diff --git Makefile Makefile
index c96c9a9b108..dfab66a6f7b 100644
--- Makefile
+++ Makefile
@@ -7,7 +7,7 @@ COMMENT-mysql= MySQL database access module for
PowerDNS
COMMENT-pgsql= PGSQL database access module for PowerDNS
COMMENT-ldap= LDAP module for PowerDNS
-V= 4.0.4
+V= 4.0.5
DISTNAME= pdns-${V}
EXTRACT_SUFX = .tar.bz2
PKGNAME= powerdns-${V}
@@ -18,10 +18,6 @@ PKGNAME-ldap= powerdns-ldap-${V}
CATEGORIES= net
HOMEPAGE= http://www.powerdns.com/
MAINTAINER= Florian Obser <florian+po...@narrans.de>
-REVISION-ldap= 0
-REVISION-main= 0
-REVISION-mysql= 0
-REVISION-pgsql= 0
MULTI_PACKAGES= -main -mysql -pgsql -ldap
diff --git distinfo distinfo
index 0b14f5ac821..a859c5b44e4 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (pdns-4.0.4.tar.bz2) = 2XSrid5pR3x/WBoyM7xzHqy7Q9R5KR5HKyxTHIO212M=
-SIZE (pdns-4.0.4.tar.bz2) = 1320327
+SHA256 (pdns-4.0.5.tar.bz2) = W8j61TfazgKlvwxxopsbUwOv20HQIxoXoG8YJjSJ7CQ=
+SIZE (pdns-4.0.5.tar.bz2) = 1323468
diff --git patches/patch-ext_json11_json11_cpp
patches/patch-ext_json11_json11_cpp
deleted file mode 100644
index caf69e13d07..00000000000
--- patches/patch-ext_json11_json11_cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-$OpenBSD: patch-ext_json11_json11_cpp,v 1.1 2017/05/27 06:21:43 espie Exp $
-nullptrs are non-comparable.
-patch from freebsd
-
-Index: ext/json11/json11.cpp
---- ext/json11/json11.cpp.orig
-+++ ext/json11/json11.cpp
-@@ -37,11 +37,21 @@ 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 +214,9 @@ class JsonObject final : public Value<Json::OBJECT, Js
- 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({}) {}
- };
-
- /* * * * * * * * * * * * * * * * * * * *
--
I'm not entirely sure you are real.
