From nobody Tue Feb 20 17:00:14 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TfQdB2BbGz540D8; Tue, 20 Feb 2024 17:00:14 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfQdB1jf8z4D2y; Tue, 20 Feb 2024 17:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708448414; 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=4jcS19xDxc01p55L8diqNdHxsNyikgJRlKUhvlQlO4A=; b=iIBhngn1gY/osUUajSFVeUevPBGdpmTF7+BbhzPBh0aYJyegah5e1sHqPrDm7FZkk/I1BI orFz/cq4P+5e3lc0BlyroT273vCrSjuQg3XjhL3LAAzEwmiZ6oIXdhfhz2MTHRPyd0be7O Ezmh7efAPiufPY16sYE2GEjuEQKNfmWfrMlxx4WW4zBY2VlbqpaFo9L7PLLIT8PckfI4UX wxoK4ARzEB5+EoupjvEOlZzTzn60byG9YHINNjIMhIHUuPvDX3Po2BY66fzXL0BUzycSRz zInsINQXHhocgnsw0E7N8vnIgSROhXdtZCEIcVLIrljlU0OLCyXLElplW2ok5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708448414; 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=4jcS19xDxc01p55L8diqNdHxsNyikgJRlKUhvlQlO4A=; b=ICw9+4iOdy8QbneikX0BH+jQCG2TwHQfouFbIOQYgiw6vFhe+ixnSGoV5RuxNwB94/9fvD M9OlfevZQqCIZ7kALHu4+AMDDcourAixr1dyNpBnbYZmSiGSWli8uYTf+ONusErOQuX9Hd OA19KEz8vMW3sE9vEe4ZpiWcFuf6qQiicWIghyghj/p2UfXg3/MNHMcjvSwsrvrC7Fct0J jFmsE4YPsWwgsaRMa3KmALt3HcGlrg+um3y4gyicV+7DXdR/zxzHbD1ukPekBTSa012EbD 4dNNcbH4TbIQQOH4O/jWYcyWzF5StvmH04WV3G2J6BlxO5ZjLvb7TdZT7ZHFRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708448414; a=rsa-sha256; cv=none; b=xVjz9S5/PGFC50bgZdjZQhPPC6LQcF3SX5j9ogMJsdw9z6nZXu2adwBbOtHdsCLMtQnLFY k2OQsCzpSMKkrXc4OkkkJRhebSyaIlLa9PFBrvwYykZoVDPZ3p/Yk31GX/Fwgqrza29tT7 5t1oKRWLixMRWWlsnjXbDivvOKOxOobdZduTjNETiatu/ItutAmtrTxBoodVqpB3cdsgsf KlMrhbXIbrTRLUxnl9edFWHERqqh0Po/yYIyylx3+OLy7hSfNFdyZGwNj4LKljCD4W/gYQ 8z9qDnq/54U1mH7A5Re/Lyj3e1RfTjyWJVv9uC0r2+hqQT7hIlUPCqKjqIoNpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TfQdB0nCdzQwd; Tue, 20 Feb 2024 17:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41KH0Ee0047397; Tue, 20 Feb 2024 17:00:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KH0Ejm047389; Tue, 20 Feb 2024 17:00:14 GMT (envelope-from git) Date: Tue, 20 Feb 2024 17:00:14 GMT Message-Id: <202402201700.41KH0Ejm047389@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: fb4eb1df56aa - 2024Q1 - dns/powerdns-recursor: Fix build 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: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: fb4eb1df56aa7fcb9e55205a303ac1bfe94de80a Auto-Submitted: auto-generated The branch 2024Q1 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb4eb1df56aa7fcb9e55205a303ac1bfe94de80a commit fb4eb1df56aa7fcb9e55205a303ac1bfe94de80a Author: Fernando Apesteguía AuthorDate: 2024-02-20 16:59:05 +0000 Commit: Fernando Apesteguía CommitDate: 2024-02-20 16:59:05 +0000 dns/powerdns-recursor: Fix build PR: 277048 Reported by: linus.sundqvist@loopia.se Fixes: 569307de85501076ff89553a4dc14d58bfda108e --- dns/powerdns-recursor/Makefile | 21 ++++++++++++--- dns/powerdns-recursor/Makefile.crates | 30 ++++++++++++++++++++++ .../files/patch-m4_pdns__check__libcrypto.m4 | 3 ++- dns/powerdns-recursor/files/patch-rec-main.cc | 18 ------------- dns/powerdns-recursor/pkg-plist | 1 + 5 files changed, 51 insertions(+), 22 deletions(-) diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile index 2f1f30fd079d..5d58d7937d24 100644 --- a/dns/powerdns-recursor/Makefile +++ b/dns/powerdns-recursor/Makefile @@ -1,9 +1,11 @@ PORTNAME= recursor DISTVERSION= 5.0.2 +PORTREVISION= 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 @@ -18,10 +20,11 @@ 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 000000000000..f7f34454f8df --- /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/files/patch-m4_pdns__check__libcrypto.m4 b/dns/powerdns-recursor/files/patch-m4_pdns__check__libcrypto.m4 index 6bd1ed29d7ef..9e16849db50c 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 abec8d2677d4..000000000000 --- 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 8a1483f521b5..3a0d8355076d 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