diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-02-02 23:04:22 -0800 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2021-02-07 16:56:20 -0800 |
| commit | 1a3582ac63d30c5578a06d64643f8a4e5eb2d57a (patch) | |
| tree | ebcebdbef1a4c0c9b4b7d130057f6e6e99c5365a /net/pdns/patches | |
| parent | 702216588d138ea6c03073411a5aa01d7f753788 (diff) | |
pdns: update to 4.4.0
Use new AUTORELEASE variable.
Enable reproducible builds.
Remove Upstreamed patches. Refresh other one.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'net/pdns/patches')
| -rw-r--r-- | net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch | 21 | ||||
| -rw-r--r-- | net/pdns/patches/200-openssl-deprecated.patch | 20 | ||||
| -rw-r--r-- | net/pdns/patches/300-boost-173.patch | 32 |
3 files changed, 13 insertions, 60 deletions
diff --git a/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch b/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch index 2f1316e17..62a4c8b30 100644 --- a/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch +++ b/net/pdns/patches/100-pdns-disable-pdns.conf-dist.patch @@ -1,19 +1,24 @@ +diff --git a/pdns/Makefile.am b/pdns/Makefile.am +index 2df5fa7..2246088 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am -@@ -68,11 +68,9 @@ CLEANFILES = \ - backends/gsql/gsqlbackend.gcda \ +@@ -71,7 +71,6 @@ CLEANFILES = \ backends/gsql/gsqlbackend.gcno \ backends/gsql/gsqlbackend.gcov \ -- dnsmessage.pb.cc dnsmessage.pb.h \ -- pdns.conf-dist -+ dnsmessage.pb.cc dnsmessage.pb.h + dnsmessage.pb.cc dnsmessage.pb.h \ +- pdns.conf-dist \ + apidocfiles.h \ + api-swagger.yaml \ + api-swagger.json +@@ -99,7 +98,6 @@ apidocfiles.h: api-swagger.yaml api-swagger.json + ./incfiles $^ > $@ noinst_SCRIPTS = pdns.init -sysconf_DATA = pdns.conf-dist sbin_PROGRAMS = pdns_server bin_PROGRAMS = \ -@@ -112,7 +110,7 @@ if IXFRDIST +@@ -139,7 +137,7 @@ if IXFRDIST bin_PROGRAMS += \ ixfrdist @@ -22,12 +27,12 @@ ixfrdist.example.yml endif -@@ -1248,9 +1246,6 @@ dnspcap2protobuf_LDADD = \ +@@ -1278,9 +1276,6 @@ dnspcap2protobuf_LDADD = \ endif endif -pdns.conf-dist: pdns_server -- $(AM_V_GEN)./pdns_server --no-config --config=default 2>/dev/null > $@ +- $(AM_V_GEN)./pdns_server --config=default 2>/dev/null > $@ - testrunner_SOURCES = \ arguments.cc \ diff --git a/net/pdns/patches/200-openssl-deprecated.patch b/net/pdns/patches/200-openssl-deprecated.patch deleted file mode 100644 index cc6544b89..000000000 --- a/net/pdns/patches/200-openssl-deprecated.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/pdns/opensslsigners.cc -+++ b/pdns/opensslsigners.cc -@@ -29,6 +29,7 @@ - #if defined(HAVE_LIBCRYPTO_ED25519) || defined(HAVE_LIBCRYPTO_ED448) - #include <openssl/evp.h> - #endif -+#include <openssl/bn.h> - #include <openssl/sha.h> - #include <openssl/rand.h> - #include <openssl/rsa.h> ---- a/pdns/pkcs11signers.cc -+++ b/pdns/pkcs11signers.cc -@@ -15,6 +15,7 @@ - #include "pdns/lock.hh" - - #ifdef HAVE_LIBCRYPTO_ECDSA -+#include <openssl/bn.h> - #include <openssl/ec.h> - #endif - diff --git a/net/pdns/patches/300-boost-173.patch b/net/pdns/patches/300-boost-173.patch deleted file mode 100644 index aefdea7b3..000000000 --- a/net/pdns/patches/300-boost-173.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/pdns/ixfrdist-web.cc -+++ b/pdns/ixfrdist-web.cc -@@ -25,6 +25,8 @@ - #include "iputils.hh" - #include "ixfrdist-stats.hh" - -+using namespace boost::placeholders; -+ - string doGetStats(); - - IXFRDistWebServer::IXFRDistWebServer(const ComboAddress &listenAddress, const NetmaskGroup &acl, const string &loglevel) : ---- a/pdns/webserver.cc -+++ b/pdns/webserver.cc -@@ -36,6 +36,8 @@ - #include "uuid-utils.hh" - #include <yahttp/router.hpp> - -+using namespace boost::placeholders; -+ - json11::Json HttpRequest::json() - { - string err; ---- a/pdns/ws-auth.cc -+++ b/pdns/ws-auth.cc -@@ -49,6 +49,7 @@ - #include "tsigutils.hh" - - using json11::Json; -+using namespace boost::placeholders; - - extern StatBag S; - |