diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-28 18:19:34 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-28 18:19:34 +0100 |
| commit | addd20e6f9c682e37abdce93badfadfb92c327c2 (patch) | |
| tree | a7df536a7b8a53c9f670c2b5234ee69b5861d1c7 /pkgs/servers | |
| parent | d70d5c9ddb90a65d3d482b84119d54e540d6690e (diff) | |
| parent | 2e55aec9d790cd744074fe56651f094a09695f66 (diff) | |
| download | nixlib-addd20e6f9c682e37abdce93badfadfb92c327c2.tar nixlib-addd20e6f9c682e37abdce93badfadfb92c327c2.tar.gz nixlib-addd20e6f9c682e37abdce93badfadfb92c327c2.tar.bz2 nixlib-addd20e6f9c682e37abdce93badfadfb92c327c2.tar.lz nixlib-addd20e6f9c682e37abdce93badfadfb92c327c2.tar.xz nixlib-addd20e6f9c682e37abdce93badfadfb92c327c2.tar.zst nixlib-addd20e6f9c682e37abdce93badfadfb92c327c2.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/dict/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/rpcbind/default.nix | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix index 0e6c39ec9245..2093d54b0656 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -13,7 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison flex libtool which ]; - enableParallelBuilding = true; + # Makefile(.in) contains "clientparse.c clientparse.h: clientparse.y" which + # causes bison to run twice, and break the build when this happens in + # parallel. Test with "make -j clientparse.c clientparse.h". The error + # message may be "mv: cannot move 'y.tab.c' to 'clientparse.c'". + enableParallelBuilding = false; patchPhase = "patch -p0 < ${./buildfix.diff}"; configureFlags = [ diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 9e211b8df740..6b3d60bcaea1 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libnsl, libtirpc +{ fetchurl, stdenv, pkgconfig, libnsl, libtirpc, fetchpatch , useSystemd ? true, systemd }: stdenv.mkDerivation rec { @@ -12,6 +12,11 @@ stdenv.mkDerivation rec { patches = [ ./sunrpc.patch + (fetchpatch { + name = "CVE-2017-8779.patch"; + url = "https://raw.githubusercontent.com/guidovranken/rpcbomb/e6da9e489aa8ad000b0ad5ac9abc5b4eefc3a769/rpcbind_patch.txt"; + sha256 = "0w231w8fxihgrn526np078j3vbj3ylvjvxjmfpjvqhga5zg821ab"; + }) ]; buildInputs = [ libnsl libtirpc ] |