Unverified Commit 39ecc2db authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #73797: ldns: 1.7.0 -> 1.7.1

parents e32d5579 d9c19f4a

pkgs/development/libraries/ldns/default.nix

+9 −28
Original line number Diff line number Diff line 
{ stdenv, fetchurl, fetchpatch, openssl, perl, which, dns-root-data }:

{ stdenv, fetchurl, openssl, perl, which, dns-root-data }:



stdenv.mkDerivation rec {

  pname = "ldns";

  version = "1.7.0";

  version = "1.7.1";



  src = fetchurl {

    url = "https://www.nlnetlabs.nl/downloads/ldns/${pname}-${version}.tar.gz";

    sha256 = "1k56jw4hz8njspfxcfw0czf1smg0n48ylia89ziwyx5k9wdmp7y1";

    sha256 = "0ac242n7996fswq1a3nlh1bbbhrsdwsq4mx7xq8ffq6aplb4rj4a";

  };



  patches = [

    (fetchpatch {

      name = "CVE-2017-1000231.patch";

      url = "https://git.nlnetlabs.nl/ldns/patch/?id=c8391790";

      sha256 = "1rprfh0y1c28dqiy3vgwvwdhn7b5rsylfzzblx5xdhwfqgdw8vn0";

      excludes = [ "Changelog" ];

    })

    (fetchpatch {

      name = "CVE-2017-1000232.patch";

      url = "https://git.nlnetlabs.nl/ldns/patch/?id=3bdeed02";

      sha256 = "0bv0s5jjp0sswfg8da47d346iwp9yjhj9w7fa3bxh174br0zj07r";

      excludes = [ "Changelog" ];

    })

  ];



  postPatch = ''

    patchShebangs doc/doxyparse.pl

  '';
@@ -38,6 +23,7 @@ stdenv.mkDerivation rec { 
    "--with-trust-anchor=${dns-root-data}/root.key"

    "--with-drill"

    "--disable-gost"

    "--with-examples"

  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

    "ac_cv_func_malloc_0_nonnull=yes"

    "ac_cv_func_realloc_0_nonnull=yes"
@@ -47,16 +33,11 @@ stdenv.mkDerivation rec { 
  doCheck = false; # fails. missing some files



  postInstall = ''

    # Only 'drill' stays in $out

    # the rest are examples:

    moveToOutput "bin/ldns*" "$examples"

    # with exception of ldns-config, which goes to $dev:

    moveToOutput "bin/ldns-config" "$dev"



    pushd examples

    configureFlagsArray+=( "--bindir=$examples/bin" )

    configurePhase

    make

    make install

    popd



    sed -i "$out/lib/libldns.la" -e "s,-L${openssl.dev},-L${openssl.out},g"

  '';



  meta = with stdenv.lib; {
@@ -64,6 +45,6 @@ stdenv.mkDerivation rec { 
    license = licenses.bsd3;

    homepage = http://www.nlnetlabs.nl/projects/ldns/;

    platforms = platforms.unix;

    maintainers = with maintainers; [ ];

    maintainers = with maintainers; [ dtzWill ];

  };

}