Merge pull request #15694 from PowerDNS/dnsdist-1.6.0

dnsdist: update to 1.6.0 and make some features optional

net/dnsdist/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsdist
-PKG_VERSION:=1.5.1
-PKG_RELEASE:=1
+PKG_VERSION:=1.6.0
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/
-PKG_HASH:=cae759729a87703f4d09b0ed4227cb224aaaa252fa92f2432fd7116f560afbf1
+PKG_HASH:=a7783a04d8d4ad2b0168ffaaf85ef95d5f557057b0462280684dd799d0cdd292
 
 PKG_MAINTAINER:=James Taylor <james@jtaylor.id.au>
 PKG_LICENSE:=GPL-2.0-only
@@ -17,7 +17,7 @@ PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
 PKG_ASLR_PIE:=0
-PKG_BUILD_DEPENDS:=protobuf/host
+PKG_BUILD_DEPENDS:=boost
 
 PKG_CONFIG_DEPENDS:= \
   CONFIG_DNSDIST_GNUTLS \
@@ -62,6 +62,30 @@ menu "Configuration"
 		help
 			"Enabled DNS over TLS Support for dnsdist"
 		default y
+
+	config DNSDIST_NET_SNMP
+		bool "Net-SNMP support"
+		help
+			"Enable Net-SNMP support for dnsdist"
+		default y
+
+	config DNSDIST_RE2
+		bool "RE2 support"
+		help
+			"Enable RE2 support for dnsdist"
+		default y
+
+	config DNSDIST_DNSTAP
+		bool "DNSTAP support"
+		help
+			"Enable DNSTAP support for dnsdist"
+		default y
+
+	config DNSDIST_SODIUM
+		bool "Build with libsodium
+		help
+			"Build with libsodium - for encrypted console connections, and DNSCrypt"
+		default y
 endmenu
 endef
 
@@ -74,17 +98,16 @@ define Package/dnsdist
 	  +DNSDIST_DNS_OVER_HTTPS:libh2o-evloop \
 	  +DNSDIST_GNUTLS:libgnutls \
 	  +DNSDIST_OPENSSL:libopenssl \
-	  +boost \
+	  +DNSDIST_NET_SNMP:libnetsnmp \
+	  +DNSDIST_RE2:re2 \
+	  +DNSDIST_DNSTAP:libfstrm \
+	  +DNSDIST_SODIUM:libsodium \
 	  +libatomic \
 	  +libcap \
 	  +libedit \
-	  +libfstrm \
-	  +libnetsnmp \
-	  +libsodium \
+	  +libstdcpp \
 	  +lmdb \
-	  +lua \
-	  +protobuf \
-	  +re2 \
+	  +liblua \
 	  +tinycdb
   URL:=https://dnsdist.org/
 endef
@@ -101,15 +124,24 @@ define Package/dnsdist/conffiles
 /etc/init.d/dnsdist
 endef
 
+# not everything groks --disable-nls
+DISABLE_NLS:=
+
+# OpenWRT's setting of CXX destroys dnsdist's -std=c++17
+# --with-re2 compensates for that because it compensates for a bug in re2.pc that also destroys it
+# so this addition is for the --without-re2 case
+#
+# none of this is pretty
+TARGET_CXX+=-std=c++17
+
 CONFIGURE_ARGS+= \
-	--enable-dnscrypt \
-	--enable-dnstap \
-	--with-libsodium \
+	--enable-option-checking=fatal \
 	--with-pic \
-	--with-protobuf \
-	--with-re2 \
 	--with-lua=lua \
-	--with-net-snmp \
+	$(if $(CONFIG_DNSDIST_SODIUM),--enable-dnscrypt --with-libsodium,--disable-dnscrypt --without-libsodium) \
+	$(if $(CONFIG_DNSDIST_DNSTAP),--enable-dnstap=yes,--enable-dnstap=no) \
+	$(if $(CONFIG_DNSDIST_RE2),--with,--without)-re2 \
+	$(if $(CONFIG_DNSDIST_NET_SNMP),--with,--without)-net-snmp \
 	$(if $(CONFIG_DNSDIST_GNUTLS),--with,--without)-gnutls \
 	$(if $(CONFIG_DNSDIST_OPENSSL),--with,--without)-libssl \
 	$(if $(CONFIG_DNSDIST_DNS_OVER_TLS),--enable-dns-over-tls,) \

net/dnsdist/patches/010-time_t-check.patch

@@ -0,0 +1,12 @@
+--- a/configure
++++ b/configure
+@@ -5044,9 +5044,6 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ 
+-if test $ac_size -lt 8; then :
+-  as_fn_error $? "size of time_t is $ac_size, which is not large enough to fix the y2k38 bug" "$LINENO" 5
+-fi
+ 
+  typename=`echo time_t | sed "s/[^a-zA-Z0-9_]/_/g"`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time_t is signed" >&5