diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-21 12:02:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-21 12:02:00 +0000 |
| commit | 3087a2d2e96ab840a907dc62b84366e50a9a5ab6 (patch) | |
| tree | 7456adc1bd1d33ae50e644953e5d4297d559d289 /pkgs/os-specific/linux/systemd | |
| parent | 0c7cc39e6cfeb8e3dd12cb6a5abf16a91586634e (diff) | |
| parent | de72454d43afd149a93a207b41fe0ae90895b158 (diff) | |
| download | nixpkgs-3087a2d2e96ab840a907dc62b84366e50a9a5ab6.tar nixpkgs-3087a2d2e96ab840a907dc62b84366e50a9a5ab6.tar.gz nixpkgs-3087a2d2e96ab840a907dc62b84366e50a9a5ab6.tar.bz2 nixpkgs-3087a2d2e96ab840a907dc62b84366e50a9a5ab6.tar.lz nixpkgs-3087a2d2e96ab840a907dc62b84366e50a9a5ab6.tar.xz nixpkgs-3087a2d2e96ab840a907dc62b84366e50a9a5ab6.tar.zst nixpkgs-3087a2d2e96ab840a907dc62b84366e50a9a5ab6.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index c13f97fcde7..a33bb3c1a1d 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -157,6 +157,13 @@ stdenv.mkDerivation { url = "https://github.com/systemd/systemd/commit/ab1aa6368a883bce88e3162fee2bea14aacedf23.patch"; sha256 = "1b280l5jrjsg8qhsang199mpqjhkpix4c8bm3blknjnq9iv43add"; }) + + # Fix CVE-2021-33910, disclosed 2021-07-20 + (fetchpatch { + name = "CVE-2021-33910.patch"; + url = "https://github.com/systemd/systemd/commit/441e0115646d54f080e5c3bb0ba477c892861ab9.patch"; + sha256 = "1g1lk95igaadg67kah9bpi4zsc01rg398sd1247ghjsvl5hxn4v4"; + }) ]; postPatch = '' |