From b32487deda660d91e00b9fd9911b582fc6161d32 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 4 Dec 2021 23:45:05 +0000 Subject: [PATCH 1/2] pure-ftpd: 1.0.49 -> 1.0.50 --- pkgs/servers/ftp/pure-ftpd/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index b88d926e1db6..d2e04eb372b8 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -2,26 +2,13 @@ stdenv.mkDerivation rec { pname = "pure-ftpd"; - version = "1.0.49"; + version = "1.0.50"; src = fetchurl { url = "https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${version}.tar.gz"; - sha256 = "19cjr262n6h560fi9nm7l1srwf93k34bp8dp1c6gh90bqxcg8yvn"; + sha256 = "08zas1kg5pnckl28gs7q29952pjfyj8rj59bq96hscqbni7gkqmb"; }; - 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" ]; From 7ed01d754e81b3fec92c223291a1fc94fe95de2a Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 5 Dec 2021 12:32:39 +0000 Subject: [PATCH 2/2] pure-ftpd: enable for darwin --- pkgs/servers/ftp/pure-ftpd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index d2e04eb372b8..80bcc361a8b0 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, fetchpatch }: +{ lib, stdenv, fetchurl, openssl, pam, fetchpatch }: stdenv.mkDerivation rec { pname = "pure-ftpd"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "08zas1kg5pnckl28gs7q29952pjfyj8rj59bq96hscqbni7gkqmb"; }; - buildInputs = [ openssl ]; + buildInputs = [ openssl pam ]; configureFlags = [ "--with-tls" ]; @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = "https://www.pureftpd.org"; license = licenses.isc; # with some parts covered by BSD3(?) maintainers = [ ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }