Merge pull request #95280 from risicle/ris-pure-ftpd-CVE-2020-9274

pure-ftpd: add patches for CVE-2020-9274, CVE-2020-9365

authored by Martin Weinelt and committed by GitHub cee1971d 4b4986a6

+14 -1
+14 -1
pkgs/servers/ftp/pure-ftpd/default.nix
··· 1 - { stdenv, fetchurl, openssl }: 2 3 stdenv.mkDerivation rec { 4 name = "pure-ftpd-1.0.49"; ··· 7 url = "https://download.pureftpd.org/pub/pure-ftpd/releases/${name}.tar.gz"; 8 sha256 = "19cjr262n6h560fi9nm7l1srwf93k34bp8dp1c6gh90bqxcg8yvn"; 9 }; 10 11 buildInputs = [ openssl ]; 12
··· 1 + { stdenv, fetchurl, openssl, fetchpatch }: 2 3 stdenv.mkDerivation rec { 4 name = "pure-ftpd-1.0.49"; ··· 7 url = "https://download.pureftpd.org/pub/pure-ftpd/releases/${name}.tar.gz"; 8 sha256 = "19cjr262n6h560fi9nm7l1srwf93k34bp8dp1c6gh90bqxcg8yvn"; 9 }; 10 + 11 + patches = [ 12 + (fetchpatch { 13 + name = "CVE-2020-9274.patch"; 14 + url = "https://github.com/jedisct1/pure-ftpd/commit/8d0d42542e2cb7a56d645fbe4d0ef436e38bcefa.patch"; 15 + sha256 = "1yd84p6bd4rf21hg3kqpi2a02cac6dz5ag4xx3c2dl5vbzhr5a8k"; 16 + }) 17 + (fetchpatch { 18 + name = "CVE-2020-9365.patch"; 19 + url = "https://github.com/jedisct1/pure-ftpd/commit/bf6fcd4935e95128cf22af5924cdc8fe5c0579da.patch"; 20 + sha256 = "003klx7j82qf92qr1dxg32v5r2bhhywplynd3xil1lbcd3s3mqhi"; 21 + }) 22 + ]; 23 24 buildInputs = [ openssl ]; 25