diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2020-11-09 07:09:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 07:09:31 +0000 |
| commit | b6bba58aef753592a58866d05b247209489971c3 (patch) | |
| tree | 9288cd1c456ef2ff2ef58146644f954c57d0dc8b | |
| parent | d36077239cd504a82788411d0a58a24a6c529fb8 (diff) | |
| parent | cd1c5633af2665bf5aee46935ff46f3bacdce317 (diff) | |
Merge pull request #103176 from snicket2100/firejail-64
firejail: 0.9.62 -> 0.9.64
| -rw-r--r-- | pkgs/os-specific/linux/firejail/default.nix | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 272b8612d7a7..497314a6d44a 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.62"; + version="0.9.64"; name="${baseName}-${version}"; url="mirror://sourceforge/firejail/firejail/firejail-${version}.tar.xz"; - sha256="1q2silgy882fl61p5qa9f9jqkxcqnwa71jig3c729iahx4f0hs05"; + sha256="1zgjwy2k57nx0r63fzr15gijah098ig0bll66jd615vc9q3snfz5"; }; buildInputs = [ which @@ -20,19 +20,6 @@ stdenv.mkDerivation { name = "${s.name}.tar.bz2"; }; - patches = [ - (fetchpatch { - name = "CVE-2020-17367.patch"; - url = "https://github.com/netblue30/firejail/commit/2c734d6350ad321fccbefc5ef0382199ac331b37.patch"; - sha256 = "1gxz4jxp80gxnn46195qxcpmikwqab9d0ylj9zkm62lycp84ij6n"; - }) - (fetchpatch { - name = "CVE-2020-17368.patch"; - url = "https://github.com/netblue30/firejail/commit/34193604fed04cad2b7b6b0f1a3a0428afd9ed5b.patch"; - sha256 = "0n4ch3qykxx870201l8lz81f7h84vk93pzz77f5cjbd30cxnbddl"; - }) - ]; - prePatch = '' # Allow whitelisting ~/.nix-profile substituteInPlace etc/firejail.config --replace \ |