diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix index dc46e356e2c8..6ec8f24b7132 100644 --- a/pkgs/development/libraries/libspf2/default.nix +++ b/pkgs/development/libraries/libspf2/default.nix @@ -1,29 +1,18 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: with lib; stdenv.mkDerivation rec { pname = "libspf2"; - version = "1.2.10"; + version = "2.2.12"; - src = fetchurl { - url = "https://www.libspf2.org/spf/libspf2-${version}.tar.gz"; - sha256 = "1j91p0qiipzf89qxq4m1wqhdf01hpn1h5xj4djbs51z23bl3s7nr"; + src = fetchFromGitHub { + owner = "helsinki-systems"; + repo = "libspf2"; + rev = "v${version}"; + sha256 = "03iiaafdcwh220pqignk407h6klrakwz0zkb8iwk6nkwipkwvhsx"; }; - patches = [ - (fetchurl { - name = "0001-gcc-variadic-macros.patch"; - url = "https://github.com/shevek/libspf2/commit/5852828582f556e73751076ad092f72acf7fc8b6.patch"; - sha256 = "1v6ashqzpr0xidxq0vpkjd8wd66cj8df01kyzj678ljzcrax35hk"; - }) - (fetchurl { - name = "0002-CVE-2021-20314.patch"; - url = "https://github.com/shevek/libspf2/commit/c37b7c13c30e225183899364b9f2efdfa85552ef.patch"; - sha256 = "190nnh7mlz6328829ba6jajad16s3md8kraspn81qnvhwh0nkiak"; - }) - ]; - postPatch = '' # disable static bins compilation sed -i \ @@ -42,7 +31,7 @@ stdenv.mkDerivation rec { description = "Implementation of the Sender Policy Framework for SMTP authorization"; homepage = "https://www.libspf2.org"; license = with licenses; [ lgpl21Plus bsd2 ]; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ pacien ajs124 das_j ]; platforms = platforms.all; }; }