CVS commit: pkgsrc/mail/qmail-run

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Nov 24 16:38:14 UTC 2018

Modified Files:
        pkgsrc/mail/qmail-run: Makefile
        pkgsrc/mail/qmail-run/files: fixsmtpio

Log Message:
Bump dependency on qmail-acceptutils for new STARTTLS behavior, and
provide the necessary configuration entry.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/mail/qmail-run/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/qmail-run/files/fixsmtpio

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-run/Makefile
diff -u pkgsrc/mail/qmail-run/Makefile:1.58 pkgsrc/mail/qmail-run/Makefile:1.59
--- pkgsrc/mail/qmail-run/Makefile:1.58 Wed Nov 14 16:46:58 2018
+++ pkgsrc/mail/qmail-run/Makefile      Sat Nov 24 16:38:14 2018
@@ -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]*:../../
 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
 

Index: pkgsrc/mail/qmail-run/files/fixsmtpio
diff -u pkgsrc/mail/qmail-run/files/fixsmtpio:1.3 pkgsrc/mail/qmail-run/files/fixsmtpio:1.4
--- pkgsrc/mail/qmail-run/files/fixsmtpio:1.3   Wed Nov 14 16:46:59 2018
+++ pkgsrc/mail/qmail-run/files/fixsmtpio       Sat Nov 24 16:38:14 2018
@@ -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