From nobody Sat May 07 17:39:49 2022 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 52CC21ABB0A6; Sat, 7 May 2022 17:39:50 +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 4KwZSk0G4Gz4jMX; Sat, 7 May 2022 17:39:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651945190; 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=w3rNmSB5IJCmVVSA0CHIq2TKmvTUOf/Ga9/gsMrc44c=; b=mqxpspLpY+0QhN8AvEYo7s5YUyxfI1U/+oY2BDEgJTSdgCCOLd8MupFhwZHCwilqE/BnBc 4eVJM0nDIOGeqmRCHR1MN2xRp9oFrM066+cd90VusFZXh6b68hMBoWd0Q6Ak2ddJYJGpwR xFAQB9/IMupdTl4OOXtwMF61CJ8HrcBNw1UeWmERgfYdMqTPtVqNfEiwIxBQoOO53If0kk +4I0uYIP/fm+4H/3aBtS5zhx+knKLoF2gEVmU/aZAX21XCl5Ov7E+BNhiyNiY9n7Q8HLTK o0lgXxtR1en06yh0vGV8DFuu+noZ4HXSSQXpE1pVjn9Cz+VUWJYZadv8PbjCiQ== 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 CBB3F14CD6; Sat, 7 May 2022 17:39:49 +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 247HdnGP051762; Sat, 7 May 2022 17:39:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 247Hdn73051761; Sat, 7 May 2022 17:39:49 GMT (envelope-from git) Date: Sat, 7 May 2022 17:39:49 GMT Message-Id: <202205071739.247Hdn73051761@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Florian Smeets Subject: git: 8aa2acaac451 - main - dns/dnsdist: update to 1.7.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: flo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8aa2acaac4516bf3c179eb496abfbc978b2beff0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651945190; 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=w3rNmSB5IJCmVVSA0CHIq2TKmvTUOf/Ga9/gsMrc44c=; b=BxXxlCFBy/gghHxC2elKaeLljov5wvElK7B9cZ0qYpqcFY0jGedmDJo8rGc2No7e8fLg6X 7kgMraKPhb2qin4bKrjfLBbgqcEJU8dHGQ9YH5FlX1/Ertxs5RrUvpyLsoeX1+qUL2dem5 U79DB3ec4QAKUKygFE2Mme1uc+fl46s8x/80l5/fxMpPk6nKFLxsdMe+FQ8ckAixMr1s7f ywbwtubBSfwBXWy276w2uain9qOGVqteWfIgH8hPX5F5iPBoQdodDl8UZMhYf86HeNDW+s Tkb9OZ1zNi+N98w87RY0GdEXVLWBFrfMqUckIiE4q+z9wl92ZRcJNvxATFvtKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651945190; a=rsa-sha256; cv=none; b=IKfHKBTibxHmuhC8I6+fFevPQOz9qrfhh6JjidhzoFKPXnG1bOzOEJ3eyviRyfDHzSoMm7 ZyKtqGr9gfscvx7aWMQIArN4hq4HOoEJLEDAlyABeznv5BPVygZZPuuVW7JGQUBoyCVkVw HnlfXQdzguD+Lz+tG7Q8/+XOydPMBsGNg/wbeGQYEs/AZtqoxsY1X+c4o9MImZ0cQg3JhZ GHWVcHqx46EnMIktTwkmch43QJu7po5p7VPCLmG+ikQWVgE2XsuMc7Ehz6ERp5MI6be9Fu 2sUIDWbbS4C3kXlJlAwdnyoCwVsV4cFoCH9lmVLXeoioCeWJuaLABSoUo8s74w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by flo: URL: https://cgit.FreeBSD.org/ports/commit/?id=8aa2acaac4516bf3c179eb496abfbc978b2beff0 commit 8aa2acaac4516bf3c179eb496abfbc978b2beff0 Author: Ralf van der Enden AuthorDate: 2022-05-07 17:36:37 +0000 Commit: Florian Smeets CommitDate: 2022-05-07 17:37:25 +0000 dns/dnsdist: update to 1.7.1 PR: 263809 --- dns/dnsdist/Makefile | 5 +- dns/dnsdist/distinfo | 6 +- dns/dnsdist/files/patch-credentials.cc | 101 +++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+), 6 deletions(-) diff --git a/dns/dnsdist/Makefile b/dns/dnsdist/Makefile index 2ec3cb1fa635..a313d42a06cf 100644 --- a/dns/dnsdist/Makefile +++ b/dns/dnsdist/Makefile @@ -1,7 +1,7 @@ # Created by: Carlos J Puga Medina PORTNAME= dnsdist -DISTVERSION= 1.7.0 +DISTVERSION= 1.7.1 CATEGORIES= dns net MASTER_SITES= https://downloads.powerdns.com/releases/ @@ -25,9 +25,8 @@ LIB_DEPENDS= libboost_serialization.so:devel/boost-libs \ USES= bison:alias compiler:c++14-lang cpe gmake libedit libtool \ localbase pkgconfig tar:bz2 -USE_RC_SUBR= dnsdist - CPE_VENDOR= powerdns +USE_RC_SUBR= dnsdist GNU_CONFIGURE= yes CONFIGURE_ARGS= --bindir=${PREFIX}/sbin \ diff --git a/dns/dnsdist/distinfo b/dns/dnsdist/distinfo index bff8ffa2fd60..e3ec6ae86bc9 100644 --- a/dns/dnsdist/distinfo +++ b/dns/dnsdist/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642434869 -SHA256 (dnsdist-1.7.0.tar.bz2) = 78cc72cb0ccf7fb5f3f2fae09c79eda65a5256374da09bb541b735ea6868fc64 -SIZE (dnsdist-1.7.0.tar.bz2) = 1392585 +TIMESTAMP = 1651452973 +SHA256 (dnsdist-1.7.1.tar.bz2) = 273a8212be2ddfaf754f752bcda4c2abc671ca5d42f776263312eb4661ea2d66 +SIZE (dnsdist-1.7.1.tar.bz2) = 1392179 diff --git a/dns/dnsdist/files/patch-credentials.cc b/dns/dnsdist/files/patch-credentials.cc new file mode 100644 index 000000000000..4d71e65ad7aa --- /dev/null +++ b/dns/dnsdist/files/patch-credentials.cc @@ -0,0 +1,101 @@ +--- credentials.cc.orig 2021-11-23 18:39:17 UTC ++++ 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;