Skip to content

Commit

Permalink
Merge pull request #95456 from risicle/ris-pure-ftpd-CVE-2020-9274-r2…
Browse files Browse the repository at this point in the history
…0.03

[r20.03] pure-ftpd: add patches for CVE-2020-9274, CVE-2020-9365
  • Loading branch information
mweinelt committed Aug 14, 2020
2 parents 48b95e2 + 1b38247 commit 3506bce
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion pkgs/servers/ftp/pure-ftpd/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl }:
{ stdenv, fetchurl, openssl, fetchpatch }:

stdenv.mkDerivation rec {
name = "pure-ftpd-1.0.49";
Expand All @@ -8,6 +8,19 @@ stdenv.mkDerivation rec {
sha256 = "19cjr262n6h560fi9nm7l1srwf93k34bp8dp1c6gh90bqxcg8yvn";
};

patches = [
(fetchpatch {
name = "CVE-2020-9274.patch";
url = "https://github.com/jedisct1/pure-ftpd/commit/8d0d42542e2cb7a56d645fbe4d0ef436e38bcefa.patch";
sha256 = "1yd84p6bd4rf21hg3kqpi2a02cac6dz5ag4xx3c2dl5vbzhr5a8k";
})
(fetchpatch {
name = "CVE-2020-9365.patch";
url = "https://github.com/jedisct1/pure-ftpd/commit/bf6fcd4935e95128cf22af5924cdc8fe5c0579da.patch";
sha256 = "003klx7j82qf92qr1dxg32v5r2bhhywplynd3xil1lbcd3s3mqhi";
})
];

buildInputs = [ openssl ];

configureFlags = [ "--with-tls" ];
Expand Down

0 comments on commit 3506bce

Please sign in to comment.