Unverified Commit e87477cc authored by Mathew Polzin's avatar Mathew Polzin Committed by GitHub
Browse files

dnsdist: 1.9.10 -> 2.0.2 (#490420)

parents d23840bc 2377001f

pkgs/by-name/dn/dnsdist/disable-network-tests.patch

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
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 */

pkgs/by-name/dn/dnsdist/package.nix

+55 −24
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchurl,

  pkg-config,

  systemd,

  boost,

  libsodium,

  cargo,

  fetchpatch,

  fetchurl,

  fstrm,

  h2o,

  lib,

  libbpf,

  libcap,

  libedit,

  re2,

  net-snmp,

  libsodium,

  lua,

  protobuf,

  openssl,

  zlib,

  h2o,

  net-snmp,

  nghttp2,

  nixosTests,

  openssl,

  pkg-config,

  protobuf,

  python3,

  re2,

  rustPlatform,

  stdenv,

  systemd,

  xdp-tools,

  zlib,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "dnsdist";

  version = "1.9.10";

  version = "2.0.2";



  src = fetchurl {

    url = "https://downloads.powerdns.com/releases/dnsdist-${finalAttrs.version}.tar.bz2";

    hash = "sha256-An3b3uaVxaWXKAV7/EHFsaaR+hx6XokniwnzVTJfvtY=";

    url = "https://downloads.powerdns.com/releases/dnsdist-${finalAttrs.version}.tar.xz";

    hash = "sha256-M3Trplpco8+5/Fl5HEflA1FJ/lIcy7ztX4NKF/RWQb8=";

  };



  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

    # Fix build error when only protobuf is enabled

    (fetchpatch {

      url = "https://github.com/PowerDNS/pdns/commit/daece82818d7f83b26dcf724ec1864644bc3f854.patch";

      hash = "sha256-Ag65Gjmm2m4yvRfqMjSo1EEJg/2EHWDBg15vSL5DKCU=";

      stripLen = 2;

    })

  ];



  nativeBuildInputs = [

    cargo

    pkg-config

    protobuf

    python3

    python3.pkgs.pyyaml

    rustPlatform.cargoSetupHook

  ];

  buildInputs = [

    systemd

    boost

    libsodium

    fstrm # Required for DNSTAP

    h2o

    libbpf

    libcap

    libedit

    re2

    net-snmp

    libsodium

    lua

    net-snmp

    nghttp2

    openssl

    re2

    systemd

    xdp-tools # AF_XDP support

    zlib

    h2o

    nghttp2

  ];



  configureFlags = [

    "--with-libsodium"

    "--with-re2"

    "--enable-dnscrypt"

    "--enable-dnstap"

    "--enable-dns-over-tls"

    "--enable-dns-over-https"

    "--enable-yaml"

    "--with-ebpf"

    "--with-xsk"

    "--with-libcap"

    "--with-protobuf=yes"

    "--with-net-snmp"

    "--disable-dependency-tracking"
@@ -65,6 +89,13 @@ stdenv.mkDerivation (finalAttrs: { 
    "--with-boost=${boost.dev}"

  ];



  cargoDeps = rustPlatform.fetchCargoVendor {

    inherit (finalAttrs) cargoRoot src;

    hash = "sha256-nDAvgM3xb+95dcGIHiSKlFo4/0Rs5Evf1vvR5vF4MXs=";

  };



  cargoRoot = "dnsdist-rust-lib/rust";



  doCheck = true;



  enableParallelBuilding = true;