Attachment 247839 Details for Bug 276520 – Update PowerDNS Recursor to 5.0.1

[patch] Update PowerDNS Recursor to 5.0.1

powerdns-recursor-5.0.1.patch (text/plain), 11.16 KB, created by Ralf van der Enden on 2024-01-22 10:32:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf van der Enden

Created: 2024-01-22 10:32:47 UTC

Size: 11.16 KB

patch

obsolete

>From 7499178f9d8244c3f8ddccd7031489d669a8c03b Mon Sep 17 00:00:00 2001
>From: Ralf van der Enden <tremere@cainites.net>
>Date: Fri, 12 Jan 2024 23:39:24 +0100
>Subject: [PATCH] dns/powerdns-recursor: update to 5.0.1
>
>PR: 276520
>Approved by: submitter is maintainer
>---
> dns/powerdns-recursor/Makefile                | 23 +++++--
> dns/powerdns-recursor/Makefile.crates         | 30 +++++++++
> dns/powerdns-recursor/distinfo                | 66 ++++++++++++++++++-
> .../files/patch-m4_pdns__check__libcrypto.m4  |  3 +-
> dns/powerdns-recursor/files/patch-rec-main.cc | 18 -----
> dns/powerdns-recursor/pkg-plist               |  1 +
> 6 files changed, 115 insertions(+), 26 deletions(-)
> create mode 100644 dns/powerdns-recursor/Makefile.crates
> delete mode 100644 dns/powerdns-recursor/files/patch-rec-main.cc
>
>diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile
>index 8d3129d05a..63ca622883 100644
>--- a/dns/powerdns-recursor/Makefile
>+++ b/dns/powerdns-recursor/Makefile
>@@ -1,9 +1,10 @@
> PORTNAME=	recursor
>-DISTVERSION=	4.9.2
>+DISTVERSION=	5.0.1
> CATEGORIES=	dns
> MASTER_SITES=	http://downloads.powerdns.com/releases/
> PKGNAMEPREFIX=	powerdns-
> DISTNAME=	pdns-${PORTNAME}-${DISTVERSION}
>+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
> 
> MAINTAINER=	tremere@cainites.net
> COMMENT=	Advanced DNS recursor
>@@ -14,14 +15,16 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> BROKEN_armv6=	fails to compile: use of overloaded operator << is ambiguous
> BROKEN_armv7=	fails to compile: use of overloaded operator << is ambiguous
>+BROKEN_FreeBSD_12_powerpc64=	fails to compile: Assembler messages: unaligned opcodes detected in executable segment
> NOT_FOR_ARCHS=	i386
> NOT_FOR_ARCHS_REASON=	archs with 32-bits time_t are no longer supported by upstream
> 
> BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
>-LIB_DEPENDS=	libboost_context.so:devel/boost-libs
>+LIB_DEPENDS=	libboost_context.so:devel/boost-libs \
>+		libcurl.so:ftp/curl
> 
>-USES=		autoreconf compiler:c++11-lib cpe gmake libtool \
>-		localbase:ldflags pkgconfig ssl tar:bzip2
>+USES=		autoreconf cargo compiler:c++11-lib cpe gmake libtool \
>+		localbase:ldflags pkgconfig python:build ssl tar:bzip2
> 
> CPE_VENDOR=	powerdns
> USE_RC_SUBR=	pdns-recursor
>@@ -29,10 +32,19 @@ USE_RC_SUBR=	pdns-recursor
> GNU_CONFIGURE=	YES
> CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/pdns \
> 		--with-libsodium=no \
>+		--with-service-user=pdns \
>+		--with-service-group=pdns_recursor \
> 		--without-net-snmp \
> 		--without-systemd
> 
>+CARGO_CARGOLOCK=	${WRKSRC}/settings/rust/Cargo.lock
>+CARGO_CARGOTOML=	${WRKSRC}/settings/rust/Cargo.toml
>+CARGO_BUILD=		no
>+CARGO_INSTALL=		no
>+CARGO_TEST=		no
>+
> SUB_FILES=	pkg-message
>+TARGET_ORDER_OVERRIDE=	750:cargo-configure
> 
> USERS=		pdns_recursor
> GROUPS=		pdns
>@@ -54,6 +66,9 @@ LUAJIT_CONFIGURE_ON=	--with-lua=luajit
> 
> LUA_USES=	lua
> 
>+#pre-configure:
>+#	@cd ${WRKSRC}/settings && ${PYTHON_CMD} generate.py
>+
> post-install:
> 	@${MKDIR} ${STAGEDIR}/var/run/pdns-recursor
> 
>diff --git a/dns/powerdns-recursor/Makefile.crates b/dns/powerdns-recursor/Makefile.crates
>new file mode 100644
>index 0000000000..f7f34454f8
>--- /dev/null
>+++ b/dns/powerdns-recursor/Makefile.crates
>@@ -0,0 +1,30 @@
>+CARGO_CRATES=	cc-1.0.84 \
>+		codespan-reporting-0.11.1 \
>+		cxx-1.0.110 \
>+		cxx-build-1.0.110 \
>+		cxxbridge-flags-1.0.110 \
>+		cxxbridge-macro-1.0.110 \
>+		equivalent-1.0.1 \
>+		hashbrown-0.14.2 \
>+		indexmap-2.1.0 \
>+		ipnet-2.9.0 \
>+		itoa-1.0.9 \
>+		libc-0.2.150 \
>+		link-cplusplus-1.0.9 \
>+		once_cell-1.18.0 \
>+		proc-macro2-1.0.69 \
>+		quote-1.0.33 \
>+		ryu-1.0.15 \
>+		scratch-1.0.7 \
>+		serde-1.0.192 \
>+		serde_derive-1.0.192 \
>+		serde_yaml-0.9.27 \
>+		syn-2.0.39 \
>+		termcolor-1.4.0 \
>+		unicode-ident-1.0.12 \
>+		unicode-width-0.1.11 \
>+		unsafe-libyaml-0.2.9 \
>+		winapi-0.3.9 \
>+		winapi-i686-pc-windows-gnu-0.4.0 \
>+		winapi-util-0.1.6 \
>+		winapi-x86_64-pc-windows-gnu-0.4.0
>diff --git a/dns/powerdns-recursor/distinfo b/dns/powerdns-recursor/distinfo
>index 667a33318a..d0ea591c15 100644
>--- a/dns/powerdns-recursor/distinfo
>+++ b/dns/powerdns-recursor/distinfo
>@@ -1,3 +1,63 @@
>-TIMESTAMP = 1699442098
>-SHA256 (pdns-recursor-4.9.2.tar.bz2) = 4cb8180458ecfb528a3d9a34ba2844b6cd2ed69ca1c461dde24a0ebd66829144
>-SIZE (pdns-recursor-4.9.2.tar.bz2) = 1562694
>+TIMESTAMP = 1704880945
>+SHA256 (pdns-recursor-5.0.1.tar.bz2) = 70a3b0bfde350e94cdb0746b06d06e6d2f3dc0e171be3b12caef9f3c38468ca3
>+SIZE (pdns-recursor-5.0.1.tar.bz2) = 1658747
>+SHA256 (rust/crates/cc-1.0.84.crate) = 0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856
>+SIZE (rust/crates/cc-1.0.84.crate) = 74922
>+SHA256 (rust/crates/codespan-reporting-0.11.1.crate) = 3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e
>+SIZE (rust/crates/codespan-reporting-0.11.1.crate) = 48963
>+SHA256 (rust/crates/cxx-1.0.110.crate) = 7129e341034ecb940c9072817cd9007974ea696844fc4dd582dc1653a7fbe2e8
>+SIZE (rust/crates/cxx-1.0.110.crate) = 197887
>+SHA256 (rust/crates/cxx-build-1.0.110.crate) = a2a24f3f5f8eed71936f21e570436f024f5c2e25628f7496aa7ccd03b90109d5
>+SIZE (rust/crates/cxx-build-1.0.110.crate) = 86469
>+SHA256 (rust/crates/cxxbridge-flags-1.0.110.crate) = 06fdd177fc61050d63f67f5bd6351fac6ab5526694ea8e359cd9cd3b75857f44
>+SIZE (rust/crates/cxxbridge-flags-1.0.110.crate) = 5284
>+SHA256 (rust/crates/cxxbridge-macro-1.0.110.crate) = 587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f
>+SIZE (rust/crates/cxxbridge-macro-1.0.110.crate) = 60405
>+SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
>+SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
>+SHA256 (rust/crates/hashbrown-0.14.2.crate) = f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156
>+SIZE (rust/crates/hashbrown-0.14.2.crate) = 140080
>+SHA256 (rust/crates/indexmap-2.1.0.crate) = d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f
>+SIZE (rust/crates/indexmap-2.1.0.crate) = 68224
>+SHA256 (rust/crates/ipnet-2.9.0.crate) = 8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3
>+SIZE (rust/crates/ipnet-2.9.0.crate) = 27627
>+SHA256 (rust/crates/itoa-1.0.9.crate) = af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38
>+SIZE (rust/crates/itoa-1.0.9.crate) = 10492
>+SHA256 (rust/crates/libc-0.2.150.crate) = 89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c
>+SIZE (rust/crates/libc-0.2.150.crate) = 719359
>+SHA256 (rust/crates/link-cplusplus-1.0.9.crate) = 9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9
>+SIZE (rust/crates/link-cplusplus-1.0.9.crate) = 7484
>+SHA256 (rust/crates/once_cell-1.18.0.crate) = dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d
>+SIZE (rust/crates/once_cell-1.18.0.crate) = 32969
>+SHA256 (rust/crates/proc-macro2-1.0.69.crate) = 134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da
>+SIZE (rust/crates/proc-macro2-1.0.69.crate) = 44271
>+SHA256 (rust/crates/quote-1.0.33.crate) = 5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae
>+SIZE (rust/crates/quote-1.0.33.crate) = 28090
>+SHA256 (rust/crates/ryu-1.0.15.crate) = 1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741
>+SIZE (rust/crates/ryu-1.0.15.crate) = 46906
>+SHA256 (rust/crates/scratch-1.0.7.crate) = a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152
>+SIZE (rust/crates/scratch-1.0.7.crate) = 7997
>+SHA256 (rust/crates/serde-1.0.192.crate) = bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001
>+SIZE (rust/crates/serde-1.0.192.crate) = 76866
>+SHA256 (rust/crates/serde_derive-1.0.192.crate) = d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1
>+SIZE (rust/crates/serde_derive-1.0.192.crate) = 55690
>+SHA256 (rust/crates/serde_yaml-0.9.27.crate) = 3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c
>+SIZE (rust/crates/serde_yaml-0.9.27.crate) = 64781
>+SHA256 (rust/crates/syn-2.0.39.crate) = 23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a
>+SIZE (rust/crates/syn-2.0.39.crate) = 244129
>+SHA256 (rust/crates/termcolor-1.4.0.crate) = ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449
>+SIZE (rust/crates/termcolor-1.4.0.crate) = 18765
>+SHA256 (rust/crates/unicode-ident-1.0.12.crate) = 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b
>+SIZE (rust/crates/unicode-ident-1.0.12.crate) = 42168
>+SHA256 (rust/crates/unicode-width-0.1.11.crate) = e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85
>+SIZE (rust/crates/unicode-width-0.1.11.crate) = 19187
>+SHA256 (rust/crates/unsafe-libyaml-0.2.9.crate) = f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa
>+SIZE (rust/crates/unsafe-libyaml-0.2.9.crate) = 60812
>+SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
>+SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
>+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
>+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
>+SHA256 (rust/crates/winapi-util-0.1.6.crate) = f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596
>+SIZE (rust/crates/winapi-util-0.1.6.crate) = 12234
>+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
>+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
>diff --git a/dns/powerdns-recursor/files/patch-m4_pdns__check__libcrypto.m4 b/dns/powerdns-recursor/files/patch-m4_pdns__check__libcrypto.m4
>index 6bd1ed29d7..9e16849db5 100644
>--- a/dns/powerdns-recursor/files/patch-m4_pdns__check__libcrypto.m4
>+++ b/dns/powerdns-recursor/files/patch-m4_pdns__check__libcrypto.m4
>@@ -1,4 +1,4 @@
>---- m4/pdns_check_libcrypto.m4.orig	2023-06-01 06:54:16 UTC
>+--- m4/pdns_check_libcrypto.m4.orig	2023-09-13 09:07:48 UTC
> +++ m4/pdns_check_libcrypto.m4
> @@ -75,8 +75,10 @@ AC_DEFUN([PDNS_CHECK_LIBCRYPTO], [
>          for ssldir in $ssldirs; do
>@@ -12,3 +12,4 @@
> +                fi
>                  LIBCRYPTO_LIBS="-lcrypto"
>                  found=true
>+                 AC_MSG_RESULT([yes])
>diff --git a/dns/powerdns-recursor/files/patch-rec-main.cc b/dns/powerdns-recursor/files/patch-rec-main.cc
>deleted file mode 100644
>index abec8d2677..0000000000
>--- a/dns/powerdns-recursor/files/patch-rec-main.cc
>+++ /dev/null
>@@ -1,18 +0,0 @@
>---- rec-main.cc.orig	2023-06-30 06:58:36 UTC
>-+++ rec-main.cc
>-@@ -2829,13 +2829,13 @@ static void initArgs()
>-               SYSTEMD_SETID_MSG
>- #endif
>-               )
>--    = "";
>-+    = "pdns";
>-   ::arg().set("setuid", "If set, change user id to this uid for more security"
>- #ifdef HAVE_SYSTEMD
>-               SYSTEMD_SETID_MSG
>- #endif
>-               )
>--    = "";
>-+    = "pdns_recursor";
>-   ::arg().set("network-timeout", "Wait this number of milliseconds for network i/o") = "1500";
>-   ::arg().set("threads", "Launch this number of threads") = "2";
>-   ::arg().set("distributor-threads", "Launch this number of distributor threads, distributing queries to other threads") = "0";
>diff --git a/dns/powerdns-recursor/pkg-plist b/dns/powerdns-recursor/pkg-plist
>index 8a1483f521..3a0d835507 100644
>--- a/dns/powerdns-recursor/pkg-plist
>+++ b/dns/powerdns-recursor/pkg-plist
>@@ -1,4 +1,5 @@
> @sample etc/pdns/recursor.conf-dist etc/pdns/recursor.conf
>+etc/pdns/recursor.yml-dist
> bin/rec_control
> sbin/pdns_recursor
> man/man1/pdns_recursor.1.gz
>-- 
>2.43.0
>

Flags:

tremere: maintainer-approval+

Actions: View | Diff

Attachments on bug 276520: 247839