diff options
author | Yorick van Pelt <yorick@yorickvanpelt.nl> | 2022-10-09 10:40:07 +0200 |
---|---|---|
committer | Yorick van Pelt <yorick@yorickvanpelt.nl> | 2022-11-21 11:46:25 +0100 |
commit | 37cc873ac8275cc6b5cdbf0f8ac8eab1f01a8038 (patch) | |
tree | 3b8b46a5437dc20a9100c76a58cf6402d08635d6 | |
parent | 2fb3bfb178b2f0002b47b290f2479ea04251875b (diff) |
pypolicyd-spf 2.0.2 -> spf-engine 2.9.3
Fixes CVE-2019-20790
-rw-r--r-- | pkgs/servers/mail/pypolicyd-spf/default.nix | 26 | ||||
-rw-r--r-- | pkgs/servers/mail/spf-engine/default.nix | 26 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 28 insertions, 27 deletions
diff --git a/pkgs/servers/mail/pypolicyd-spf/default.nix b/pkgs/servers/mail/pypolicyd-spf/default.nix deleted file mode 100644 index cbc63ff535a11..0000000000000 --- a/pkgs/servers/mail/pypolicyd-spf/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonApplication, fetchurl, pyspf }: - -buildPythonApplication rec { - pname = "pypolicyd-spf"; - majorVersion = "2.0"; - version = "${majorVersion}.2"; - - src = fetchurl { - url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "1nm8y1jjgx6mxrbcxrbdnmkf8vglwp0wiw6jipzh641wb24gi76z"; - }; - - propagatedBuildInputs = [ pyspf ]; - - preBuild = '' - substituteInPlace setup.py --replace "'/etc'" "'$out/etc'" - ''; - - meta = with lib; { - homepage = "https://launchpad.net/pypolicyd-spf/"; - description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; - maintainers = with maintainers; [ abbradar ]; - license = licenses.asl20; - platforms = platforms.all; - }; -} diff --git a/pkgs/servers/mail/spf-engine/default.nix b/pkgs/servers/mail/spf-engine/default.nix new file mode 100644 index 0000000000000..9237d735971a5 --- /dev/null +++ b/pkgs/servers/mail/spf-engine/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonApplication, fetchurl, pyspf, dnspython, authres, pymilter }: + +buildPythonApplication rec { + pname = "spf-engine"; + majorVersion = lib.versions.majorMinor version; + version = "2.9.3"; + + src = fetchurl { + url = "https://launchpad.net/${pname}/${majorVersion}/${version}/+download/${pname}-${version}.tar.gz"; + sha256 = "sha256-w0Nb+L/Os3KPApENoylxCVaCD4FvgmvpfVvwCkt2IDE="; + }; + + propagatedBuildInputs = [ pyspf dnspython authres pymilter ]; + + preBuild = '' + substituteInPlace setup.py --replace "'/etc'" "'$out/etc'" + ''; + + meta = with lib; { + homepage = "https://launchpad.net/${pname}/"; + description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2397944714690..c169dfe53ed83 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1232,6 +1232,7 @@ mapAliases ({ pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained"; # Added 2021-03-21 pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd"; # Added 2020-10-24 pyo3-pack = maturin; + pypolicyd-spf = spf-engine; # Added 2022-10-09 pyrex = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12 pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12 pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcb049f54fc02..daf914cb71fde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24406,7 +24406,7 @@ with pkgs; pure-ftpd = callPackage ../servers/ftp/pure-ftpd { }; - pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { }; + spf-engine = python3.pkgs.callPackage ../servers/mail/spf-engine { }; pypiserver = with python3Packages; toPythonApplication pypiserver; |