2 files changed, 0 insertions, 52 deletions

diff --git a/dns/powerdns/files/patch-ext_json11_json11.cpp b/dns/powerdns/files/patch-ext_json11_json11.cpp
deleted file mode 100644
index 65252fe28a63..000000000000
--- a/dns/powerdns/files/patch-ext_json11_json11.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
---- ext/json11/json11.cpp.orig	2017-01-18 18:06:37 UTC
-+++ 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 @@ 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({}) {}
- };
- 
- /* * * * * * * * * * * * * * * * * * * *
diff --git a/dns/powerdns/files/patch-pdns_botan110signers.cc b/dns/powerdns/files/patch-pdns_botan110signers.cc
deleted file mode 100644
index 3331b5a5f738..000000000000
--- a/dns/powerdns/files/patch-pdns_botan110signers.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/PowerDNS/pdns/pull/5498/commits/0f8f34997afc2c3609b2f3df72ca808940d2a778#diff-a69f1deeeb9a0d7ebabc200a4c24c9f9L184
---- pdns/botan110signers.cc.orig	2017-08-31 08:52:49 UTC
-+++ pdns/botan110signers.cc
-@@ -181,8 +181,9 @@ std::string GOSTDNSCryptoKeyEngine::getP
- 
- std::string GOSTDNSCryptoKeyEngine::getPublicKeyString() const
- {
--  const BigInt&x =d_key->public_point().get_affine_x();
--  const BigInt&y =d_key->public_point().get_affine_y();
-+  std::shared_ptr<GOST_3410_PublicKey> pk = d_pubkey ? d_pubkey : d_key;
-+  const BigInt&x =pk->public_point().get_affine_x();
-+  const BigInt&y =pk->public_point().get_affine_y();
-   
-   size_t part_size = std::max(x.bytes(), y.bytes());
-