CVS commit: pkgsrc/mail/qmail

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Aug  1 02:53:59 UTC 2017

Modified Files:
        pkgsrc/mail/qmail: Makefile options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/mail/qmail/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/mail/qmail/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/qmail/Makefile
diff -u pkgsrc/mail/qmail/Makefile:1.89 pkgsrc/mail/qmail/Makefile:1.90
--- pkgsrc/mail/qmail/Makefile:1.89     Thu Jul 27 04:58:31 2017
+++ pkgsrc/mail/qmail/Makefile  Tue Aug  1 02:53:59 2017
@@ -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/
 

Index: pkgsrc/mail/qmail/options.mk
diff -u pkgsrc/mail/qmail/options.mk:1.43 pkgsrc/mail/qmail/options.mk:1.44
--- pkgsrc/mail/qmail/options.mk:1.43   Thu Jul 27 02:18:05 2017
+++ pkgsrc/mail/qmail/options.mk        Tue Aug  1 02:53:59 2017
@@ -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 @@ QMAILPATCHES+=                        eai:${EAI_PATCH}
 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