diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-09 08:42:04 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-09 08:42:04 +0100 |
| commit | 6bea415b5e3f4ab70afcea4c646ad76d9c073c89 (patch) | |
| tree | 8f5e976cd8aecc6029b4019e16f0177e0a66a093 /pkgs/servers/rpcbind/default.nix | |
| parent | b846a53d2a3cba3002a4d6fb064f579677eac52c (diff) | |
| parent | 4bf9f8afc39e9d0c0629635652804b81fe3e3332 (diff) | |
| download | nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.gz nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.bz2 nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.lz nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.xz nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.zst nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/servers/rpcbind/default.nix')
| -rw-r--r-- | pkgs/servers/rpcbind/default.nix | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 744763c43f11..cc5d7795e050 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -1,28 +1,27 @@ -{ fetchurl, fetchpatch, stdenv, pkgconfig, libtirpc +{ fetchurl, stdenv, pkgconfig, libtirpc , useSystemd ? true, systemd }: -let version = "0.2.3"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "rpcbind-${version}"; + version = "0.2.4"; src = fetchurl { url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2"; - sha256 = "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq"; + sha256 = "0rjc867mdacag4yqvs827wqhkh27135rp9asj06ixhf71m9rljh7"; }; patches = [ ./sunrpc.patch - ./0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch - (fetchpatch { - url = "https://sources.debian.net/data/main/r/rpcbind/0.2.3-0.5/debian/patches/CVE-2015-7236.patch"; - sha256 = "1wsv5j8f5djzxr11n4027x107cam1avmx9w34g6l5d9s61j763wq"; - }) ]; buildInputs = [ libtirpc ] ++ stdenv.lib.optional useSystemd systemd; - configureFlags = stdenv.lib.optional (!useSystemd) "--with-systemdsystemunitdir=no"; + configureFlags = [ + "--with-systemdsystemunitdir=${if useSystemd then "$(out)/etc/systemd/system" else "no"}" + "--enable-warmstarts" + "--with-rpcuser=rpc" + ]; nativeBuildInputs = [ pkgconfig ]; |