diff options
author | schmonz <schmonz@pkgsrc.org> | 2018-10-24 16:28:28 +0000 |
---|---|---|
committer | schmonz <schmonz@pkgsrc.org> | 2018-10-24 16:28:28 +0000 |
commit | 1af59bdb44b9c4ecac3d97570087beec8ea704ae (patch) | |
tree | a444dcbbd2c923a2fa280a7709393f57143c93a0 /mail | |
parent | 47f51775354346ddd8af3cb90568188b81664a33 (diff) | |
download | pkgsrc-1af59bdb44b9c4ecac3d97570087beec8ea704ae.tar.gz |
Add ofmipd-with-user-cdb, a wrapper to let ofmipd users control their
own CDB of address rewriting rules. Ride previous bump.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/qmail-run/MESSAGE | 5 | ||||
-rw-r--r-- | mail/qmail-run/Makefile | 9 | ||||
-rw-r--r-- | mail/qmail-run/PLIST | 3 | ||||
-rw-r--r-- | mail/qmail-run/files/ofmipd-with-user-cdb.sh | 16 |
4 files changed, 28 insertions, 5 deletions
diff --git a/mail/qmail-run/MESSAGE b/mail/qmail-run/MESSAGE index 76b71b43e9b..da73fa3a7f8 100644 --- a/mail/qmail-run/MESSAGE +++ b/mail/qmail-run/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.8 2018/10/24 15:46:54 schmonz Exp $ +$NetBSD: MESSAGE,v 1.9 2018/10/24 16:28:28 schmonz Exp $ Please read ${PREFIX}/share/doc/qmail-run/README.pkgsrc. @@ -28,6 +28,9 @@ Outgoing submissions with SMTP AUTH over TLS: Filtering outgoing submissions: - List qmail-qfilter programs in ${PKG_SYSCONFDIR}/control/ofmipfilters +User-controlled ofmipd address rewriting: +- Set qmailofmipd_ofmipdcmd=${PREFIX}/bin/ofmipd-with-user-cdb in /etc/rc.conf + Fetching Maildirs via POP3: - Set qmailpop3d=YES in /etc/rc.conf diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile index 523405d4533..f4feb393b0a 100644 --- a/mail/qmail-run/Makefile +++ b/mail/qmail-run/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2018/10/24 15:46:54 schmonz Exp $ +# $NetBSD: Makefile,v 1.50 2018/10/24 16:28:28 schmonz Exp $ # DISTNAME= qmail-run-20181024 @@ -61,6 +61,7 @@ MAKEVARS+= PKG_SYSCONFDIR.qmail-run SUBST_CLASSES+= paths 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_VARS.paths= PKGNAME PKG_SYSCONFDIR PREFIX @@ -73,13 +74,15 @@ post-extract: tcp.ofmip tcp.pop3 tcp.smtp; do \ ${CP} ${FILESDIR}/$$f ${WRKDIR}/$$f; \ done; \ - for f in qmail-isspam-rspamd qmail-isspam-spamassassin \ + for f in ofmipd-with-user-cdb \ + 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-isspam-rspamd qmail-isspam-spamassassin \ + for f in ofmipd-with-user-cdb \ + qmail-isspam-rspamd qmail-isspam-spamassassin \ qmail-procmail qmail-qread-client; do \ ${INSTALL_SCRIPT} ${WRKDIR}/$$f ${DESTDIR}${PREFIX}/bin; \ done diff --git a/mail/qmail-run/PLIST b/mail/qmail-run/PLIST index 909acd3821e..9fcc9b2f021 100644 --- a/mail/qmail-run/PLIST +++ b/mail/qmail-run/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.12 2018/10/24 15:46:54 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.13 2018/10/24 16:28:28 schmonz Exp $ +bin/ofmipd-with-user-cdb bin/qmail-isspam-rspamd bin/qmail-isspam-spamassassin bin/qmail-procmail diff --git a/mail/qmail-run/files/ofmipd-with-user-cdb.sh b/mail/qmail-run/files/ofmipd-with-user-cdb.sh new file mode 100644 index 00000000000..dd37872b3a5 --- /dev/null +++ b/mail/qmail-run/files/ofmipd-with-user-cdb.sh @@ -0,0 +1,16 @@ +#!@SH@ +# +# $NetBSD: ofmipd-with-user-cdb.sh,v 1.1 2018/10/24 16:28:28 schmonz Exp $ +# +# @PKGNAME@ wrapper to let ofmipd users control their own CDB +# of address rewriting rules. +# Requires qmail-acceptutils. +# + +user_cdb="$HOME/.ofmipd/rules.cdb" + +if [ -f "${user_cdb}" ]; then + exec @PREFIX@/bin/ofmipd "${user_cdb}" "$@" +else + exec @PREFIX@/bin/ofmipd "$@" +fi |