diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
| commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
| tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/libspf2/default.nix | |
| parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
| parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
| download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip | |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libspf2/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libspf2/default.nix | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libspf2/default.nix b/nixpkgs/pkgs/development/libraries/libspf2/default.nix index dc46e356e2c8..6ec8f24b7132 100644 --- a/nixpkgs/pkgs/development/libraries/libspf2/default.nix +++ b/nixpkgs/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; }; } |