pdns-recursor: Build rec-5.0.0, adding Rust dependencies

Signed-off-by: Otto Moerbeek <otto@drijf.net>
PowerDNS · Dec 8, 2023 · ea1f503 · ea1f503
1 parent 52e3ed8
commit ea1f503
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/net/pdns-recursor/Makefile b/net/pdns-recursor/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pdns-recursor
-PKG_VERSION:=4.9.2
-PKG_RELEASE:=1
+PKG_VERSION:=5.0.0-rc1
+PKG_RELEASE:=0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/
-PKG_HASH:=4cb8180458ecfb528a3d9a34ba2844b6cd2ed69ca1c461dde24a0ebd66829144
+PKG_HASH:=44194af0d89839fe3684ef1f0c0586ff77d2e0d32417b4cb64824e17538ca5b3
 
 PKG_MAINTAINER:=Peter van Dijk <peter.van.dijk@powerdns.com>
 PKG_LICENCE:=GPL-2.0-only
@@ -17,8 +17,12 @@ PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
+PKG_BUILD_DEPENDS:=rust/host
+
 include $(INCLUDE_DIR)/package.mk
 
+include ../../lang/rust/rust-values.mk
+
 define Package/pdns-recursor
   SECTION:=net
   CATEGORY:=Network
@@ -42,7 +46,7 @@ endef
 # not everything groks --disable-nls
 DISABLE_NLS:=
 
-CONFIGURE_ARGS += \
+CONFIGURE_ARGS +=
 	--sysconfdir=/etc/powerdns \
 	--with-lua=lua \
 	--without-libcap \
@@ -52,6 +56,9 @@ CONFIGURE_ARGS += \
 	--enable-reproducible \
 	--disable-silent-rules
 
+MAKE_VARS += RUSTC_TARGET_ARCH=$(RUSTC_TARGET_ARCH)
+MAKE_VARS += RUST_TARGET=--target=$(RUSTC_TARGET_ARCH)
+
 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
@@ -1,14 +1,17 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -507,12 +507,6 @@ $(srcdir)/effective_tld_names.dat:
+@@ -529,15 +529,6 @@ $(srcdir)/effective_tld_names.dat:
  pubsuffix.cc: $(srcdir)/effective_tld_names.dat
  	$(AM_V_GEN)./mkpubsuffixcc
 
 -## Config file
--sysconf_DATA = recursor.conf-dist
+-sysconf_DATA = recursor.conf-dist recursor.yml-dist
 -
 -recursor.conf-dist: pdns_recursor
 -	$(AM_V_GEN)./pdns_recursor --config=default > $@
+-
+-recursor.yml-dist: pdns_recursor
+-	dir=$$(mktemp -d) && touch "$$dir/recursor.yml" && ./pdns_recursor --config-dir="$$dir" --config=default 2> /dev/null > $@ && rm "$$dir/recursor.yml" && rmdir "$$dir"
 -
  ## Manpages
  MANPAGES=pdns_recursor.1 \