diff options
| author | Johannes Schleifenbaum <johannes@js-webcoding.de> | 2022-01-18 08:58:58 +0100 |
|---|---|---|
| committer | Johannes Schleifenbaum <johannes@js-webcoding.de> | 2022-01-18 08:59:18 +0100 |
| commit | 30ae792cd00a408a7b1784717fd5b9311554473c (patch) | |
| tree | 44c40c8a55f71cec50859c99c0028c52f9ffed33 /pkgs/servers/dns | |
| parent | 7ad3c5f9562a40b08494d7835c1b33c0520f48bd (diff) | |
dnsdist: 1.5.2 -> 1.7.0
Diffstat (limited to 'pkgs/servers/dns')
| -rw-r--r-- | pkgs/servers/dns/dnsdist/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/servers/dns/dnsdist/disable-network-tests.patch | 28 |
2 files changed, 38 insertions, 3 deletions
diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index 0424880c08e81..a104ec4d9b1c1 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -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" diff --git a/pkgs/servers/dns/dnsdist/disable-network-tests.patch b/pkgs/servers/dns/dnsdist/disable-network-tests.patch new file mode 100644 index 0000000000000..fd0fdfbc4eaea --- /dev/null +++ b/pkgs/servers/dns/dnsdist/disable-network-tests.patch @@ -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 */ |