[pkgsrc/trunk]: pkgsrc/mail/qmail-run On second thought, greylisting isn't a ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/93e2d49aca3b
branches:  trunk
changeset: 387314:93e2d49aca3b
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Wed Nov 14 16:46:58 2018 +0000

description:
On second thought, greylisting isn't a sensible default. Comment it out
in control/smtpplugins. Extract a "Greylisting" stanza in MESSAGE. Merge
"Local non-root users to see the queue" into previous section (and
provide qmail-qread-client in example mailer.conf to begin with).
Mention port numbers where applicable.

Enable defaults that are sensible: realrcptto in control/rcptchecks and
viruscan in control/smtpfilters.

Add fixsmtpio rules to make greylisting-spp's tempfails look more like
qmail's other messages.

Bump dependency on qmail for config-fast-pkgsrc, which is like
config-fast but lets us simulate CONF_FILES-like behavior. As before, we
install these minimal config files, and won't deinstall them. (But the
updated qmail package will.)

Bump version.

diffstat:

 mail/qmail-run/DESCR             |   6 +++---
 mail/qmail-run/INSTALL           |  12 +++++++++---
 mail/qmail-run/MESSAGE           |  31 +++++++++++++++----------------
 mail/qmail-run/Makefile          |  14 +++++++-------
 mail/qmail-run/PLIST             |   4 +++-
 mail/qmail-run/files/fixsmtpio   |   4 ++++
 mail/qmail-run/files/mailer.conf |   4 ++--
 mail/qmail-run/files/rcptchecks  |   1 +
 mail/qmail-run/files/smtpfilters |   1 +
 mail/qmail-run/files/smtpplugins |   2 +-
 10 files changed, 46 insertions(+), 33 deletions(-)

diffs (216 lines):

diff -r 0634f03be802 -r 93e2d49aca3b mail/qmail-run/DESCR
--- a/mail/qmail-run/DESCR      Wed Nov 14 16:44:13 2018 +0000
+++ b/mail/qmail-run/DESCR      Wed Nov 14 16:46:58 2018 +0000
@@ -1,3 +1,3 @@
-This package creates all the needed config files to run qmail, provides
-wrappers for procmail, spamassassin, and rspamd and an example
-mailer.conf, and installs NetBSD-style rc.d scripts.
+This package creates the config files and NetBSD-style rc.d scripts
+needed to run qmail, and provides convenient wrappers for procmail,
+spamassassin, and rspamd.
diff -r 0634f03be802 -r 93e2d49aca3b mail/qmail-run/INSTALL
--- a/mail/qmail-run/INSTALL    Wed Nov 14 16:44:13 2018 +0000
+++ b/mail/qmail-run/INSTALL    Wed Nov 14 16:46:58 2018 +0000
@@ -6,11 +6,17 @@
 case ${STAGE} in
 
 POST-INSTALL)
-       cd ${PREFIX}/share/qmail/setup && ./config-fast `./hostname`
+       cd ${PREFIX}/share/qmail/setup && ./config-fast-pkgsrc `./hostname`
 
-       cd ${PKG_SYSCONFDIR}/control
+       cd ${PKG_SYSCONFDIR}/.pkgsrc-defaults-do-not-edit
        for i in locals rcpthosts; do
-               ${SORT} -u ${i} > ${i}.tmp && mv ${i}.tmp ${i}
+               ${SORT} -u ${i} > ${i}.tmp && ${MV} ${i}.tmp ${i}
+       done
+
+       cd ${PKG_SYSCONFDIR}
+       for i in defaultdomain locals me plusdomain rcpthosts; do
+               [ -f control/${i} ] \
+                       || ${CP} .pkgsrc-defaults-do-not-edit/${i} control
        done
 
        cd ${PKG_SYSCONFDIR}/alias
diff -r 0634f03be802 -r 93e2d49aca3b mail/qmail-run/MESSAGE
--- a/mail/qmail-run/MESSAGE    Wed Nov 14 16:44:13 2018 +0000
+++ b/mail/qmail-run/MESSAGE    Wed Nov 14 16:46:58 2018 +0000
@@ -1,35 +1,34 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.13 2018/11/13 16:34:58 schmonz Exp $
+$NetBSD: MESSAGE,v 1.14 2018/11/14 16:46:58 schmonz Exp $
 
 Please read ${PREFIX}/share/doc/qmail-run/README.pkgsrc.
 
 Assuming NetBSD-style mailwrapper(8) and rc(8), to enable qmail for...
 
-Local and outgoing deliveries:
+Local and outbound delivery:
 - Check configuration in ${PKG_SYSCONFDIR} (especially alias/.qmail-*).
 - Copy ${PREFIX}/share/examples/qmail-run/mailer.conf to /etc/mailer.conf.
