CVS commit: pkgsrc/mail/qmail-run

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Sep 10 09:07:50 UTC 2018

Modified Files:
        pkgsrc/mail/qmail-run: Makefile PLIST
Added Files:
        pkgsrc/mail/qmail-run/files: qmail-isspam-rspamd.sh
            qmail-isspam-spamassassin.sh

Log Message:
Add scripts to wrap spamc and rspamc, suitable for use in .qmail files
with e.g. condtomaildir(1). Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/mail/qmail-run/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/mail/qmail-run/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/qmail-run/files/qmail-isspam-rspamd.sh \
    pkgsrc/mail/qmail-run/files/qmail-isspam-spamassassin.sh

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.47 pkgsrc/mail/qmail-run/Makefile:1.48
--- pkgsrc/mail/qmail-run/Makefile:1.47 Wed Aug  1 07:15:21 2018
+++ pkgsrc/mail/qmail-run/Makefile      Mon Sep 10 09:07:49 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2018/08/01 07:15:21 schmonz Exp $
+# $NetBSD: Makefile,v 1.48 2018/09/10 09:07:49 schmonz Exp $
 #
 
-DISTNAME=              qmail-run-20180801
+DISTNAME=              qmail-run-20180910
 CATEGORIES=            mail
 MASTER_SITES=          # empty
 DISTFILES=             # empty
@@ -49,18 +49,11 @@ MAKEVARS+=  PKG_SYSCONFDIR.qmail-run
 .endif
 
 SUBST_CLASSES+=                paths
-SUBST_FILES.paths=     mailer.conf qmail-procmail
-SUBST_FILES.paths+=    qmail-qread-client spamdyke-ofmipd.conf
-SUBST_SED.paths+=      -e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=      -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=      -e 's,@ECHO@,${ECHO},g'
-SUBST_SED.paths+=      -e 's,@SORT@,${SORT},g'
-SUBST_SED.paths+=      -e 's,@CAT@,${CAT},g'
-SUBST_SED.paths+=      -e 's,@SH@,${SH},g'
-SUBST_SED.paths+=      -e 's,@SED@,${SED},g'
-SUBST_SED.paths+=      -e 's,@PKGNAME@,${PKGNAME},g'
-SUBST_SED.paths+=      -e 's,@TRUE@,${TRUE},g'
 SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths=     mailer.conf qmail-isspam-* qmail-procmail
+SUBST_FILES.paths+=    qmail-qread-client spamdyke-ofmipd.conf
+SUBST_VARS.paths=      PKGNAME PKG_SYSCONFDIR PREFIX
+SUBST_VARS.paths+=     CAT ECHO GREP SED SH SORT TRUE
 
 .include "options.mk"
 
@@ -68,12 +61,14 @@ post-extract:
        for f in README.pkgsrc mailer.conf spamdyke-ofmipd.conf stunnel.conf; do \
            ${CP} ${FILESDIR}/$$f ${WRKDIR}/$$f;                        \
        done
-       for f in qmail-procmail qmail-qread-client; do \
+       for f in qmail-isspam-rspamd qmail-isspam-spamassassin \
+               qmail-procmail qmail-qread-client; do \
            ${CP} ${FILESDIR}/$$f.sh ${WRKDIR}/$$f;                     \
        done
 
 do-install:
-       for f in qmail-procmail qmail-qread-client; do \
+       for f in qmail-isspam-rspamd qmail-isspam-spamassassin \
+               qmail-procmail qmail-qread-client; do \
            ${INSTALL_SCRIPT} ${WRKDIR}/$$f ${DESTDIR}${PREFIX}/bin;    \
        done
        ${INSTALL_DATA} ${WRKDIR}/README.pkgsrc \

Index: pkgsrc/mail/qmail-run/PLIST
diff -u pkgsrc/mail/qmail-run/PLIST:1.10 pkgsrc/mail/qmail-run/PLIST:1.11
--- pkgsrc/mail/qmail-run/PLIST:1.10    Fri Jul 21 04:08:15 2017
+++ pkgsrc/mail/qmail-run/PLIST Mon Sep 10 09:07:49 2018
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.10 2017/07/21 04:08:15 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.11 2018/09/10 09:07:49 schmonz Exp $
+bin/qmail-isspam-rspamd
+bin/qmail-isspam-spamassassin
 bin/qmail-procmail
 bin/qmail-qread-client
 share/doc/qmail-run/README.pkgsrc

Added files:

Index: pkgsrc/mail/qmail-run/files/qmail-isspam-rspamd.sh
diff -u /dev/null pkgsrc/mail/qmail-run/files/qmail-isspam-rspamd.sh:1.1
--- /dev/null   Mon Sep 10 09:07:50 2018
+++ pkgsrc/mail/qmail-run/files/qmail-isspam-rspamd.sh  Mon Sep 10 09:07:49 2018
@@ -0,0 +1,6 @@
+#!@SH@
+#
+# example usage from .qmail:
+# | condtomaildir ./Maildir/.Spam qmail-isspam-rspamd
+
+@PREFIX@/bin/rspamc --mime | @GREP@ -q '^X-Spam: yes$'
Index: pkgsrc/mail/qmail-run/files/qmail-isspam-spamassassin.sh
diff -u /dev/null pkgsrc/mail/qmail-run/files/qmail-isspam-spamassassin.sh:1.1
--- /dev/null   Mon Sep 10 09:07:50 2018
+++ pkgsrc/mail/qmail-run/files/qmail-isspam-spamassassin.sh    Mon Sep 10 09:07:50 2018
@@ -0,0 +1,6 @@
+#!@SH@
+#
+# example usage from .qmail:
+# | condtomaildir ./Maildir/.Spam qmail-isspam-spamassassin
+
+@PREFIX@/bin/except @PREFIX@/bin/spamc -c