Update to 1.7.1
This commit is contained in:
parent
e6a7b2115c
commit
00da8f4d0e
1
.gitignore
vendored
1
.gitignore
vendored
@ -14,3 +14,4 @@
|
||||
/dnsdist-1.6.0.tar.bz2
|
||||
/dnsdist-1.6.1.tar.bz2
|
||||
/dnsdist-1.7.0.tar.bz2
|
||||
/dnsdist-1.7.1.tar.bz2
|
||||
|
@ -1,37 +0,0 @@
|
||||
From d0fe73a0910c52c5ad9a57fbebea260ef22f4be4 Mon Sep 17 00:00:00 2001
|
||||
From: Remi Gacogne <remi.gacogne@powerdns.com>
|
||||
Date: Mon, 17 Jan 2022 15:44:01 +0100
|
||||
Subject: [PATCH] dnsdist-1.7.x: Fix compilation with OpenSSL 3.0.0
|
||||
|
||||
---
|
||||
pdns/credentials.cc | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pdns/credentials.cc b/pdns/credentials.cc
|
||||
index b3a09e5c819..d058a948ac1 100644
|
||||
--- a/pdns/credentials.cc
|
||||
+++ b/pdns/credentials.cc
|
||||
@@ -31,6 +31,7 @@
|
||||
#ifdef HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT
|
||||
#include <openssl/evp.h>
|
||||
#include <openssl/kdf.h>
|
||||
+#include <openssl/opensslv.h>
|
||||
#include <openssl/rand.h>
|
||||
#endif
|
||||
|
||||
@@ -105,8 +106,13 @@ static std::string hashPasswordInternal(const std::string& password, const std::
|
||||
throw std::runtime_error("Error intializing the scrypt context to hash the supplied password");
|
||||
}
|
||||
|
||||
- // 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) {
|
||||
+ // OpenSSL 3.0 changed the string arg to const unsigned char*, other versions use const char *
|
||||
+#if OPENSSL_VERSION_MAJOR >= 3
|
||||
+ auto passwordData = reinterpret_cast<const char*>(password.data());
|
||||
+#else
|
||||
+ auto passwordData = reinterpret_cast<const unsigned char*>(password.data());
|
||||
+#endif
|
||||
+ if (EVP_PKEY_CTX_set1_pbe_pass(pctx.get(), passwordData, password.size()) <= 0) {
|
||||
throw std::runtime_error("Error adding the password to the scrypt context to hash the supplied password");
|
||||
}
|
||||
|
@ -6,8 +6,8 @@
|
||||
%endif
|
||||
|
||||
Name: dnsdist
|
||||
Version: 1.7.0
|
||||
Release: 2%{?dist}
|
||||
Version: 1.7.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Highly DNS-, DoS- and abuse-aware loadbalancer
|
||||
License: GPLv2
|
||||
URL: https://dnsdist.org
|
||||
@ -46,8 +46,6 @@ Requires(post): systemd
|
||||
Requires(preun): shadow-utils
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
#https://github.com/PowerDNS/pdns/pull/11195
|
||||
Patch0: dnsdist-1.7.0-openssl30.patch
|
||||
|
||||
%description
|
||||
dnsdist is a highly DNS-, DoS- and abuse-aware loadbalancer. Its goal in life
|
||||
@ -120,6 +118,9 @@ exit 0
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Apr 30 2022 Sander Hoentjen <sander@hoentjen.eu> - 1.7.1-1
|
||||
- Update to 1.7.1
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (dnsdist-1.7.0.tar.bz2) = abaed7aaa18f4acaf220dc938da6896e521373b1da3b6b9c4114467dd5d8b0e6cd9809534edbc6ba5b789ed8387fb47317c47bd4e00e66a6ccb035f6dd6068af
|
||||
SHA512 (dnsdist-1.7.1.tar.bz2) = eee44a9994c6cab84977cad58539ca59882149d6898dfeed9e4190f06ddbc280b836bf426d22e6980d8acae1437290bddcc5166af165b6eb48c77c669281a310
|
||||
|
Loading…
Reference in New Issue
Block a user