-- Set qmailsend=YES in /etc/rc.conf.
+- Set qmailsend=YES and qmailqread=YES in /etc/rc.conf.
 
-Local non-root users to see the queue:
-- Change the mailq entry in /etc/mailer.conf to qmail-qread-client.
-- Set qmailqread=YES in /etc/rc.conf.
-
-Incoming SMTP deliveries:
-- Set qmailsmtpd=YES in /etc/rc.conf.
+Incoming SMTP on port 25:
 - Add any qmail-rcptcheck programs to control/rcptchecks.
 - Add any qmail-qfilter programs to control/smtpfilters.
-- Add any qmail-spp programs to control/smtpplugins.
-- Add any domains exempt from greylisting to control/greylist/exemptrcpthosts.
-- Add any addresses exempt from greylisting to control/greylist/exemptrcpts.
+- Add any qmail-spp programs (such as greylisting) to control/smtpplugins.
+- Set qmailsmtpd=YES in /etc/rc.conf.
 
-Outgoing authentication-only submission:
-- Set qmailofmipd=YES in /etc/rc.conf.
+Greylisting:
+- Add any exempt recipient addresses to control/greylist/exemptrcpts.
+- Add any exempt recipient domains to control/greylist/exemptrcpthosts.
+- Uncomment "greylisting-spp-with-exemptions" in control/smtpplugins.
+
+Authenticated submission on port 587:
 - Add any qmail-qfilter programs to control/ofmipfilters.
+- Set qmailofmipd=YES in /etc/rc.conf.
 
-Fetching Maildirs via POP3:
+POP3 (for Maildirs only) on port 110:
 - Set qmailpop3d=YES in /etc/rc.conf.
 
-TLS for incoming and outgoing SMTP, submission, and POP3:
+TLS encryption everywhere applicable:
 - Create cert and DH params as instructed by the qmail package.
 
 ===========================================================================
diff -r 0634f03be802 -r 93e2d49aca3b mail/qmail-run/Makefile
--- a/mail/qmail-run/Makefile   Wed Nov 14 16:44:13 2018 +0000
+++ b/mail/qmail-run/Makefile   Wed Nov 14 16:46:58 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2018/11/13 16:34:58 schmonz Exp $
+# $NetBSD: Makefile,v 1.58 2018/11/14 16:46:58 schmonz Exp $
 #
 
-DISTNAME=              qmail-run-20181113
+DISTNAME=              qmail-run-20181114
 CATEGORIES=            mail
 MASTER_SITES=          # empty
 DISTFILES=             # empty
@@ -13,7 +13,7 @@
 DEPENDS+=              greetdelay-[0-9]*:../../mail/greetdelay
 DEPENDS+=              greylisting-spp-[0-9]*:../../mail/greylisting-spp
 DEPENDS+=              pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives
-DEPENDS_QMAIL=         qmail>=1.03nb40:../../mail/qmail
+DEPENDS_QMAIL=         qmail>=1.03nb41:../../mail/qmail
 DEPENDS+=              ${DEPENDS_QMAIL}
 DEPENDS+=              qmail-acceptutils>=20181108:../../mail/qmail-acceptutils
 DEPENDS+=              qmail-qfilter>1.5nb1:../../mail/qmail-qfilter
@@ -34,7 +34,7 @@
 RCD_SCRIPTS=           qmail qmailofmipd qmailpop3d qmailqread qmailsend qmailsmtpd
 
 EGDIR=                 share/examples/qmail-run
-.for f in defaultdelivery fixsmtpio signatures \
+.for f in defaultdelivery fixsmtpio signatures rcptchecks smtpfilters \
        pop3capabilities smtpcapabilities smtpplugins \
        concurrencyincoming concurrencypop3 concurrencysubmission
 CONF_FILES+=           ${PREFIX}/${EGDIR}/${f} \
@@ -77,13 +77,13 @@
 SUBST_FILES.paths=     mailer.conf
 SUBST_FILES.paths+=    greylisting-spp-with-exemptions ofmipd-with-user-cdb
 SUBST_FILES.paths+=    qmail-isspam-* qmail-procmail qmail-qread-client
-SUBST_FILES.paths+=    smtpplugins tcp.*
+SUBST_FILES.paths+=    rcptchecks smtpfilters smtpplugins tcp.*
 SUBST_VARS.paths=      PKGNAME PKG_SYSCONFDIR PREFIX
 SUBST_VARS.paths+=     CAT ECHO GREP SED SH SORT TRUE
 
 post-extract:
        for f in README.pkgsrc mailer.conf \
-               defaultdelivery fixsmtpio signatures \
+               defaultdelivery fixsmtpio signatures rcptchecks smtpfilters \
                pop3capabilities smtpcapabilities smtpplugins \
                concurrencyincoming concurrencypop3 concurrencysubmission \
                tcp.ofmip tcp.pop3 tcp.smtp; do \
