swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

dnsdist: 1.5.2 -> 1.7.0

Browse source
This commit is contained in:
Johannes Schleifenbaum 2022-01-18 08:58:58 +01:00
parent 7ad3c5f956
commit 30ae792cd0
No known key found for this signature in database
GPG key ID: 059093B1A278BCD0
2 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/servers/dns/dnsdist/default.nix
View file

@ -1,19 +1,26 @@
{ lib, stdenv, fetchurl, pkg-config, systemd
, boost, libsodium, libedit, re2
, net-snmp, lua, protobuf, openssl, zlib, h2o
, nghttp2
}:
stdenv.mkDerivation rec {
pname = "dnsdist";
version = "1.5.2";
version = "1.7.0";
src = fetchurl {
url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2";
sha256 = "sha256-K9e1M9Lae7RWY8amLkftDS8Zigd/WNxzDEY7eXNjZ0k=";
sha256 = "sha256-eMxyywzPf7Xz8vrgnHntplpSVjdNoJu1Qbc16mho/GQ=";
};
patches = [
# Disable tests requiring networking:
# "Error connecting to new server with address 192.0.2.1:53: connecting socket to 192.0.2.1:53: Network is unreachable"
./disable-network-tests.patch
];
nativeBuildInputs = [ pkg-config protobuf ];
buildInputs = [ systemd boost libsodium libedit re2 net-snmp lua openssl zlib h2o ];
buildInputs = [ systemd boost libsodium libedit re2 net-snmp lua openssl zlib h2o nghttp2 ];
configureFlags = [
"--with-libsodium"

28
pkgs/servers/dns/dnsdist/disable-network-tests.patch Normal file
View file

@ -0,0 +1,28 @@
diff --git a/test-dnsdisttcp_cc.cc b/test-dnsdisttcp_cc.cc
index 1fbb00e..dc04137 100644
--- a/test-dnsdisttcp_cc.cc
+++ b/test-dnsdisttcp_cc.cc
@@ -848,6 +848,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionWithProxyProtocol_SelfAnswered)
BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR)
{
+ return;
auto local = getBackendAddress("1", 80);
ClientState localCS(local, true, false, false, "", {});
auto tlsCtx = std::make_shared<MockupTLSCtx>();
@@ -1711,6 +1712,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR)
BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR)
{
+ return;
auto local = getBackendAddress("1", 80);
ClientState localCS(local, true, false, false, "", {});
/* enable out-of-order on the front side */
@@ -3677,6 +3679,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR)
BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendNotOOOR)
{
+ return;
auto local = getBackendAddress("1", 80);
ClientState localCS(local, true, false, false, "", {});
/* enable out-of-order on the front side */