From af3b2e21ddaab378b1197c0a056478d3fb780b89 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sat, 10 Oct 2020 14:48:59 -0700
Subject: [PATCH] pdns-recursor: update to 4.3.4

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 net/pdns-recursor/Makefile                        | 15 ++++++++++-----
 .../patches/100-disable-recursor.conf-dist.patch  |  2 +-
 .../patches/200-boost_thread_fix.patch            |  6 +++---
 net/pdns-recursor/patches/300-boost-173.patch     |  2 +-
 .../patches/400-openssl-deprecated.patch          | 10 ++++++++++
 5 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 net/pdns-recursor/patches/400-openssl-deprecated.patch

diff --git a/net/pdns-recursor/Makefile b/net/pdns-recursor/Makefile
index f9b359e7b4..6d0ed51544 100644
--- a/net/pdns-recursor/Makefile
+++ b/net/pdns-recursor/Makefile
@@ -1,21 +1,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pdns-recursor
-PKG_VERSION:=4.2.2
+PKG_VERSION:=4.3.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/
-PKG_HASH:=9502de8ab7dde3fe5ecb3dea0f6dd8f9c96ca5e09b06f3d58d2f123abf6f7204
+PKG_HASH:=38dd6935830d9e9f14f6cb53f88914bab09e50e57ac8aed5b5b9a4386d8328d1
 
 PKG_MAINTAINER:=James Taylor <james@jtaylor.id.au>
 PKG_LICENCE:=GPL-2.0-only
 PKG_LICENCE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:powerdns:recursor
 
-PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
+PKG_BUILD_DEPENDS:=protobuf/host
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -25,7 +26,7 @@ define Package/pdns-recursor
   SUBMENU:=IP Addresses and Names
   USERID:=pdns:pdns
   TITLE:=PowerDNS Recursor
-  DEPENDS:=+boost +boost-context +libatomic +liblua +libopenssl +protobuf
+  DEPENDS:=+boost +boost-context +boost-filesystem +libatomic +liblua +libopenssl +protobuf
   URL:=https://www.powerdns.com/recursor.html
 endef
 
@@ -39,7 +40,7 @@ define Package/pdns-recursor/conffiles
 /etc/init.d/pdns-recursor
 endef
 
-CONFIGURE_ARGS+= \
+CONFIGURE_ARGS += \
 	--sysconfdir=/etc/powerdns \
 	--with-lua=lua \
 	--without-libcap \
@@ -48,6 +49,10 @@ CONFIGURE_ARGS+= \
 	--without-net-snmp \
 	--disable-silent-rules
 
+CONFIGURE_VARS += \
+	boost_cv_lib_context=yes \
+	boost_cv_lib_context_LIBS=-lboost_context
+
 define Package/pdns-recursor/install
 	$(INSTALL_DIR) $(1)/etc/powerdns
 	$(INSTALL_CONF) ./files/recursor.conf-dist $(1)/etc/powerdns/
diff --git a/net/pdns-recursor/patches/100-disable-recursor.conf-dist.patch b/net/pdns-recursor/patches/100-disable-recursor.conf-dist.patch
index 6bd1a0d8bc..f11d2364e1 100644
--- a/net/pdns-recursor/patches/100-disable-recursor.conf-dist.patch
+++ b/net/pdns-recursor/patches/100-disable-recursor.conf-dist.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -357,12 +357,6 @@
+@@ -444,12 +444,6 @@
  pubsuffix.cc: $(srcdir)/effective_tld_names.dat
  	$(AM_V_GEN)./mkpubsuffixcc
 
diff --git a/net/pdns-recursor/patches/200-boost_thread_fix.patch b/net/pdns-recursor/patches/200-boost_thread_fix.patch
index 213533f4a2..e8ca61b537 100644
--- a/net/pdns-recursor/patches/200-boost_thread_fix.patch
+++ b/net/pdns-recursor/patches/200-boost_thread_fix.patch
@@ -1,6 +1,6 @@
 --- a/m4/boost.m4
 +++ b/m4/boost.m4
-@@ -667,12 +667,15 @@
+@@ -671,12 +671,15 @@ LDFLAGS=$boost_filesystem_save_LDFLAGS
  BOOST_DEFUN([Context],
  [boost_context_save_LIBS=$LIBS
   boost_context_save_LDFLAGS=$LDFLAGS
@@ -20,5 +20,5 @@
 +#  LDFLAGS="$LDFLAGS $BOOST_THREAD_LDFLAGS"
 +#fi
  
- if test $boost_major_version -ge 161; then
- BOOST_FIND_LIB([context], [$1],
+ if test $boost_major_version -ge 169; then
+ 
diff --git a/net/pdns-recursor/patches/300-boost-173.patch b/net/pdns-recursor/patches/300-boost-173.patch
index ecddd9d8d1..ff89f5bb7f 100644
--- a/net/pdns-recursor/patches/300-boost-173.patch
+++ b/net/pdns-recursor/patches/300-boost-173.patch
@@ -11,7 +11,7 @@
    string err;
 --- a/ws-recursor.cc
 +++ b/ws-recursor.cc
-@@ -45,6 +45,7 @@
+@@ -46,6 +46,7 @@
  
  extern thread_local FDMultiplexer* t_fdm;
  
diff --git a/net/pdns-recursor/patches/400-openssl-deprecated.patch b/net/pdns-recursor/patches/400-openssl-deprecated.patch
new file mode 100644
index 0000000000..efd5590f10
--- /dev/null
+++ b/net/pdns-recursor/patches/400-openssl-deprecated.patch
@@ -0,0 +1,10 @@
+--- a/opensslsigners.cc
++++ b/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>
-- 
2.30.2