From 40efc9a4e231826c03fa9744ae7f704c6765c64c Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Tue, 6 Jun 2023 14:54:22 +0200 Subject: [PATCH] pdns-recursor: Build rec-5.0.1, adding Rust dependencies also fix license variable Co-authored-by: Tianling Shen Signed-off-by: Otto Moerbeek Signed-off-by: Peter van Dijk --- net/pdns-recursor/Makefile | 15 ++++++++++----- .../patches/100-disable-recursor.conf-dist.patch | 7 +++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/net/pdns-recursor/Makefile b/net/pdns-recursor/Makefile index 0642c34597..36574b5a6d 100644 --- a/net/pdns-recursor/Makefile +++ b/net/pdns-recursor/Makefile @@ -1,23 +1,25 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pdns-recursor -PKG_VERSION:=4.9.2 +PKG_VERSION:=5.0.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/ -PKG_HASH:=4cb8180458ecfb528a3d9a34ba2844b6cd2ed69ca1c461dde24a0ebd66829144 +PKG_HASH:=70a3b0bfde350e94cdb0746b06d06e6d2f3dc0e171be3b12caef9f3c38468ca3 PKG_MAINTAINER:=Peter van Dijk -PKG_LICENCE:=GPL-2.0-only -PKG_LICENCE_FILES:=COPYING +PKG_LICENSE:=GPL-2.0-only +PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:powerdns:recursor PKG_FIXUP:=autoreconf -PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=rust/host PKG_BUILD_PARALLEL:=1 +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include ../../lang/rust/rust-values.mk define Package/pdns-recursor SECTION:=net @@ -52,6 +54,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 index 4a9e90b0a4..d611e71bda 100644 --- 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: +@@ -527,15 +527,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 \ -- 2.30.2