summaryrefslogtreecommitdiff
path: root/mail/qmail-run
diff options
context:
space:
mode:
authorschmonz <schmonz@pkgsrc.org>2018-11-24 16:38:14 +0000
committerschmonz <schmonz@pkgsrc.org>2018-11-24 16:38:14 +0000
commitae3912cf4a46a82f1ea19736a05a3d5f182e90d5 (patch)
tree769a627cb88add9880042e4a83d8f9431d3b9f37 /mail/qmail-run
parent858dc16250c819850d95174403d9637538e54043 (diff)
downloadpkgsrc-ae3912cf4a46a82f1ea19736a05a3d5f182e90d5.tar.gz
Bump dependency on qmail-acceptutils for new STARTTLS behavior, and
provide the necessary configuration entry.
Diffstat (limited to 'mail/qmail-run')
-rw-r--r--mail/qmail-run/Makefile6
-rw-r--r--mail/qmail-run/files/fixsmtpio5
2 files changed, 7 insertions, 4 deletions
diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile
index 1c86933cdc6..3a5c8f723f1 100644
--- a/mail/qmail-run/Makefile
+++ b/mail/qmail-run/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2018/11/14 16:46:58 schmonz Exp $
+# $NetBSD: Makefile,v 1.59 2018/11/24 16:38:14 schmonz Exp $
#
-DISTNAME= qmail-run-20181114
+DISTNAME= qmail-run-20181124
CATEGORIES= mail
MASTER_SITES= # empty
DISTFILES= # empty
@@ -15,7 +15,7 @@ DEPENDS+= greylisting-spp-[0-9]*:../../mail/greylisting-spp
DEPENDS+= pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives
DEPENDS_QMAIL= qmail>=1.03nb41:../../mail/qmail
DEPENDS+= ${DEPENDS_QMAIL}
-DEPENDS+= qmail-acceptutils>=20181108:../../mail/qmail-acceptutils
+DEPENDS+= qmail-acceptutils>=20181124:../../mail/qmail-acceptutils
DEPENDS+= qmail-qfilter>1.5nb1:../../mail/qmail-qfilter
DEPENDS+= qmail-rejectutils>=20181110:../../mail/qmail-rejectutils
diff --git a/mail/qmail-run/files/fixsmtpio b/mail/qmail-run/files/fixsmtpio
index e66c8b332ba..27da5df5fd0 100644
--- a/mail/qmail-run/files/fixsmtpio
+++ b/mail/qmail-run/files/fixsmtpio
@@ -17,11 +17,14 @@
:rcpt::451 GL - temporary*::451 greylisted, retry later (#4.7.1)
:data::451 GL - temporary*::451 greylisted, retry later (#4.7.1)
+# Remove greeting for child process restarted after upgrading to STARTTLS
+SSL_CIPHER:greeting::2*::
+
########################################################################
### For users authenticated via authup(8):
-# SMTP conversation already in progress, replace greeting
+# Replace greeting for child process started after authenticating
AUTHUP_USER:greeting::2*::235 ok, go ahead (#2.0.0)
# If client closes connection, tell authup the session succeeded