d: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8YLd2ylsz6cP73 for ; Mon, 04 May 2026 20:35:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8YLd1ycCz3cSs for ; Mon, 04 May 2026 20:35:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777926937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QeNwA6sHKNoLhL+q5bgpOQjgao4dW38b570whRtrVR8=; b=BK/d4BW8DFBFvpyB1kQbjDzaBd9s/80g8puSuRchrBSfCyI5EXAjYUrKcmQxtMU5nzYRCO fzqhsBU0d1P7u6mgh1JXytwy/jMD1L/PxrRYKEkDG2UHG4uK8RE039c0KAJV9apUQsYpbH hTsVSS4JJR5Mw4Ae+ObCTMbZgkdvizBCoqqJfPa7pTeZ0R8xtmpW3lPO2AufNFR3Q+o7N7 VpLaj7VIiEQ45OuQf92O6tGhZ2OBA6F/XEDfSqtBdfdBQMDyEnDxbBI41ERVxDsuGvaCRB tQQ1G5aTMoyhAgb+MGLBUj5wgeVzMCJePqnmy2qS9z2/37o+rNfMra2R/TAvfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777926937; a=rsa-sha256; cv=none; b=j4cssCoI83XFH3g6s1XhRUG2OZEN7RcFLjqXwkStD6n1HhG5fQhdoSQcVtsy/4PGqkNrJQ hHQk1a44kZCtHCf1ero5RA0exmGvpCwkAt+DLMUxVBfAUBsLg+VbiCqLwrR1xmsH/6607E Z9OSH15FMazRRXB9XCI3axzjQ9XAKxL2y5AX9SnyPXhHo3e8W02P8pwRn21SD2dKxiBaVF cJ0uBxeQDCY+uowfA2HS5bJoJVpozRaxk3hMLB+UJ5v+zA2kOuEnf86wtJgMXq8UztyNJz T5bR06fcpLsfh872vW3KFUbO4w+su+2xLxEmdN7Bg6eKKXW8IVNCd2CcoLAuAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777926937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QeNwA6sHKNoLhL+q5bgpOQjgao4dW38b570whRtrVR8=; b=i8QICI4kTTXmDs3e6lKIoMqWiU4K77F0IJew5QeS7SagfX2ir/yWeZMhW1sYF55XaXU0C4 UISkehP1qY3AHcUWcZQqBT+aev+yBrl6ThHS68FYXYyNCVzyig3rn+63Ns2HxmNE/vQZqm +6iDIWKjB6mR6KefkZAjxfB2CbmpqoHCnxfp/7rAtLtSmWbgXuC1F4zPR+vhfqGSnA1pqa lkhlbT7bEdtC0Fq6E9wQCqb2CjjNnp5CvaEnjNK4pFK4usdlrcxIwugllqcivprVtr6BRn wUJvRNZoxl7p/fbyc12ZYBiDEXUzzy/qqmCQ12Glnld/630rOX09WnzEq69NIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8YLd1PZPzcdZ for ; Mon, 04 May 2026 20:35:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4453e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 20:35:37 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 2fe848c770b3 - 2026Q2 - dns/powerdns-recursor: fix cherry-pick misadventure List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2026Q2 X-Git-Reftype: branch X-Git-Commit: 2fe848c770b385f2cef7242cd96741b1052f02c4 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 20:35:37 +0000 Message-Id: <69f90319.4453e.8a00f75@gitrepo.freebsd.org> The branch 2026Q2 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=2fe848c770b385f2cef7242cd96741b1052f02c4 commit 2fe848c770b385f2cef7242cd96741b1052f02c4 Author: Robert Clausecker AuthorDate: 2026-05-04 20:31:33 +0000 Commit: Robert Clausecker CommitDate: 2026-05-04 20:33:18 +0000 dns/powerdns-recursor: fix cherry-pick misadventure In the original cherry-pick, I had not cherry-picked the update to 5.4.0, causing some required hunks to be missing. This should fix those missing bits for real. PR: 294749 Fixes: 2eb9a17bf93c7001a27b30e09a323b7cf79c3469 Reported by: Ralf van der Enden --- dns/powerdns-recursor/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile index 896566a3369f..fb5d75b58b1d 100644 --- a/dns/powerdns-recursor/Makefile +++ b/dns/powerdns-recursor/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= libboost_context.so:devel/boost-libs \ libsodium.so:security/libsodium USES= cargo compiler:c++11-lib cpe localbase meson pkgconfig \ - python:build tar:xz + python:build ssl tar:xz CPE_VENDOR= powerdns USE_RC_SUBR= pdns_recursor @@ -46,7 +46,7 @@ TARGET_ORDER_OVERRIDE= 750:cargo-configure USERS= pdns_recursor GROUPS= pdns -OPTIONS_DEFINE= DNSTAP SNMP +OPTIONS_DEFINE= DNSTAP GNUTLS SNMP OPTIONS_DEFAULT= LUA OPTIONS_SINGLE= EXTLUA OPTIONS_SINGLE_EXTLUA= LUA LUAJIT @@ -58,6 +58,9 @@ LUA_DESC= Use lang/lua DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm DNSTAP_MESON_ENABLED= dnstap +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +GNUTLS_MESON_ENABLED= tls-gnutls + LUAJIT_USES= luajit LUAJIT_MESON_ON= -Dlua=luajit