cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #103176 from snicket2100/firejail-64

Browse source 
firejail: 0.9.62 -> 0.9.64
This commit is contained in:
Michael Raskin 2020-11-09 07:09:31 +00:00 committed by GitHub
commit b6bba58aef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/os-specific/linux/firejail/default.nix
View file

@ -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 \