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,15 +1,24 @@ ---- 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 AC_MSG_CHECKING([for openssl/crypto.h in $ssldir]) if test -f "$ssldir/include/openssl/crypto.h"; then - LIBCRYPTO_INCLUDES="-I$ssldir/include" - LIBCRYPTO_LDFLAGS="-L$ssldir/lib" + if test $ssldir != /usr; then + LIBCRYPTO_INCLUDES="-I$ssldir/include" + LIBCRYPTO_LDFLAGS="-L$ssldir/lib" + fi 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 ], [ERR_load_CRYPTO_strings()])], ++ [AC_LANG_PROGRAM([#include ], [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,13 +1,13 @@ ---- 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"; - ::arg().set("setuid", "If set, change user id to this uid for more security") = ""; - ::arg().set("setgid", "If set, change group id to this gid for more security") = ""; + ::arg().set("setuid", "If set, change user id to this uid for more security") = "pdns"; + ::arg().set("setgid", "If set, change group id to this gid for more security") = "pdns"; ::arg().set("max-cache-entries", "Maximum number of entries in the query cache") = "1000000"; ::arg().set("max-packet-cache-entries", "Maximum number of entries in the packet cache") = "1000000";