Merge pull request #148705 from risicle/ris-pure-ftpd-1.0.50
pure-ftpd: 1.0.49 -> 1.0.50
This commit is contained in:
commit
075b4b7e38
1 changed files with 5 additions and 18 deletions
|
@ -1,28 +1,15 @@
|
||||||
{ lib, stdenv, fetchurl, openssl, fetchpatch }:
|
{ lib, stdenv, fetchurl, openssl, pam, fetchpatch }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pure-ftpd";
|
pname = "pure-ftpd";
|
||||||
version = "1.0.49";
|
version = "1.0.50";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${version}.tar.gz";
|
url = "https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${version}.tar.gz";
|
||||||
sha256 = "19cjr262n6h560fi9nm7l1srwf93k34bp8dp1c6gh90bqxcg8yvn";
|
sha256 = "08zas1kg5pnckl28gs7q29952pjfyj8rj59bq96hscqbni7gkqmb";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
buildInputs = [ openssl pam ];
|
||||||
(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" ];
|
configureFlags = [ "--with-tls" ];
|
||||||
|
|
||||||
|
@ -31,6 +18,6 @@ stdenv.mkDerivation rec {
|
||||||
homepage = "https://www.pureftpd.org";
|
homepage = "https://www.pureftpd.org";
|
||||||
license = licenses.isc; # with some parts covered by BSD3(?)
|
license = licenses.isc; # with some parts covered by BSD3(?)
|
||||||
maintainers = [ ];
|
maintainers = [ ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue