[pkgsrc/trunk]: pkgsrc/mail/qmail With the enabled-by-default "eai" option, o...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f3bb47be271f
branches:  trunk
changeset: 365997:f3bb47be271f
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Tue Aug 01 02:53:59 2017 +0000

description:
With the enabled-by-default "eai" option, outbound message headers were
being terminated with bare LFs, getting tempfailed by some SMTP servers
(such as qmail!), and getting stuck in the local queue. Tweak the EAI
patch to terminate header lines with CRLF, as unpatched qmail-remote
would have done. Submitted upstream. Bump PKGREVISION.

diffstat:

 mail/qmail/Makefile   |  4 ++--
 mail/qmail/options.mk |  4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 15cbaa39ebe1 -r f3bb47be271f mail/qmail/Makefile
--- a/mail/qmail/Makefile       Mon Jul 31 21:09:27 2017 +0000
+++ b/mail/qmail/Makefile       Tue Aug 01 02:53:59 2017 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.89 2017/07/27 04:58:31 schmonz Exp $
+# $NetBSD: Makefile,v 1.90 2017/08/01 02:53:59 schmonz Exp $
 #
 
 DISTNAME=              netqmail-1.06
 PKGNAME=               qmail-1.03
-PKGREVISION=           29
+PKGREVISION=           30
 CATEGORIES=            mail
 MASTER_SITES=          http://qmail.org/
 
diff -r 15cbaa39ebe1 -r f3bb47be271f mail/qmail/options.mk
--- a/mail/qmail/options.mk     Mon Jul 31 21:09:27 2017 +0000
+++ b/mail/qmail/options.mk     Tue Aug 01 02:53:59 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.43 2017/07/27 02:18:05 schmonz Exp $
+# $NetBSD: options.mk,v 1.44 2017/08/01 02:53:59 schmonz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.qmail
 PKG_SUPPORTED_OPTIONS+=                eai qmail-rejectutils qmail-srs sasl syncdir tls
@@ -76,6 +76,8 @@
 EAI_PATCH=                     qmail-smtputf8.patch
 PATCHFILES+=                   ${EAI_PATCH}
 SITES.${EAI_PATCH}=            http://arnt.gulbrandsen.priv.no/qmail/
+PATCH_DIST_CAT.${EAI_PATCH}=   ${SED} \
+       -e 's|\(if (!stralloc_append(&firstpart,&ch)) temp_nomem();\)|if (ch == '"'\\\n'"' \&\& \!stralloc_append(\&firstpart,"\\r")) temp_nomem(); \1|' < ${EAI_PATCH}
 PATCH_DIST_STRIP.${EAI_PATCH}= -p1
 .endif