diff --git a/pkgs/applications/misc/procmail/CVE-2014-3618.patch b/pkgs/applications/misc/procmail/CVE-2014-3618.patch deleted file mode 100644 index e3aa5600e40..00000000000 --- a/pkgs/applications/misc/procmail/CVE-2014-3618.patch +++ /dev/null @@ -1,18 +0,0 @@ -From http://seclists.org/oss-sec/2014/q3/495 (with whitespace corrected). - ---- a/src/formisc.c 2013-08-04 00:13:33.000000000 -0700 -+++ b/src/formisc.c 2014-09-03 11:42:25.986002396 -0700 -@@ -84,12 +84,11 @@ - case '"':*target++=delim='"';start++; - } - ;{ int i; -- do -+ while(*start) - if((i= *target++= *start++)==delim) /* corresponding delimiter? */ - break; - else if(i=='\\'&&*start) /* skip quoted character */ - *target++= *start++; -- while(*start); /* anything? */ - } - hitspc=2; - } diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index dafc73925b5..ea299d73cbb 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -2,22 +2,13 @@ stdenv.mkDerivation rec { pname = "procmail"; - version = "3.22"; + version = "3.24"; src = fetchurl { - url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-${version}.tar.gz"; - sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08"; + url = "https://github.com/BuGlessRB/procmail/archive/refs/tags/v${version}.tar.gz"; + sha256 = "UU6kMzOXg+ld+TIeeUdx5Ih7mCOsVf2yRpcCz2m9OYk="; }; - patches = [ - ./CVE-2014-3618.patch - (fetchurl { - url = "https://sources.debian.org/data/main/p/procmail/3.22-26/debian/patches/30"; - sha256 = "11zmz1bj0v9pay3ldmyyg7473b80h89gycrhndsgg9q50yhcqaaq"; - name = "CVE-2017-16844"; - }) - ]; - # getline is defined differently in glibc now. So rename it. # Without the .PHONY target "make install" won't install anything on Darwin. postPatch = '' @@ -33,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mail processing and filtering utility"; - homepage = "http://www.procmail.org/"; + homepage = "https://github.com/BuGlessRB/procmail/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ gebner ];