Package: pdns-recursor Version: 4.6.0-1 Followup-For: Bug #1006520 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu jammy ubuntu-patch Control: tags -1 patch
Please find attached a patch that fixes this build failure. -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer https://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
diff -Nru pdns-recursor-4.6.0/debian/patches/openssl-types.patch pdns-recursor-4.6.0/debian/patches/openssl-types.patch --- pdns-recursor-4.6.0/debian/patches/openssl-types.patch 1969-12-31 16:00:00.000000000 -0800 +++ pdns-recursor-4.6.0/debian/patches/openssl-types.patch 2022-03-11 12:03:56.000000000 -0800 @@ -0,0 +1,22 @@ +Description: use correct type for openssl function argument + Currently FTBFS in Ubuntu because passing a wrong type to + EVP_PKEY_CTX_set1_pbe_pass(). In OpenSSL 1.1, the argument was explicitly + treated as void * but now it's a char *. +Author: Steve Langasek <steve.langa...@ubuntu.com> +Bug-Debian: https://bugs.debian.org/1006520 +Last-Update: 2022-03-11 +Forwarded: no + +Index: pdns-recursor-4.6.0/credentials.cc +=================================================================== +--- pdns-recursor-4.6.0.orig/credentials.cc ++++ pdns-recursor-4.6.0/credentials.cc +@@ -106,7 +106,7 @@ + } + + // OpenSSL 3.0 changed the string arg to const unsigned char*, other versions use const char *, so cast to const void * to satisfy both +- if (EVP_PKEY_CTX_set1_pbe_pass(pctx.get(), reinterpret_cast<const void*>(password.data()), password.size()) <= 0) { ++ if (EVP_PKEY_CTX_set1_pbe_pass(pctx.get(), reinterpret_cast<const char*>(password.data()), password.size()) <= 0) { + throw std::runtime_error("Error adding the password to the scrypt context to hash the supplied password"); + } + diff -Nru pdns-recursor-4.6.0/debian/patches/series pdns-recursor-4.6.0/debian/patches/series --- pdns-recursor-4.6.0/debian/patches/series 2021-12-17 04:07:54.000000000 -0800 +++ pdns-recursor-4.6.0/debian/patches/series 2022-03-11 11:56:36.000000000 -0800 @@ -1 +1,2 @@ testrunner-log-verbosity +openssl-types.patch