From b17cf4199dd92cc3d23f851858b1cea472340585 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Wed, 21 Apr 2021 15:02:56 +0200 Subject: [PATCH 1/5] dnsdist: update to 1.6.0 Signed-off-by: Peter van Dijk --- net/dnsdist/Makefile | 17 +++++++++-------- net/dnsdist/patches/010-time_t-check.patch | 12 ++++++++++++ 2 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 net/dnsdist/patches/010-time_t-check.patch diff --git a/net/dnsdist/Makefile b/net/dnsdist/Makefile index 62ca755a0..b0d8f3c50 100644 --- a/net/dnsdist/Makefile +++ b/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 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 \ @@ -74,7 +74,6 @@ define Package/dnsdist +DNSDIST_DNS_OVER_HTTPS:libh2o-evloop \ +DNSDIST_GNUTLS:libgnutls \ +DNSDIST_OPENSSL:libopenssl \ - +boost \ +libatomic \ +libcap \ +libedit \ @@ -82,9 +81,8 @@ define Package/dnsdist +libnetsnmp \ +libsodium \ +lmdb \ - +lua \ - +protobuf \ +re2 \ + +liblua \ +tinycdb URL:=https://dnsdist.org/ endef @@ -101,12 +99,15 @@ define Package/dnsdist/conffiles /etc/init.d/dnsdist endef +# not everything groks --disable-nls +DISABLE_NLS:= + CONFIGURE_ARGS+= \ + --enable-option-checking=fatal \ --enable-dnscrypt \ --enable-dnstap \ --with-libsodium \ --with-pic \ - --with-protobuf \ --with-re2 \ --with-lua=lua \ --with-net-snmp \ diff --git a/net/dnsdist/patches/010-time_t-check.patch b/net/dnsdist/patches/010-time_t-check.patch new file mode 100644 index 000000000..e8760e4b5 --- /dev/null +++ b/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 From e8c8c5cce0d1fa9d49d4ec622ee1ed1c4c8c9cab Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Thu, 22 Apr 2021 17:57:25 +0200 Subject: [PATCH 2/5] dnsdist: make net-snmp support optional Signed-off-by: Peter van Dijk --- net/dnsdist/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net/dnsdist/Makefile b/net/dnsdist/Makefile index b0d8f3c50..353b0d6fc 100644 --- a/net/dnsdist/Makefile +++ b/net/dnsdist/Makefile @@ -62,6 +62,12 @@ 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 endmenu endef @@ -74,11 +80,11 @@ define Package/dnsdist +DNSDIST_DNS_OVER_HTTPS:libh2o-evloop \ +DNSDIST_GNUTLS:libgnutls \ +DNSDIST_OPENSSL:libopenssl \ + +DNSDIST_NET_SNMP:libnetsnmp \ +libatomic \ +libcap \ +libedit \ +libfstrm \ - +libnetsnmp \ +libsodium \ +lmdb \ +re2 \ @@ -110,7 +116,7 @@ CONFIGURE_ARGS+= \ --with-pic \ --with-re2 \ --with-lua=lua \ - --with-net-snmp \ + $(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,) \ From 6d8fb2091cc7cbda5a6d64bcc4b95bc8770abf4c Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Thu, 22 Apr 2021 23:45:02 +0200 Subject: [PATCH 3/5] dnsdist: make re2 support optional Signed-off-by: Peter van Dijk --- net/dnsdist/Makefile | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/net/dnsdist/Makefile b/net/dnsdist/Makefile index 353b0d6fc..10dd021de 100644 --- a/net/dnsdist/Makefile +++ b/net/dnsdist/Makefile @@ -68,6 +68,12 @@ menu "Configuration" help "Enable Net-SNMP support for dnsdist" default y + + config DNSDIST_RE2 + bool "RE2 support" + help + "Enable RE2 support for dnsdist" + default y endmenu endef @@ -81,13 +87,14 @@ define Package/dnsdist +DNSDIST_GNUTLS:libgnutls \ +DNSDIST_OPENSSL:libopenssl \ +DNSDIST_NET_SNMP:libnetsnmp \ + +DNSDIST_RE2:re2 \ +libatomic \ +libcap \ +libedit \ +libfstrm \ +libsodium \ + +libstdcpp \ +lmdb \ - +re2 \ +liblua \ +tinycdb URL:=https://dnsdist.org/ @@ -108,14 +115,21 @@ 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-option-checking=fatal \ --enable-dnscrypt \ --enable-dnstap \ --with-libsodium \ --with-pic \ - --with-re2 \ --with-lua=lua \ + $(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 \ From 174ac452a3fcff50d89ea8fbc5beefc9174ae252 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Tue, 27 Apr 2021 21:19:12 +0200 Subject: [PATCH 4/5] dnsdist: make dnstap support (and with it the libfstrm dep) optional Signed-off-by: Peter van Dijk --- net/dnsdist/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net/dnsdist/Makefile b/net/dnsdist/Makefile index 10dd021de..9c60ada6e 100644 --- a/net/dnsdist/Makefile +++ b/net/dnsdist/Makefile @@ -74,6 +74,12 @@ menu "Configuration" help "Enable RE2 support for dnsdist" default y + + config DNSDIST_DNSTAP + bool "DNSTAP support" + help + "Enable DNSTAP support for dnsdist" + default y endmenu endef @@ -88,10 +94,10 @@ define Package/dnsdist +DNSDIST_OPENSSL:libopenssl \ +DNSDIST_NET_SNMP:libnetsnmp \ +DNSDIST_RE2:re2 \ + +DNSDIST_DNSTAP:libfstrm \ +libatomic \ +libcap \ +libedit \ - +libfstrm \ +libsodium \ +libstdcpp \ +lmdb \ @@ -125,10 +131,10 @@ TARGET_CXX+=-std=c++17 CONFIGURE_ARGS+= \ --enable-option-checking=fatal \ --enable-dnscrypt \ - --enable-dnstap \ --with-libsodium \ --with-pic \ --with-lua=lua \ + $(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 \ From 013ae32427f75fb7dc6ed68015cc865fce7adc23 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Tue, 27 Apr 2021 21:50:53 +0200 Subject: [PATCH 5/5] dnsdist: make sodium optional Signed-off-by: Peter van Dijk --- net/dnsdist/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/net/dnsdist/Makefile b/net/dnsdist/Makefile index 9c60ada6e..5dfe18334 100644 --- a/net/dnsdist/Makefile +++ b/net/dnsdist/Makefile @@ -80,6 +80,12 @@ menu "Configuration" 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 @@ -95,10 +101,10 @@ define Package/dnsdist +DNSDIST_NET_SNMP:libnetsnmp \ +DNSDIST_RE2:re2 \ +DNSDIST_DNSTAP:libfstrm \ + +DNSDIST_SODIUM:libsodium \ +libatomic \ +libcap \ +libedit \ - +libsodium \ +libstdcpp \ +lmdb \ +liblua \ @@ -130,10 +136,9 @@ TARGET_CXX+=-std=c++17 CONFIGURE_ARGS+= \ --enable-option-checking=fatal \ - --enable-dnscrypt \ - --with-libsodium \ --with-pic \ --with-lua=lua \ + $(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 \