From nobody Thu Jun 29 11:42:36 2023
X-Original-To: dev-commits-ports-all@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 4QsGlc5zbmz4kVCq;
Thu, 29 Jun 2023 11:42:36 +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 4QsGlc5XmSz3nrn;
Thu, 29 Jun 2023 11:42:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1688038956;
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=73wQOXJ8E/E5bQstFnAAgdBYbJVBaqK2v41ZXs0SKVg=;
b=P0QzSnlgp6Gbk7y0nVOPQW9M4YHtfrN7CJyvusbyBrFbysvAt0wL81PVzgWby9+7gluJJC
WnsTkqklsoPvexkNhERxbCWWUHY4rVjBZZVK0ix3idu6us9vcrri9uUH0rQgMMRrojmf7H
AHrAcjpKb2x8856a8NgwlrN9tcnWbG6a3MOxzBt/sycwzQe9fZjXZoBtwSuHGGXAhieL1x
vfV8CEg8A5flEqyAJ+SN7zIcuDi8Fz3SwkvU4XoKRH3j8uUHnApSWVh7XFkmpUKk0m0Jj7
PwZY/7JRUKpNWCDemxekUa3oPWjul6i5PDD1HJAmksNPp/9/n4yuhwn6fQgXhw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1688038956;
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=73wQOXJ8E/E5bQstFnAAgdBYbJVBaqK2v41ZXs0SKVg=;
b=P39sB4ZB/2Ax9hEzqM+I6PKnfVRIUudWvpHD0at4yIV08WazX4alEb82wRCR+3YBXxl8yK
Yt+YaV25X25jzBHKFB/Ai6wCJEJewypDEwPLWVj7oSM6cjs8m3oZrzQgrZaxHaqrggme5j
ifev6ZctQ3NcV/hxJI7pS+SeiB8CVG4i3BiG7a2n4niTejsr/2/or+8d/SkVBUaGSJaw4t
zKs4ecjg6M5WH3nJ9EHP55J8crbMOeicecdvJKKFGQEpinD/vlKc+IzXf9e95okDn8CWtV
x27heWGPcX331Ir0JvjBh+BV75GgnpoiO/VRW43MgBTVLU7kDbo+CTfamxXJ3g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688038956; a=rsa-sha256; cv=none;
b=AWfAaO9/8LTsyef4YNiW0puQSwpnE8Bw0ZV1hIyf9RK9CC1R1wkgjSu63JL9vBxRkwArNd
XVG6UOw/bl8F1xEBsnn3xt24vxXftgs+NVnPAWUt6yrSVBZdstlbN/CEe3rLFstbaUS8fJ
2QgIsUS2DpTmqXoyAyxxZgEfXE/a7o6+/vBedUH41wgEp5NkizlngdodcidE48PnDJ+MWU
Ca3n3ndHqWjABqkSaa5S5qWIE6wkN+Ud2zUOFmKeaust1y+LuFo/6XIVd7uVHMGYXtEF3b
GSreWfZbk7Bgb3vCqvI7rH5cGTLDVQVpzPGXd5a2dVvgVRQNF1mfDBbE46DEOg==
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 4QsGlc4J8qzFhL;
Thu, 29 Jun 2023 11:42:36 +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 35TBga65021789;
Thu, 29 Jun 2023 11:42:36 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35TBgaol021788;
Thu, 29 Jun 2023 11:42:36 GMT
(envelope-from git)
Date: Thu, 29 Jun 2023 11:42:36 GMT
Message-Id: <202306291142.35TBgaol021788@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= <fernape@FreeBSD.org>
Subject: git: f8b64e6dbb7b - main - dns/powerdns: fix build on 14.0-CURRENT (+ OpenSSL 3.0.9)
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-all@freebsd.org
X-BeenThere: dev-commits-ports-all@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/main
X-Git-Reftype: branch
X-Git-Commit: f8b64e6dbb7b56c298a9e38ecc84aa7b1761fe1b
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by fernape:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f8b64e6dbb7b56c298a9e38ecc84aa7b1761fe1b
commit f8b64e6dbb7b56c298a9e38ecc84aa7b1761fe1b
Author: Ralf van der Enden <tremere@cainites.net>
AuthorDate: 2023-06-28 10:06:14 +0000
Commit: Fernando ApesteguÃa <fernape@FreeBSD.org>
CommitDate: 2023-06-29 11:42:24 +0000
dns/powerdns: fix build on 14.0-CURRENT (+ OpenSSL 3.0.9)
This fixes the way OpenSSL is detected (it now uses a non-deprecated function),
which is not available anymore on 14.0-CURRENT. Doesn't change anything for
previous versions of FreeBSD.
PR: 272231
Reported by: tremere@cainites.net (maintainer)
---
dns/powerdns/files/patch-m4_pdns__check__libcrypto.m4 | 11 ++++++++++-
dns/powerdns/files/patch-pdns_auth-main.cc | 4 ++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/dns/powerdns/files/patch-m4_pdns__check__libcrypto.m4 b/dns/powerdns/files/patch-m4_pdns__check__libcrypto.m4
index 7d4a832a79e6..17d4b4fe78a0 100644
--- a/dns/powerdns/files/patch-m4_pdns__check__libcrypto.m4
+++ b/dns/powerdns/files/patch-m4_pdns__check__libcrypto.m4
@@ -1,4 +1,4 @@
---- m4/pdns_check_libcrypto.m4.orig 2020-11-16 16:30:04 UTC
+--- m4/pdns_check_libcrypto.m4.orig 2023-06-01 06:54:16 UTC
+++ m4/pdns_check_libcrypto.m4
@@ -75,8 +75,10 @@ AC_DEFUN([PDNS_CHECK_LIBCRYPTO], [
for ssldir in $ssldirs; do
@@ -13,3 +13,12 @@
LIBCRYPTO_LIBS="-lcrypto"
found=true
AC_MSG_RESULT([yes])
+@@ -108,7 +110,7 @@ AC_DEFUN([PDNS_CHECK_LIBCRYPTO], [
+ LIBS="$LIBCRYPTO_LIBS $LIBS"
+ CPPFLAGS="$LIBCRYPTO_INCLUDES $CPPFLAGS"
+ AC_LINK_IFELSE(
+- [AC_LANG_PROGRAM([#include <openssl/crypto.h>], [ERR_load_CRYPTO_strings()])],
++ [AC_LANG_PROGRAM([#include <openssl/bn.h>], [BN_new()])],
+ [
+ AC_MSG_RESULT([yes])
+ AC_CHECK_FUNCS([RAND_bytes RAND_pseudo_bytes CRYPTO_memcmp OPENSSL_init_crypto EVP_MD_CTX_new EVP_MD_CTX_free RSA_get0_key])
diff --git a/dns/powerdns/files/patch-pdns_auth-main.cc b/dns/powerdns/files/patch-pdns_auth-main.cc
index 19c84bfad6ce..38c715a46e17 100644
--- a/dns/powerdns/files/patch-pdns_auth-main.cc
+++ b/dns/powerdns/files/patch-pdns_auth-main.cc
@@ -1,6 +1,6 @@
---- pdns/auth-main.cc.orig 2022-10-19 09:22:23 UTC
+--- pdns/auth-main.cc.orig 2023-06-01 06:54:16 UTC
+++ pdns/auth-main.cc
-@@ -277,8 +277,8 @@ static void declareArguments()
+@@ -278,8 +278,8 @@ static void declareArguments()
::arg().setSwitch("no-shuffle", "Set this to prevent random shuffling of answers - for regression testing") = "off";