@@ -103,7 +103,7 @@
        done
        ${INSTALL_DATA} ${WRKDIR}/README.pkgsrc \
                ${DESTDIR}${PREFIX}/share/doc/qmail-run
-       for f in defaultdelivery fixsmtpio signatures \
+       for f in defaultdelivery fixsmtpio signatures rcptchecks smtpfilters \
                pop3capabilities smtpcapabilities smtpplugins \
                concurrencyincoming concurrencypop3 concurrencysubmission \
                tcp.ofmip tcp.pop3 tcp.smtp; do \
diff -r 0634f03be802 -r 93e2d49aca3b mail/qmail-run/PLIST
--- a/mail/qmail-run/PLIST      Wed Nov 14 16:44:13 2018 +0000
+++ b/mail/qmail-run/PLIST      Wed Nov 14 16:46:58 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2018/11/13 16:34:58 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.17 2018/11/14 16:46:58 schmonz Exp $
 bin/greylisting-spp-with-exemptions
 bin/ofmipd-with-user-cdb
 bin/qmail-isspam-rspamd
@@ -16,8 +16,10 @@
 share/examples/qmail-run/greylist-exemptrcpts
 share/examples/qmail-run/mailer.conf
 share/examples/qmail-run/pop3capabilities
+share/examples/qmail-run/rcptchecks
 share/examples/qmail-run/signatures
 share/examples/qmail-run/smtpcapabilities
+share/examples/qmail-run/smtpfilters
 share/examples/qmail-run/smtpplugins
 share/examples/qmail-run/tcp.ofmip
 share/examples/qmail-run/tcp.pop3
diff -r 0634f03be802 -r 93e2d49aca3b mail/qmail-run/files/fixsmtpio
--- a/mail/qmail-run/files/fixsmtpio    Wed Nov 14 16:44:13 2018 +0000
+++ b/mail/qmail-run/files/fixsmtpio    Wed Nov 14 16:46:58 2018 +0000
@@ -13,6 +13,10 @@
 # Replace hostname in QUIT response
 :quit::2*::&fixsmtpio_fixup
 
+# Adjust greylisting-spp messages to look more qmail-ish
+:rcpt::451 GL - temporary*::451 greylisted, retry later (#4.7.1)
+:data::451 GL - temporary*::451 greylisted, retry later (#4.7.1)
+
 ########################################################################
 
 ### For users authenticated via authup(8):
diff -r 0634f03be802 -r 93e2d49aca3b mail/qmail-run/files/mailer.conf
--- a/mail/qmail-run/files/mailer.conf  Wed Nov 14 16:44:13 2018 +0000
+++ b/mail/qmail-run/files/mailer.conf  Wed Nov 14 16:46:58 2018 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: mailer.conf,v 1.5 2015/11/25 12:51:30 jperkin Exp $
+#      $NetBSD: mailer.conf,v 1.6 2018/11/14 16:46:59 schmonz Exp $
 #
 # Use qmail as the system mailer.
 #
 sendmail       @PREFIX@/bin/sendmail
 send-mail      @PREFIX@/bin/sendmail
-mailq          @PREFIX@/bin/qmail-qread
+mailq          @PREFIX@/bin/qmail-qread-client
 newaliases     @PREFIX@/bin/newaliases
 hoststat       @PREFIX@/bin/qmail-tcpto
 purgestat      @PREFIX@/bin/qmail-tcpok
diff -r 0634f03be802 -r 93e2d49aca3b mail/qmail-run/files/rcptchecks
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/qmail-run/files/rcptchecks   Wed Nov 14 16:46:58 2018 +0000
@@ -0,0 +1,1 @@
+@PREFIX@/bin/qmail-rcptcheck-realrcptto
diff -r 0634f03be802 -r 93e2d49aca3b mail/qmail-run/files/smtpfilters
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/qmail-run/files/smtpfilters  Wed Nov 14 16:46:58 2018 +0000
@@ -0,0 +1,1 @@
+@PREFIX@/bin/qmail-qfilter-viruscan
diff -r 0634f03be802 -r 93e2d49aca3b mail/qmail-run/files/smtpplugins
--- a/mail/qmail-run/files/smtpplugins  Wed Nov 14 16:44:13 2018 +0000
+++ b/mail/qmail-run/files/smtpplugins  Wed Nov 14 16:46:58 2018 +0000
@@ -12,7 +12,7 @@
 # plugins to execute on RCPT command
 [rcpt]
 @PREFIX@/bin/qmail-rcptcheck
-@PREFIX@/bin/greylisting-spp-with-exemptions
+#@PREFIX@/bin/greylisting-spp-with-exemptions
 
 # plugins to execute on DATA command
 [data]