diff options
| author | schmonz <schmonz@pkgsrc.org> | 2017-08-01 02:53:59 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2017-08-01 02:53:59 +0000 |
| commit | cca4855e16cc2aa9aa15587ef566ef84e5fa390d (patch) | |
| tree | 4b2cc6d0aca8b82d22d6cb454c1b78fe94e96c2d /mail/qmail | |
| parent | 7db23550968b186fc9c168e3e709b66bf38cb586 (diff) | |
| download | pkgsrc-cca4855e16cc2aa9aa15587ef566ef84e5fa390d.tar.gz | |
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 (limited to 'mail/qmail')
| -rw-r--r-- | mail/qmail/Makefile | 4 | ||||
| -rw-r--r-- | mail/qmail/options.mk | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 52acdb015a9..a400b9fafbe 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -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 --git a/mail/qmail/options.mk b/mail/qmail/options.mk index 69947429a2a..633b41f096b 100644 --- a/mail/qmail/options.mk +++ b/mail/qmail/options.mk @@ -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 |