CVS commit: pkgsrc/mail/qmail-run

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Nov 10 15:31:18 UTC 2018

Modified Files:
        pkgsrc/mail/qmail-run: Makefile PLIST
        pkgsrc/mail/qmail-run/files: tcp.smtp
Added Files:
        pkgsrc/mail/qmail-run/files: smtpplugins

Log Message:
Bump dependency on qmail for SPP support and on rejectutils for an
SPP-compatible qmail-rcptcheck. Create control/smtpplugins so that the
RCPTCHECK-compatible programs continue to run as before. No functional
change intended.

Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/mail/qmail-run/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/mail/qmail-run/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/qmail-run/files/smtpplugins
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/qmail-run/files/tcp.smtp

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.55 pkgsrc/mail/qmail-run/Makefile:1.56
--- pkgsrc/mail/qmail-run/Makefile:1.55 Thu Nov  8 20:57:28 2018
+++ pkgsrc/mail/qmail-run/Makefile      Sat Nov 10 15:31:18 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2018/11/08 20:57:28 schmonz Exp $
+# $NetBSD: Makefile,v 1.56 2018/11/10 15:31:18 schmonz Exp $
 #
 
-DISTNAME=              qmail-run-20181108
+DISTNAME=              qmail-run-20181110
 CATEGORIES=            mail
 MASTER_SITES=          # empty
 DISTFILES=             # empty
@@ -12,11 +12,11 @@ LICENSE=            2-clause-bsd
 
 DEPENDS+=              greetdelay-[0-9]*:../../mail/greetdelay
 DEPENDS+=              pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives
-DEPENDS_QMAIL=         qmail>=1.03nb36:../../mail/qmail
+DEPENDS_QMAIL=         qmail>=1.03nb40:../../mail/qmail
 DEPENDS+=              ${DEPENDS_QMAIL}
 DEPENDS+=              qmail-acceptutils>=20181108:../../mail/qmail-acceptutils
 DEPENDS+=              qmail-qfilter>1.5nb1:../../mail/qmail-qfilter
-DEPENDS+=              qmail-rejectutils-[0-9]*:../../mail/qmail-rejectutils
+DEPENDS+=              qmail-rejectutils>=20181110:../../mail/qmail-rejectutils
 
 WRKSRC=                        ${WRKDIR}
 NO_BUILD=              yes
@@ -33,7 +33,7 @@ MESSAGE_SUBST+=               PKG_SYSCONFBASE=${PKG_S
 RCD_SCRIPTS=           qmail qmailofmipd qmailpop3d qmailqread qmailsend qmailsmtpd
 
 .for f in defaultdelivery fixsmtpio signatures \
-       pop3capabilities smtpcapabilities \
+       pop3capabilities smtpcapabilities smtpplugins \
        concurrencyincoming concurrencypop3 concurrencysubmission
 CONF_FILES+=           ${PREFIX}/share/examples/qmail-run/${f} \
                        ${PKG_SYSCONFDIR}/control/${f}
@@ -68,14 +68,14 @@ SUBST_STAGE.paths=  pre-configure
 SUBST_FILES.paths=     mailer.conf
 SUBST_FILES.paths+=    ofmipd-with-user-cdb
 SUBST_FILES.paths+=    qmail-isspam-* qmail-procmail qmail-qread-client
-SUBST_FILES.paths+=    tcp.*
+SUBST_FILES.paths+=    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 \
-               pop3capabilities smtpcapabilities \
+               pop3capabilities smtpcapabilities smtpplugins \
                concurrencyincoming concurrencypop3 concurrencysubmission \
                tcp.ofmip tcp.pop3 tcp.smtp; do \
                ${CP} ${FILESDIR}/$$f ${WRKDIR}/$$f; \
@@ -95,7 +95,7 @@ do-install:
        ${INSTALL_DATA} ${WRKDIR}/README.pkgsrc \
                ${DESTDIR}${PREFIX}/share/doc/qmail-run
        for f in defaultdelivery fixsmtpio signatures \
-               pop3capabilities smtpcapabilities \
+               pop3capabilities smtpcapabilities smtpplugins \
                concurrencyincoming concurrencypop3 concurrencysubmission \
                tcp.ofmip tcp.pop3 tcp.smtp; do \
                ${INSTALL_DATA} ${WRKDIR}/$${f} \

Index: pkgsrc/mail/qmail-run/PLIST
diff -u pkgsrc/mail/qmail-run/PLIST:1.14 pkgsrc/mail/qmail-run/PLIST:1.15
--- pkgsrc/mail/qmail-run/PLIST:1.14    Sat Oct 27 19:16:16 2018
+++ pkgsrc/mail/qmail-run/PLIST Sat Nov 10 15:31:18 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2018/10/27 19:16:16 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.15 2018/11/10 15:31:18 schmonz Exp $
 bin/ofmipd-with-user-cdb
 bin/qmail-isspam-rspamd
 bin/qmail-isspam-spamassassin
@@ -14,6 +14,7 @@ share/examples/qmail-run/mailer.conf
 share/examples/qmail-run/pop3capabilities
 share/examples/qmail-run/signatures
 share/examples/qmail-run/smtpcapabilities
+share/examples/qmail-run/smtpplugins
 share/examples/qmail-run/tcp.ofmip
 share/examples/qmail-run/tcp.pop3
 share/examples/qmail-run/tcp.smtp

Index: pkgsrc/mail/qmail-run/files/tcp.smtp
diff -u pkgsrc/mail/qmail-run/files/tcp.smtp:1.2 pkgsrc/mail/qmail-run/files/tcp.smtp:1.3
--- pkgsrc/mail/qmail-run/files/tcp.smtp:1.2    Thu Nov  8 20:57:28 2018
+++ pkgsrc/mail/qmail-run/files/tcp.smtp        Sat Nov 10 15:31:18 2018
@@ -1,2 +1,2 @@
 127.:allow,RELAYCLIENT=""
-:allow,UCSPITLS="",GREETDELAY="2",QMAILQUEUE="@PREFIX@/bin/qmail-qfilter-smtpd-queue",RCPTCHECK="@PREFIX@/bin/qmail-rcptcheck"
+:allow,UCSPITLS="",GREETDELAY="2",QMAILQUEUE="@PREFIX@/bin/qmail-qfilter-smtpd-queue"

Added files:

Index: pkgsrc/mail/qmail-run/files/smtpplugins
diff -u /dev/null pkgsrc/mail/qmail-run/files/smtpplugins:1.1
--- /dev/null   Sat Nov 10 15:31:18 2018
+++ pkgsrc/mail/qmail-run/files/smtpplugins     Sat Nov 10 15:31:18 2018
@@ -0,0 +1,17 @@
+# qmail-spp configuration file
+
+# plugins to execute on client's connection
+[connection]
+
+# plugins to execute on HELO/EHLO commands
+[helo]
+
+# plugins to execute on MAIL command
+[mail]
+
+# plugins to execute on RCPT command
+[rcpt]
+@PREFIX@/bin/qmail-rcptcheck
+
+# plugins to execute on DATA command
+[data]