ldns: security patches from upstream, /cc #32459

Also use sha256 instead of sha1 for the source.
This commit is contained in:
Vladimír Čunát 2017-12-09 10:59:08 +01:00
parent 1592d5a9e7
commit cd9231a01a
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA

View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, openssl, perl, dns-root-data}: { stdenv, fetchurl, fetchpatch, openssl, perl, dns-root-data }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ldns"; pname = "ldns";
@ -8,10 +8,25 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz"; url = "https://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz";
sha1 = "ceeeccf8a27e61a854762737f6ee02f44662c1b8"; sha256 = "1k56jw4hz8njspfxcfw0czf1smg0n48ylia89ziwyx5k9wdmp7y1";
}; };
patchPhase = '' 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 patchShebangs doc/doxyparse.pl
''; '';