Index: head/mail/opensmtpd/Makefile
===================================================================
--- head/mail/opensmtpd/Makefile	(revision 468995)
+++ head/mail/opensmtpd/Makefile	(revision 468996)
@@ -1,64 +1,64 @@
 # Created by: Ashish SHUKLA <ashish@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	opensmtpd
 PORTVERSION=	5.9.2p1
 PORTEPOCH=	1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/ \
 		http://distfiles.pirateparty.in/ashish/
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Security- and simplicity-focused SMTP server from OpenBSD
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 
 OPTIONS_DEFINE=	CA_BUNDLE LIBASRDEVEL MAILERCONF PAM TABLE_DB
 
 OPTIONS_DEFAULT=	CA_BUNDLE PAM TABLE_DB
 
 CA_BUNDLE_DESC=	Install CA bundle for SSL
 LIBASRDEVEL_DESC=	Use development version of libasr
 MAILERCONF_DESC=	Activate OpenSMTPD in mailer.conf(5)
 TABLE_DB_DESC=		Build table-db plugin (aliases)
 
 USES=		cpe groff libtool ssl
 GNU_CONFIGURE=	yes
 
 CPE_VENDOR=	openbsd
 
 USE_RC_SUBR=	smtpd
 SUB_FILES=	pkg-install pkg-deinstall pkg-message
 
 CONFLICTS_INSTALL=	postfix-[0-9]* sendmail-[0-9]* opensmtpd-devel-[0-9]*
 
 USERS=		_smtpd _smtpq
 GROUPS=		_smtpd _smtpq
 
 OPTIONS_SUB=	yes
 
 CA_BUNDLE_CONFIGURE_WITH=	path-CAfile=${LOCALBASE}/share/certs/ca-root-nss.crt
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 LIBASRDEVEL_LIB_DEPENDS_OFF=	libasr.so:dns/libasr
 LIBASRDEVEL_LIB_DEPENDS=	libasr.so:dns/libasr-devel
 
 PAM_CONFIGURE_WITH=	auth-pam=smtpd
 TABLE_DB_CONFIGURE_WITH=	table-db
 
 CONFIGURE_ARGS+=	--with-libasr=${LOCALBASE} \
 			--with-libevent=${LOCALBASE} \
 			--with-libssl=${OPENSSLBASE} \
 			--sysconfdir=${PREFIX}/etc/mail/
 
 post-patch:
 	${REINPLACE_CMD} -e '/chmod 2555/d' ${WRKSRC}/mk/smtpctl/Makefile.in
 
 post-install-TABLE_DB-on:
 	@${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap
 
 .include <bsd.port.mk>
Index: head/mail/opensmtpd/files/patch-smtpd-rfc2822.c
===================================================================
--- head/mail/opensmtpd/files/patch-smtpd-rfc2822.c	(nonexistent)
+++ head/mail/opensmtpd/files/patch-smtpd-rfc2822.c	(revision 468996)
@@ -0,0 +1,19 @@
+--- smtpd/rfc2822.c.orig	2018-05-01 13:33:10.000000000 +0000
++++ smtpd/rfc2822.c	2018-05-01 13:34:47.931554000 +0000
+@@ -53,4 +53,7 @@
+ 	struct rfc2822_hdr_miss_cb	*hdr_miss_cb;
++ 	
++ 	if (!rp->in_hdr)
++		goto end;
+ 
+ 	TAILQ_FOREACH(hdr_cb, &rp->hdr_cb, next)
+ 	    if (strcasecmp(hdr_cb->name, rp->header.name) == 0) {
+@@ -151,6 +152,8 @@
+ 		return;
+ 
+ 	header_callback(rp);
++
++	missing_headers_callback(rp);
+ }
+ 
+ void

Property changes on: head/mail/opensmtpd/files/patch-smtpd-rfc2822.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/opensmtpd/files/patch-smtpd-smtp_session.c
===================================================================
--- head/mail/opensmtpd/files/patch-smtpd-smtp_session.c	(nonexistent)
+++ head/mail/opensmtpd/files/patch-smtpd-smtp_session.c	(revision 468996)
@@ -0,0 +1,11 @@
+--- smtpd/smtp_session.c.orig	2018-05-01 13:35:00.375262000 +0000
++++ smtpd/smtp_session.c	2018-05-01 13:37:22.637096000 +0000
+@@ -1345,6 +1345,8 @@
+ 			s->dataeom = 1;
+ 			if (iobuf_queued(&s->obuf) == 0)
+ 				smtp_data_io_done(s);
++			else
++				io_reload(&s->oev);
+ 			return;
+ 		}
+ 

