CVS commit: pkgsrc/mail/qmail-run

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Oct 24 16:28:28 UTC 2018

Modified Files:
        pkgsrc/mail/qmail-run: MESSAGE Makefile PLIST
Added Files:
        pkgsrc/mail/qmail-run/files: ofmipd-with-user-cdb.sh

Log Message:
Add ofmipd-with-user-cdb, a wrapper to let ofmipd users control their
own CDB of address rewriting rules. Ride previous bump.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/qmail-run/MESSAGE
cvs rdiff -u -r1.49 -r1.50 pkgsrc/mail/qmail-run/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/qmail-run/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/qmail-run/files/ofmipd-with-user-cdb.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/MESSAGE
diff -u pkgsrc/mail/qmail-run/MESSAGE:1.8 pkgsrc/mail/qmail-run/MESSAGE:1.9
--- pkgsrc/mail/qmail-run/MESSAGE:1.8   Wed Oct 24 15:46:54 2018
+++ pkgsrc/mail/qmail-run/MESSAGE       Wed Oct 24 16:28:28 2018
@@ -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
 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
 

Index: pkgsrc/mail/qmail-run/Makefile
diff -u pkgsrc/mail/qmail-run/Makefile:1.49 pkgsrc/mail/qmail-run/Makefile:1.50
--- pkgsrc/mail/qmail-run/Makefile:1.49 Wed Oct 24 15:46:54 2018
+++ pkgsrc/mail/qmail-run/Makefile      Wed Oct 24 16:28:28 2018
@@ -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

Index: pkgsrc/mail/qmail-run/PLIST
diff -u pkgsrc/mail/qmail-run/PLIST:1.12 pkgsrc/mail/qmail-run/PLIST:1.13
--- pkgsrc/mail/qmail-run/PLIST:1.12    Wed Oct 24 15:46:54 2018
+++ pkgsrc/mail/qmail-run/PLIST Wed Oct 24 16:28:28 2018
@@ -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

Added files:

Index: pkgsrc/mail/qmail-run/files/ofmipd-with-user-cdb.sh
diff -u /dev/null pkgsrc/mail/qmail-run/files/ofmipd-with-user-cdb.sh:1.1
--- /dev/null   Wed Oct 24 16:28:28 2018
+++ pkgsrc/mail/qmail-run/files/ofmipd-with-user-cdb.sh Wed Oct 24 16:28:28 2018
@@ -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