From c068e1ca9af3e86f56615aafd705fbd851f466bb Mon Sep 17 00:00:00 2001 From: Léo Gaspard Date: Sun, 17 Jun 2018 22:28:23 +0200 Subject: opensmtpd: fix interaction with dovecot-2.3.1 This has been merged upstream with https://github.com/OpenSMTPD/OpenSMTPD/pull/847 --- pkgs/servers/mail/opensmtpd/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pkgs/servers/mail/opensmtpd') diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index e562fdc88a6..60c517230b4 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoconf, automake, libtool, bison +{ stdenv, lib, fetchurl, fetchpatch, autoconf, automake, libtool, bison , libasr, libevent, zlib, openssl, db, pam # opensmtpd requires root for no reason to encrypt passwords, this patch fixes it @@ -23,7 +23,13 @@ else stdenv.mkDerivation rec { sha256 = "291881862888655565e8bbe3cfb743310f5dc0edb6fd28a889a9a547ad767a81"; }; - patches = [ ./proc_path.diff ]; + patches = [ + ./proc_path.diff + (fetchpatch { + url = "https://github.com/OpenSMTPD/OpenSMTPD/commit/725ba4fa2ddf23bbcd1ff9ec92e86bbfaa6825c8.diff"; + sha256 = "19rla0b2r53jpdiz25fcza29c2msz6j6paivxhp9jcy1xl457dqa"; + }) + ]; postPatch = with builtins; with lib; optionalString unpriviledged_smtpctl_encrypt '' -- cgit 1.4.1