From 12ccf9b801e64b8dd74773a7a64ccb8131bd2f2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Wed, 16 Jan 2019 12:58:04 +0100 Subject: [PATCH] opensmtpd: 6.4.0p2 -> 6.4.1p2 --- pkgs/servers/mail/opensmtpd/default.nix | 5 ++--- pkgs/servers/mail/opensmtpd/fix-build.diff | 12 ------------ 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 pkgs/servers/mail/opensmtpd/fix-build.diff diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 695450f1822..4d6c915f359 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -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` diff --git a/pkgs/servers/mail/opensmtpd/fix-build.diff b/pkgs/servers/mail/opensmtpd/fix-build.diff deleted file mode 100644 index 1f995fd4f62..00000000000 --- a/pkgs/servers/mail/opensmtpd/fix-build.diff +++ /dev/null @@ -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