BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #42139 from Ekleog/opensmtpd-dovecot-fix

Browse source 
opensmtpd: fix interaction with dovecot-2.3.1
This commit is contained in:
xeji 2018-06-18 22:07:57 +02:00 committed by GitHub
commit 20bc7f75fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/servers/mail/opensmtpd/default.nix
View file

@ -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 ''