Merge staging-next into staging

2021-02-27 12:20:00 +00:00
parent 2e1a7b94f3 5b68a8b74b
commit 2a38839b78
40 changed files with 126 additions and 145 deletions
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
    })
    # P2P: Fix a corner case in peer addition based on PD Request (https://w1.fi/security/2021-1/)
    (fetchurl {
+      name = "CVE-2021-27803.patch";
      url = "https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch";
      sha256 = "04cnds7hmbqc44jasabjvrdnh66i5hwvk2h2m5z94pmgbzncyh3z";
    })