Merge pull request #13711 from mbakke/unbound-1.5.8

unbound: 1.5.7 -> 1.5.8
This commit is contained in:
joachifm 2016-03-06 15:06:15 +00:00
commit 3dafc85f25
2 changed files with 4 additions and 3 deletions

View File

@ -113,7 +113,7 @@ in
''; '';
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.unbound}/sbin/unbound -d -c ${stateDir}/unbound.conf"; ExecStart = "${pkgs.unbound}/bin/unbound -d -c ${stateDir}/unbound.conf";
ExecStopPost="${pkgs.utillinux}/bin/umount ${stateDir}/dev/random"; ExecStopPost="${pkgs.utillinux}/bin/umount ${stateDir}/dev/random";
}; };
}; };

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "unbound-${version}"; name = "unbound-${version}";
version = "1.5.7"; version = "1.5.8";
src = fetchurl { src = fetchurl {
url = "http://unbound.net/downloads/${name}.tar.gz"; url = "http://unbound.net/downloads/${name}.tar.gz";
sha256 = "1a0wfgp6wqpf7cxlcbprqhnjx6z9ywf0rhrpcf7x98l1mbjqh82b"; sha256 = "33567a20f73e288f8daa4ec021fbb30fe1824b346b34f12677ad77899ecd09be";
}; };
buildInputs = [ openssl expat libevent ]; buildInputs = [ openssl expat libevent ];
@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
"--with-libevent=${libevent}" "--with-libevent=${libevent}"
"--localstatedir=/var" "--localstatedir=/var"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--sbindir=\${out}/bin"
"--enable-pie" "--enable-pie"
"--enable-relro-now" "--enable-relro-now"
]; ];