4 files changed, 42 insertions, 6 deletions
diff --git a/mail/opensmtpd-devel/Makefile b/mail/opensmtpd-devel/Makefile
index 75f26363d01d..f7970671b1f1 100644
--- a/mail/opensmtpd-devel/Makefile
+++ b/mail/opensmtpd-devel/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	opensmtpd
-PORTVERSION=	201605221711
+PORTVERSION=	201606062303
 DISTVERSIONSUFFIX=	p1
 PORTEPOCH=	1
-PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/ \
 		http://distfiles.pirateparty.in/ashish/
diff --git a/mail/opensmtpd-devel/distinfo b/mail/opensmtpd-devel/distinfo
index a6d35245d3f0..32c61cd0790d 100644
--- a/mail/opensmtpd-devel/distinfo
+++ b/mail/opensmtpd-devel/distinfo
@@ -1,2 +1,3 @@
-SHA256 (opensmtpd-201605221711p1.tar.gz) = e7f63a4d5c26386cffe61f35d6e4a959a1f6f38b3fbe0351c746326cf2329418
-SIZE (opensmtpd-201605221711p1.tar.gz) = 691693
+TIMESTAMP = 1465270468
+SHA256 (opensmtpd-201606062303p1.tar.gz) = f54a496ec4729073bba2efec2daca69a469b2fd7666dbcc309d21324f76d16ad
+SIZE (opensmtpd-201606062303p1.tar.gz) = 692651
diff --git a/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in b/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in
index d702255d55fe..f7d756b35c37 100644
--- a/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in
+++ b/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in
@@ -1,6 +1,6 @@
---- mk/smtpd/Makefile.in.orig	2016-02-02 20:40:51 UTC
+--- mk/smtpd/Makefile.in.orig	2016-06-06 21:03:28 UTC
 +++ mk/smtpd/Makefile.in
-@@ -1365,13 +1365,7 @@ install-exec-hook: $(CONFIGFILES) $(MANP
+@@ -1366,13 +1366,7 @@ install-exec-hook: $(CONFIGFILES) $(MANP
  	$(MKDIR_P) $(DESTDIR)$(bindir)
  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
diff --git a/mail/opensmtpd-devel/files/patch-smtpd_smtpd.c b/mail/opensmtpd-devel/files/patch-smtpd_smtpd.c
new file mode 100644
index 000000000000..814e6142ec0b
--- /dev/null
+++ b/mail/opensmtpd-devel/files/patch-smtpd_smtpd.c
@@ -0,0 +1,36 @@
+--- smtpd/smtpd.c.orig	2016-06-06 20:51:18 UTC
++++ smtpd/smtpd.c
+@@ -1,4 +1,4 @@
+-/*	$OpenBSD: smtpd.c,v 1.277 2016/05/28 21:21:20 eric Exp $	*/
++/*	$OpenBSD: smtpd.c,v 1.278 2016/06/07 06:52:49 gilles Exp $	*/
+ 
+ /*
+  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
+@@ -843,9 +843,12 @@ start_child(int save_argc, char **save_a
+ 	if (save_argc >= SMTPD_MAXARG - 2)
+ 		fatalx("too many arguments");
+ 
+-	if (socketpair(AF_UNIX, SOCK_STREAM|SOCK_NONBLOCK, PF_UNSPEC, sp) == -1)
++	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, sp) == -1)
+ 		fatal("socketpair");
+ 
++	io_set_nonblocking(sp[0]);
++	io_set_nonblocking(sp[1]);
++
+ 	switch (pid = fork()) {
+ 	case -1:
+ 		fatal("%s: fork", save_argv[0]);
+@@ -884,9 +887,12 @@ setup_peers(struct mproc *a, struct mpro
+ {
+ 	int sp[2];
+ 
+-	if (socketpair(AF_UNIX, SOCK_STREAM|SOCK_NONBLOCK, PF_UNSPEC, sp) == -1)
++	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, sp) == -1)
+ 		fatal("socketpair");
+ 
++	io_set_nonblocking(sp[0]);
++	io_set_nonblocking(sp[1]);
++
+ 	if (imsg_compose(&a->imsgbuf, IMSG_SETUP_PEER, b->proc, b->pid, sp[0],
+ 	    NULL, 0) == -1)
+ 		fatal("imsg_compose");