ldns 1.6.17 -> 1.7.0

Release notes: http://git.nlnetlabs.nl/ldns/tree/Changelog?id=release-1.7.0

Openssl-1.1.0 is used to enable offline DANE verification (Needed for the DANE-TA usage type)

```
configure: error: OpenSSL does not support offline DANE verification (Needed for the DANE-TA usage type).  Please upgrade OpenSSL to version >= 1.1.0 or rerun with --disable-dane-verify or --disable-dane-ta-usage
builder /nix/store/m6n021fbk5h4iywzi3n26j95ksps9mwc-ldns-1.7.0. failed with exit code 1
error: build /nix/store/m6n021fbk5h4iywzi3n26j95ksps9mwc-ldns-1.7.0. failed
drvof drvfor
```
This commit is contained in:
Dhananjay Balan 2017-01-04 17:43:05 +01:00
parent 71c1e2ffbf
commit 6edb3793d3
3 changed files with 13 additions and 22 deletions

View File

@ -1,25 +1,26 @@
{stdenv, fetchurl, openssl, perl}: {stdenv, fetchurl, openssl, perl}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ldns-1.6.17"; pname = "ldns";
version = "1.7.0";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "http://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz"; url = "https://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz";
sha256 = "1kf8pkwhcssvgzhh6ha1pjjiziwvwmfaali7kaafh6118mcy124b"; sha1 = "ceeeccf8a27e61a854762737f6ee02f44662c1b8";
}; };
outputs = [ "out" "dev" ]; patchPhase = ''
patches = [ ./perl-5.22-compat.patch ];
postPatch = ''
patchShebangs doc/doxyparse.pl patchShebangs doc/doxyparse.pl
''; '';
outputs = [ "out" "dev" ];
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];
buildInputs = [ openssl ]; buildInputs = [ openssl ];
configureFlags = [ "--with-ssl=${openssl.dev}" "--with-drill" ]; configureFlags = [ "--with-ssl=${openssl.dev}" "--with-drill"];
postInstall = '' postInstall = ''
moveToOutput "bin/ldns-config" "$dev" moveToOutput "bin/ldns-config" "$dev"

View File

@ -1,12 +0,0 @@
diff -Naur old/doc/doxyparse.pl new/doc/doxyparse.pl
--- old/doc/doxyparse.pl 2014-01-11 06:04:41.000000000 +0900
+++ new/doc/doxyparse.pl 2015-08-08 22:29:34.216889652 +0900
@@ -273,7 +273,7 @@
print MAN $MAN_MIDDLE;
- if (defined(@$also)) {
+ if (@$also) {
print MAN "\n.SH SEE ALSO\n\\fI";
print MAN join "\\fR, \\fI", @$also;
print MAN "\\fR.\nAnd ";

View File

@ -2579,7 +2579,9 @@ in
ldapvi = callPackage ../tools/misc/ldapvi { }; ldapvi = callPackage ../tools/misc/ldapvi { };
ldns = callPackage ../development/libraries/ldns { }; ldns = callPackage ../development/libraries/ldns {
openssl = openssl_1_1_0;
};
leafpad = callPackage ../applications/editors/leafpad { }; leafpad = callPackage ../applications/editors/leafpad { };