From nobody Fri Oct 21 21:55:22 2022 X-Original-To: dev-commits-ports-main@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 4MvJDV4GJYz4fSmv; Fri, 21 Oct 2022 21:55:22 +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 4MvJDV3lZPz3cFm; Fri, 21 Oct 2022 21:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666389322; 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=XGHVhRzdSbeANTgMW4/8C0HD/RyDMQjDvc9uXfTT0WM=; b=urXJoZYWl3gLT+U3MwbNBXYk6YvBgLqGVBjl3sKWpMm4X46CzIxEGnWqBnkKet492a3Jf4 n4IFWHufb6LjDmaD2QHXxJ3BE4866n1dUc1P4fkg6Direr+nEodXcxHC6MBFobbt8FZ2hr yjWJhse3im8XDA55N9tCxAf06Yx6vvHga1EziiwO4vJjqfQ1SShIByq9GIlcjiBdPdxHjC i3k+ACNW+YV6jsWUNXBgOBrIwLjMxX+vAPReHIDGf8mk2C9O+ayJc5McO2+LlsOioqm8zO tr8senehX9lUhblcFtfhE95cDVZWsKpLe8ry1U5OPFmb8J9NRX0uzRFSjG7WVw== 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 4MvJDV2gplzLf5; Fri, 21 Oct 2022 21:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29LLtMHZ093163; Fri, 21 Oct 2022 21:55:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29LLtMZk093162; Fri, 21 Oct 2022 21:55:22 GMT (envelope-from git) Date: Fri, 21 Oct 2022 21:55:22 GMT Message-Id: <202210212155.29LLtMZk093162@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: bf7a619316b5 - main - dns/powerdns: update to 4.7.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf7a619316b5b24fe6a20df07881d7f2bce821d7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666389322; 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=XGHVhRzdSbeANTgMW4/8C0HD/RyDMQjDvc9uXfTT0WM=; b=vQKRX9fsY7up+EbJiciaMBYElv6AkKAVFj3WxYNABElg+zCZLW9nE9/VF5eyrrLgo/W3V8 SuehS1sXF3IJm4kYHHdchxfS1pnZ0zNtDe12ADTGrP5rmOyP0v2C0AQCnrjWUaeCg+VjYG Ww+9hH3RA+/W0hQ/5Zft1l+TpyoCqDvEzL1MB2Dh70OXVER5ahv/iaqgPDJWJiVw3u+t5t ygo7kwnaoCBDvSRGZGTt6Q278xMSbivKMBAiIw9v3UlFuFg0QIx9OSHTHVq/6Q0iiV1bee aPbw3pkOMVf4YBqmpvx6m40KyXu/eeOi1h7ZNEg8Uc5rDzNRYfnmDHg9O7YRDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666389322; a=rsa-sha256; cv=none; b=jzulOGoUNVjZMT/0M1pqI9P0PIfqK1mW9VOgMPxyHO7XlnvnAaMMrsA9bWY6Q3RDujrDfC cIA17CsK/yP3f8GqdNgitWd4kxQi/ybJzirIoUO19HG31JjfNJEFIi3loT50C5t0ULOhS7 FLmWjZdK7MxlKgBF6Xon6YsZbDq7sKZ+LaH/p4znNOnqIBgy93TibGtg7TOWdDYK0axGO9 2UxNNR3uvntOMKyzj3hVyN3qPDFtS7513L6mtv+0GeDW+vE4Rb4BuQ3xK03jJfHGMs/n0S vf4eRncpUCrFo/l7yiJLJSD5QxZDzEh1yyBGY+5WC9+8OkmlycgAXM02efmnsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf7a619316b5b24fe6a20df07881d7f2bce821d7 commit bf7a619316b5b24fe6a20df07881d7f2bce821d7 Author: Ralf van der Enden AuthorDate: 2022-10-21 21:53:47 +0000 Commit: Nuno Teixeira CommitDate: 2022-10-21 21:55:06 +0000 dns/powerdns: update to 4.7.0 ChangeLog: https://blog.powerdns.com/2022/10/20/authoritative-server-4-7-0/ PR: 267260 --- dns/powerdns/Makefile | 3 +- dns/powerdns/distinfo | 6 +- dns/powerdns/files/patch-credentials.cc | 101 ----------------------- dns/powerdns/files/patch-pdns_auth-main.cc | 13 +++ dns/powerdns/files/patch-pdns_common__startup.cc | 13 --- 5 files changed, 17 insertions(+), 119 deletions(-) diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile index a78160a310d3..e95f69753fa2 100644 --- a/dns/powerdns/Makefile +++ b/dns/powerdns/Makefile @@ -1,6 +1,5 @@ PORTNAME= powerdns -DISTVERSION= 4.6.3 -PORTREVISION= 2 +DISTVERSION= 4.7.0 CATEGORIES= dns MASTER_SITES= https://downloads.powerdns.com/releases/ DISTNAME= pdns-${DISTVERSION} diff --git a/dns/powerdns/distinfo b/dns/powerdns/distinfo index c8c6146f233e..69b0bd073d4d 100644 --- a/dns/powerdns/distinfo +++ b/dns/powerdns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1657734807 -SHA256 (pdns-4.6.3.tar.bz2) = acd06b89ca01d1adf61b906604614f0e1d77a1e94eeecade8ff5d53a16db7389 -SIZE (pdns-4.6.3.tar.bz2) = 1302651 +TIMESTAMP = 1666276032 +SHA256 (pdns-4.7.0.tar.bz2) = b57b75b780ace64e232c6757f17a8fa617016d0128256c66f22da5f4b5e839e7 +SIZE (pdns-4.7.0.tar.bz2) = 1361265 diff --git a/dns/powerdns/files/patch-credentials.cc b/dns/powerdns/files/patch-credentials.cc deleted file mode 100644 index 791344b68a30..000000000000 --- a/dns/powerdns/files/patch-credentials.cc +++ /dev/null @@ -1,101 +0,0 @@ ---- pdns/credentials.cc.orig 2021-11-23 18:39:17 UTC -+++ pdns/credentials.cc -@@ -28,7 +28,7 @@ - #include - #endif - --#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT -+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT) - #include - #include - #include -@@ -42,7 +42,7 @@ - #include "credentials.hh" - #include "misc.hh" - --#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT -+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT) - static size_t const pwhash_max_size = 128U; /* maximum size of the output */ - static size_t const pwhash_output_size = 32U; /* size of the hashed output (before base64 encoding) */ - static unsigned int const pwhash_salt_size = 16U; /* size of the salt (before base64 encoding */ -@@ -95,7 +95,7 @@ void SensitiveData::clear() - - static std::string hashPasswordInternal(const std::string& password, const std::string& salt, uint64_t workFactor, uint64_t parallelFactor, uint64_t blockSize) - { --#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT -+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT) - auto pctx = std::unique_ptr(EVP_PKEY_CTX_new_id(EVP_PKEY_SCRYPT, nullptr), EVP_PKEY_CTX_free); - if (!pctx) { - throw std::runtime_error("Error getting a scrypt context to hash the supplied password"); -@@ -142,7 +142,7 @@ static std::string hashPasswordInternal(const std::str - - static std::string generateRandomSalt() - { --#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT -+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT) - /* generate a random salt */ - std::string salt; - salt.resize(pwhash_salt_size); -@@ -159,7 +159,7 @@ static std::string generateRandomSalt() - - std::string hashPassword(const std::string& password, uint64_t workFactor, uint64_t parallelFactor, uint64_t blockSize) - { --#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT -+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT) - std::string result; - result.reserve(pwhash_max_size); - -@@ -187,7 +187,7 @@ std::string hashPassword(const std::string& password, - - std::string hashPassword(const std::string& password) - { --#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT -+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT) - return hashPassword(password, CredentialsHolder::s_defaultWorkFactor, CredentialsHolder::s_defaultParallelFactor, CredentialsHolder::s_defaultBlockSize); - #else - throw std::runtime_error("Hashing a password requires scrypt support in OpenSSL, and it is not available"); -@@ -196,7 +196,7 @@ std::string hashPassword(const std::string& password) - - bool verifyPassword(const std::string& binaryHash, const std::string& salt, uint64_t workFactor, uint64_t parallelFactor, uint64_t blockSize, const std::string& binaryPassword) - { --#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT -+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT) - auto expected = hashPasswordInternal(binaryPassword, salt, workFactor, parallelFactor, blockSize); - return constantTimeStringEquals(expected, binaryHash); - #else -@@ -207,7 +207,7 @@ bool verifyPassword(const std::string& binaryHash, con - /* parse a hashed password in PHC string format */ - static void parseHashed(const std::string& hash, std::string& salt, std::string& hashedPassword, uint64_t& workFactor, uint64_t& parallelFactor, uint64_t& blockSize) - { --#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT -+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT) - auto parametersEnd = hash.find('$', pwhash_prefix.size()); - if (parametersEnd == std::string::npos || parametersEnd == hash.size()) { - throw std::runtime_error("Invalid hashed password format, no parameters"); -@@ -276,7 +276,7 @@ bool verifyPassword(const std::string& hash, const std - return false; - } - --#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT -+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT) - std::string salt; - std::string hashedPassword; - uint64_t workFactor = 0; -@@ -294,7 +294,7 @@ bool verifyPassword(const std::string& hash, const std - - bool isPasswordHashed(const std::string& password) - { --#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT -+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT) - if (password.size() < pwhash_prefix_size || password.size() > pwhash_max_size) { - return false; - } -@@ -389,7 +389,7 @@ bool CredentialsHolder::matches(const std::string& pas - - bool CredentialsHolder::isHashingAvailable() - { --#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT -+#if defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT) && defined(EVP_PKEY_SCRYPT) - return true; - #else - return false; diff --git a/dns/powerdns/files/patch-pdns_auth-main.cc b/dns/powerdns/files/patch-pdns_auth-main.cc new file mode 100644 index 000000000000..19c84bfad6ce --- /dev/null +++ b/dns/powerdns/files/patch-pdns_auth-main.cc @@ -0,0 +1,13 @@ +--- pdns/auth-main.cc.orig 2022-10-19 09:22:23 UTC ++++ pdns/auth-main.cc +@@ -277,8 +277,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"; diff --git a/dns/powerdns/files/patch-pdns_common__startup.cc b/dns/powerdns/files/patch-pdns_common__startup.cc deleted file mode 100644 index 85b3e1d6cd5d..000000000000 --- a/dns/powerdns/files/patch-pdns_common__startup.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- pdns/common_startup.cc.orig 2020-02-24 14:34:14 UTC -+++ pdns/common_startup.cc -@@ -191,8 +191,8 @@ 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";