diff options
author | schmonz <schmonz@pkgsrc.org> | 2018-09-10 09:07:49 +0000 |
---|---|---|
committer | schmonz <schmonz@pkgsrc.org> | 2018-09-10 09:07:49 +0000 |
commit | cb257b27b03a09b5aa449367fbfe04a8321d4ee5 (patch) | |
tree | 025171def5dfdbb6d76e449769d2fc7f8b8045be /mail | |
parent | 4c61ce96bb1aaa8435b433f212c8938310459af2 (diff) | |
download | pkgsrc-cb257b27b03a09b5aa449367fbfe04a8321d4ee5.tar.gz |
Add scripts to wrap spamc and rspamc, suitable for use in .qmail files
with e.g. condtomaildir(1). Bump version.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/qmail-run/Makefile | 25 | ||||
-rw-r--r-- | mail/qmail-run/PLIST | 4 | ||||
-rw-r--r-- | mail/qmail-run/files/qmail-isspam-rspamd.sh | 6 | ||||
-rw-r--r-- | mail/qmail-run/files/qmail-isspam-spamassassin.sh | 6 |
4 files changed, 25 insertions, 16 deletions
diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile index d5339addb7a..c2b890c1f4a 100644 --- a/mail/qmail-run/Makefile +++ b/mail/qmail-run/Makefile @@ -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 \ diff --git a/mail/qmail-run/PLIST b/mail/qmail-run/PLIST index 61467b00083..d30d4c22244 100644 --- a/mail/qmail-run/PLIST +++ b/mail/qmail-run/PLIST @@ -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 diff --git a/mail/qmail-run/files/qmail-isspam-rspamd.sh b/mail/qmail-run/files/qmail-isspam-rspamd.sh new file mode 100644 index 00000000000..1278524b5a9 --- /dev/null +++ b/mail/qmail-run/files/qmail-isspam-rspamd.sh @@ -0,0 +1,6 @@ +#!@SH@ +# +# example usage from .qmail: +# | condtomaildir ./Maildir/.Spam qmail-isspam-rspamd + +@PREFIX@/bin/rspamc --mime | @GREP@ -q '^X-Spam: yes$' diff --git a/mail/qmail-run/files/qmail-isspam-spamassassin.sh b/mail/qmail-run/files/qmail-isspam-spamassassin.sh new file mode 100644 index 00000000000..98ec24c28a5 --- /dev/null +++ b/mail/qmail-run/files/qmail-isspam-spamassassin.sh @@ -0,0 +1,6 @@ +#!@SH@ +# +# example usage from .qmail: +# | condtomaildir ./Maildir/.Spam qmail-isspam-spamassassin + +@PREFIX@/bin/except @PREFIX@/bin/spamc -c |