JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'opensmtpd-6.4.1p2'

Browse Source 
* opensmtpd-6.4.1p2:
  opensmtpd: 6.4.0p2 -> 6.4.1p2
This commit is contained in:
Léo Gaspard 2019-01-16 13:33:17 +01:00
commit 25d6ec4ecc
No known key found for this signature in database
GPG Key ID: 771E7AD1170FE690
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/servers/mail/opensmtpd/default.nix
View File

@ -4,19 +4,18 @@
stdenv.mkDerivation rec {
name = "opensmtpd-${version}";
version = "6.4.0p2";
version = "6.4.1p2";
nativeBuildInputs = [ autoconf automake libtool bison ];
buildInputs = [ libasr libevent zlib libressl db pam ];
src = fetchurl {
url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
sha256 = "1y7snhsrcdi56vaa23iwjpybhyrnnh2f6dxrfnacn7xgy5xwzbvn";
sha256 = "0cppqlx4fk6l8rbim5symh2fm1kzshf421256g596j6c9f9q96xn";
};
patches = [
./proc_path.diff
./fix-build.diff # See https://github.com/OpenSMTPD/OpenSMTPD/pull/884
];
# See https://github.com/OpenSMTPD/OpenSMTPD/issues/885 for the `sh bootstrap`

12
pkgs/servers/mail/opensmtpd/fix-build.diff
View File

@ -1,12 +0,0 @@
diff --git a/mk/smtpctl/Makefile.am b/mk/smtpctl/Makefile.am
index 5af0b713..f0fce735 100644
--- a/mk/smtpctl/Makefile.am
+++ b/mk/smtpctl/Makefile.am
@@ -4,6 +4,7 @@ sbin_PROGRAMS= smtpctl
smtpctl_SOURCES= $(smtpd_srcdir)/enqueue.c
smtpctl_SOURCES+= $(smtpd_srcdir)/parser.c
+smtpctl_SOURCES+= $(smtpd_srcdir)/config.c
smtpctl_SOURCES+= $(smtpd_srcdir)/log.c
smtpctl_SOURCES+= $(smtpd_srcdir)/envelope.c
smtpctl_SOURCES+= $(smtpd_srcdir)/queue_backend.c