Property changes on: head/mail/opensmtpd/files/patch-smtpd-smtp_session.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/opensmtpd-devel/Makefile
===================================================================
--- head/mail/opensmtpd-devel/Makefile	(revision 468995)
+++ head/mail/opensmtpd-devel/Makefile	(revision 468996)
@@ -1,70 +1,70 @@
 # Created by: Ashish SHUKLA <ashish@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	opensmtpd
 PORTVERSION=	201606220754
 DISTVERSIONSUFFIX=	p1
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/ \
 		http://distfiles.pirateparty.in/ashish/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Security- and simplicity-focused SMTP server from OpenBSD
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 
 OPTIONS_DEFINE=		CA_BUNDLE LIBASR MAILERCONF PAM TABLE_DB
 
 OPTIONS_DEFAULT=	CA_BUNDLE PAM TABLE_DB
 
 CA_BUNDLE_DESC=		Install CA bundle for SSL
 LIBASR_DESC=		Use stable version of libasr
 MAILERCONF_DESC=	Activate OpenSMTPD in mailer.conf(5)
 TABLE_DB_DESC=		Build table-db plugin (aliases)
 
 USES=		cpe groff libtool ssl
 GNU_CONFIGURE=	yes
 
 CPE_VENDOR=	openbsd
 
 USE_RC_SUBR=	smtpd
 SUB_FILES=	pkg-install pkg-deinstall pkg-message
 
 CONFLICTS_INSTALL=	postfix-[0-9]* sendmail-[0-9]* opensmtpd-[0-9]*
 
 USERS=		_smtpd _smtpq
 GROUPS=		_smtpd _smtpq
 
 OPTIONS_SUB=	yes
 
 CA_BUNDLE_CONFIGURE_WITH=	path-CAfile=${LOCALBASE}/share/certs/ca-root-nss.crt
 CA_BUNDLE_RUN_DEPENDS=		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 LIBASR_LIB_DEPENDS=	libasr.so:dns/libasr
 LIBASR_LIB_DEPENDS_OFF=	libasr.so:dns/libasr-devel
 
 PAM_CONFIGURE_WITH=	auth-pam=smtpd
 TABLE_DB_CONFIGURE_WITH=	table-db
 
 CONFIGURE_ARGS+=	--with-libasr=${LOCALBASE} \
 			--with-libevent=${LOCALBASE} \
 			--with-libssl=${OPENSSLBASE} \
 			--sysconfdir=${PREFIX}/etc/mail/
 
 post-patch:
 	${REINPLACE_CMD} -e '/chmod 2555/d' ${WRKSRC}/mk/smtpctl/Makefile.in
 	# https://github.com/OpenSMTPD/OpenSMTPD/issues/700
 	${REINPLACE_CMD} -r -e \
 		'/SMTPD_VERSION/s/"[^"]+"$$/"${PORTVERSION}${DISTVERSIONSUFFIX}"/' \
 		${WRKSRC}/smtpd/smtpd.h
 
 post-install-TABLE_DB-on:
 	@${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap
 
 .include <bsd.port.mk>
Index: head/mail/opensmtpd-devel/files/patch-smtpd-rfc2822.c
===================================================================
--- head/mail/opensmtpd-devel/files/patch-smtpd-rfc2822.c	(nonexistent)
+++ head/mail/opensmtpd-devel/files/patch-smtpd-rfc2822.c	(revision 468996)
@@ -0,0 +1,19 @@
+--- smtpd/rfc2822.c.orig	2018-05-01 13:33:10.000000000 +0000
++++ smtpd/rfc2822.c	2018-05-01 13:34:47.931554000 +0000
+@@ -53,4 +53,7 @@
+ 	struct rfc2822_hdr_miss_cb	*hdr_miss_cb;
++ 	
++ 	if (!rp->in_hdr)
++		goto end;
+ 
+ 	TAILQ_FOREACH(hdr_cb, &rp->hdr_cb, next)
+ 	    if (strcasecmp(hdr_cb->name, rp->header.name) == 0) {
+@@ -151,6 +152,8 @@
+ 		return;
+ 
+ 	header_callback(rp);
++
++	missing_headers_callback(rp);
+ }
+ 
+ void

Property changes on: head/mail/opensmtpd-devel/files/patch-smtpd-rfc2822.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/opensmtpd-devel/files/patch-smtpd-smtp_session.c
===================================================================
--- head/mail/opensmtpd-devel/files/patch-smtpd-smtp_session.c	(nonexistent)
+++ head/mail/opensmtpd-devel/files/patch-smtpd-smtp_session.c	(revision 468996)
@@ -0,0 +1,11 @@
+--- smtpd/smtp_session.c.orig	2018-05-01 13:35:00.375262000 +0000
++++ smtpd/smtp_session.c	2018-05-01 13:37:22.637096000 +0000
+@@ -1345,6 +1345,8 @@
+ 			s->dataeom = 1;
+ 			if (iobuf_queued(&s->obuf) == 0)
+ 				smtp_data_io_done(s);
++			else
++				io_reload(&s->oev);
+ 			return;
+ 		}
+ 

Property changes on: head/mail/opensmtpd-devel/files/patch-smtpd-smtp_session.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property