diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-11-09 10:29:11 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-11-09 10:29:11 +0100 |
| commit | 8302338ae99b81db102cceec8212b5c5dcce4e3f (patch) | |
| tree | 2d40bc9be147849a90147b4e182bd6a406f503ae | |
| parent | 07c84f4de229cddd1abc87350bbe17a4725964b1 (diff) | |
| parent | 03d6145cb020aa4c782c78580d2d049b42ea5a28 (diff) | |
| download | nixlib-8302338ae99b81db102cceec8212b5c5dcce4e3f.tar nixlib-8302338ae99b81db102cceec8212b5c5dcce4e3f.tar.gz nixlib-8302338ae99b81db102cceec8212b5c5dcce4e3f.tar.bz2 nixlib-8302338ae99b81db102cceec8212b5c5dcce4e3f.tar.lz nixlib-8302338ae99b81db102cceec8212b5c5dcce4e3f.tar.xz nixlib-8302338ae99b81db102cceec8212b5c5dcce4e3f.tar.zst nixlib-8302338ae99b81db102cceec8212b5c5dcce4e3f.zip | |
Merge #72278: keepalived: 1.4.2 -> 1.4.5, patch CVE-2018-19115
| -rw-r--r-- | pkgs/tools/networking/keepalived/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 9ae981e03692..4e1894db98cc 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -1,16 +1,24 @@ -{ stdenv, fetchFromGitHub, libnfnetlink, libnl, net_snmp, openssl, pkgconfig }: +{ stdenv, fetchFromGitHub, fetchpatch, libnfnetlink, libnl, net_snmp, openssl, pkgconfig }: stdenv.mkDerivation rec { pname = "keepalived"; - version = "1.4.2"; + version = "1.4.5"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "154yxs6kwpi9yc4pa45ba3z3bfwzgmmmja5nk3d9mxq6w6s1swcy"; + sha256 = "12r80rcfxrys826flaqcdlfhcr7q4ccsd62ra1svy9545vf02qmx"; }; + patches = [ + (fetchpatch { + name = "CVE-2018-19115.patch"; + url = "https://github.com/acassen/keepalived/pull/961/commits/f28015671a4b04785859d1b4b1327b367b6a10e9.patch"; + sha256 = "1jnwk7x4qdgv7fb4jzw6sihv62n8wv04myhgwm2vxn8nfkcgd1mm"; + }) + ]; + buildInputs = [ libnfnetlink libnl |