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.

10 files changed, 46 insertions, 33 deletions

diff --git a/mail/qmail-run/DESCR b/mail/qmail-run/DESCR
index 939406ed3e7..f640885be1c 100644
--- a/mail/qmail-run/DESCR
+++ b/mail/qmail-run/DESCR
@@ -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 --git a/mail/qmail-run/INSTALL b/mail/qmail-run/INSTALL
index c933e81ef6c..a15a6937df7 100644
--- a/mail/qmail-run/INSTALL
+++ b/mail/qmail-run/INSTALL
@@ -6,11 +6,17 @@ psmsg='#
 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 --git a/mail/qmail-run/MESSAGE b/mail/qmail-run/MESSAGE
index 167dbed44d5..5d20f2284f7 100644
--- a/mail/qmail-run/MESSAGE
+++ b/mail/qmail-run/MESSAGE
@@ -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 --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile
index e1b8ff354e3..1c86933cdc6 100644
--- a/mail/qmail-run/Makefile
+++ b/mail/qmail-run/Makefile
@@ -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 @@ LICENSE=		2-clause-bsd
 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 @@ MESSAGE_SUBST+=		PKG_SYSCONFBASE=${PKG_SYSCONFBASE:Q}
 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_STAGE.paths=	pre-configure
 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 @@ do-install:
 	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 --git a/mail/qmail-run/PLIST b/mail/qmail-run/PLIST
index 100e5222682..fe5761e93a0 100644
--- a/mail/qmail-run/PLIST
+++ b/mail/qmail-run/PLIST
@@ -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-exemptrcpthosts
 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 --git a/mail/qmail-run/files/fixsmtpio b/mail/qmail-run/files/fixsmtpio
index 7db027bf856..e66c8b332ba 100644
--- a/mail/qmail-run/files/fixsmtpio
+++ b/mail/qmail-run/files/fixsmtpio
@@ -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 --git a/mail/qmail-run/files/mailer.conf b/mail/qmail-run/files/mailer.conf
index e9276c79ef4..9b38b69cd09 100644
--- a/mail/qmail-run/files/mailer.conf
+++ b/mail/qmail-run/files/mailer.conf
@@ -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 --git a/mail/qmail-run/files/rcptchecks b/mail/qmail-run/files/rcptchecks
new file mode 100644
index 00000000000..19b21cc8816
--- /dev/null
+++ b/mail/qmail-run/files/rcptchecks
@@ -0,0 +1 @@
+@PREFIX@/bin/qmail-rcptcheck-realrcptto
diff --git a/mail/qmail-run/files/smtpfilters b/mail/qmail-run/files/smtpfilters
new file mode 100644
index 00000000000..8354769a1e3
--- /dev/null
+++ b/mail/qmail-run/files/smtpfilters
@@ -0,0 +1 @@
+@PREFIX@/bin/qmail-qfilter-viruscan
diff --git a/mail/qmail-run/files/smtpplugins b/mail/qmail-run/files/smtpplugins
index 80204461dab..07ca0c318b7 100644
--- a/mail/qmail-run/files/smtpplugins
+++ b/mail/qmail-run/files/smtpplugins
@@ -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]