JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ldns: 1.7.0 -> 1.7.1

Browse Source 
https://www.nlnetlabs.nl/news/2019/Jul/26/ldns-1.7.1-released/

* examples no longer can be configured separately,
  so build everything we want in a single go
  and sort into the appropriate outputs after.
* libtool file doesn't seem to reference openssl at all
  so nothing to patch up there as we did previously.
This commit is contained in:
Will Dietz 2019-07-26 19:22:21 -05:00
parent c20f765bb4
commit dc9e2c38e5
No known key found for this signature in database
GPG Key ID: EBB0EA4124809D02
1 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/development/libraries/ldns/default.nix
View File

@ -1,29 +1,14 @@
{ 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; {