Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d36077239cd5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b6bba58aef75
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 8, 2020

  1. firejail: 0.9.62 -> 0.9.64

    @snicket2100
    snicket2100 committed Nov 8, 2020
    Copy the full SHA
    cd1c563 View commit details

Commits on Nov 9, 2020

  1. Merge pull request #103176 from snicket2100/firejail-64 

    firejail: 0.9.62 -> 0.9.64
    @7c6f434c
    7c6f434c authored Nov 9, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b6bba58 View commit details
Showing with 2 additions and 15 deletions.
  1. +2 −15 pkgs/os-specific/linux/firejail/default.nix
17 changes: 2 additions & 15 deletions pkgs/os-specific/linux/firejail/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 \