Skip to content

Commit

Permalink
dns/powerdns: fix build on 14.0-CURRENT (+ OpenSSL 3.0.9)
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
RvdE authored and fernape committed Jun 29, 2023
1 parent 6b6f60b commit f8b64e6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
11 changes: 10 additions & 1 deletion 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
Expand All @@ -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])
4 changes: 2 additions & 2 deletions 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";

Expand Down

0 comments on commit f8b64e6

Please sign in to comment.