Date: Fri, 27 Apr 2018 03:54:08 +0000 (UTC) From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r468396 - in branches/2018Q2/mail: opensmtpd opensmtpd-devel opensmtpd-devel/files opensmtpd/files Message-ID: <201804270354.w3R3s8fn014726@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fluffy Date: Fri Apr 27 03:54:08 2018 New Revision: 468396 URL: https://svnweb.freebsd.org/changeset/ports/468396 Log: MFH: r468319 - Pet MDA part, add brackets around Return-Path as per RFC5322 ยง3.6.6. Missing brackets lead to a panic when a malformed address line is fed to dovecot-lda Submitted by: gahr Reported by: brnrd via dovecot ML Obtained from: https://github.com/OpenSMTPD/OpenSMTPD/pull/847/commits/725ba4fa2ddf23bbcd1ff9ec92e86bbfaa6825c8 Approved by: portmgr (adamw) Added: branches/2018Q2/mail/opensmtpd-devel/files/patch-src_mda.c - copied unchanged from r468319, head/mail/opensmtpd-devel/files/patch-src_mda.c branches/2018Q2/mail/opensmtpd/files/patch-src_mda.c - copied unchanged from r468319, head/mail/opensmtpd/files/patch-src_mda.c Modified: branches/2018Q2/mail/opensmtpd-devel/Makefile branches/2018Q2/mail/opensmtpd/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/mail/opensmtpd-devel/Makefile ============================================================================== --- branches/2018Q2/mail/opensmtpd-devel/Makefile Fri Apr 27 03:25:17 2018 (r468395) +++ branches/2018Q2/mail/opensmtpd-devel/Makefile Fri Apr 27 03:54:08 2018 (r468396) @@ -4,7 +4,7 @@ PORTNAME= opensmtpd PORTVERSION= 201606220754 DISTVERSIONSUFFIX= p1 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://www.opensmtpd.org/archives/ \ Copied: branches/2018Q2/mail/opensmtpd-devel/files/patch-src_mda.c (from r468319, head/mail/opensmtpd-devel/files/patch-src_mda.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/mail/opensmtpd-devel/files/patch-src_mda.c Fri Apr 27 03:54:08 2018 (r468396, copy of r468319, head/mail/opensmtpd-devel/files/patch-src_mda.c) @@ -0,0 +1,11 @@ +--- smtpd/mda.c.orig 2016-05-13 02:56:04.000000000 +1000 ++++ smtpd/mda.c 2018-04-26 10:28:45.373358000 +1000 +@@ -274,7 +274,7 @@ + * if any + */ + n = iobuf_fqueue(&s->iobuf, +- "Return-Path: %s\n" ++ "Return-Path: <%s>\n" + "Delivered-To: %s\n", + e->sender, + e->rcpt ? e->rcpt : e->dest); Modified: branches/2018Q2/mail/opensmtpd/Makefile ============================================================================== --- branches/2018Q2/mail/opensmtpd/Makefile Fri Apr 27 03:25:17 2018 (r468395) +++ branches/2018Q2/mail/opensmtpd/Makefile Fri Apr 27 03:54:08 2018 (r468396) @@ -4,7 +4,7 @@ PORTNAME= opensmtpd PORTVERSION= 5.9.2p1 PORTEPOCH= 1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= http://www.opensmtpd.org/archives/ \ http://distfiles.pirateparty.in/ashish/ Copied: branches/2018Q2/mail/opensmtpd/files/patch-src_mda.c (from r468319, head/mail/opensmtpd/files/patch-src_mda.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/mail/opensmtpd/files/patch-src_mda.c Fri Apr 27 03:54:08 2018 (r468396, copy of r468319, head/mail/opensmtpd/files/patch-src_mda.c) @@ -0,0 +1,11 @@ +--- smtpd/mda.c.orig 2016-05-13 02:56:04.000000000 +1000 ++++ smtpd/mda.c 2018-04-26 10:28:45.373358000 +1000 +@@ -274,7 +274,7 @@ + * if any + */ + n = iobuf_fqueue(&s->iobuf, +- "Return-Path: %s\n" ++ "Return-Path: <%s>\n" + "Delivered-To: %s\n", + e->sender, + e->rcpt ? e->rcpt : e->dest);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804270354.w3R3s8fn014726>