CVS commit: pkgsrc/mail/qmail-run

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Jul 29 23:29:18 UTC 2018

Modified Files:
        pkgsrc/mail/qmail-run: Makefile
        pkgsrc/mail/qmail-run/files: qmailpop3d.sh spamdyke-ofmipd.conf

Log Message:
Detect the checkpassword program of the installed qmail, so we can refer
to it from config files and rc.d scripts. Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/mail/qmail-run/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/mail/qmail-run/files/qmailpop3d.sh
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/qmail-run/files/spamdyke-ofmipd.conf

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.45 pkgsrc/mail/qmail-run/Makefile:1.46
--- pkgsrc/mail/qmail-run/Makefile:1.45 Wed Jul  4 13:40:24 2018
+++ pkgsrc/mail/qmail-run/Makefile      Sun Jul 29 23:29:17 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2018/07/04 13:40:24 jperkin Exp $
+# $NetBSD: Makefile,v 1.46 2018/07/29 23:29:17 schmonz Exp $
 #
 
-DISTNAME=              qmail-run-20170805
-PKGREVISION=           1
+DISTNAME=              qmail-run-20180730
 CATEGORIES=            mail
 MASTER_SITES=          # empty
 DISTFILES=             # empty
@@ -20,6 +19,7 @@ WRKSRC=                       ${WRKDIR}
 NO_BUILD=              yes
 NO_CHECKSUM=           yes
 
+FILES_SUBST+=          CHECKPASSWORD_RELPATH=${CHECKPASSWORD_RELPATH:Q}
 FILES_SUBST+=          QMAIL_DAEMON_USER=${QMAIL_DAEMON_USER:Q}
 FILES_SUBST+=          QMAIL_LOG_USER=${QMAIL_LOG_USER:Q}
 FILES_SUBST+=          QMAIL_SEND_USER=${QMAIL_SEND_USER:Q}
@@ -47,11 +47,28 @@ MAKEVARS+=  PKG_SYSCONFDIR.qmail-run
 .  endif
 .endif
 
+# Detect the checkpassword program of the installed qmail, so we can
+# refer to it from config files and rc.d scripts.
+#
+CHECKPASSWORD_DEP!=                                                    \
+       ${PKG_INFO} -qn ${DEPENDS_QMAIL:C/:.*$//:Q} | grep checkpassword
+CHECKPASSWORD_ABSPATH!=                                                        \
+       ${PKG_INFO} -qL ${CHECKPASSWORD_DEP} | grep bin
+CHECKPASSWORD_ABSDIR!=                                                 \
+       dirname ${CHECKPASSWORD_ABSPATH}
+CHECKPASSWORD_RELDIR!=                                                 \
+       basename ${CHECKPASSWORD_ABSDIR}
+CHECKPASSWORD_RELBIN!=                                                 \
+       basename ${CHECKPASSWORD_ABSPATH}
+CHECKPASSWORD_RELPATH=${CHECKPASSWORD_RELDIR}/${CHECKPASSWORD_RELBIN}
+MAKEVARS+=     CHECKPASSWORD_RELPATH
+
 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,@CHECKPASSWORD_RELPATH@,${CHECKPASSWORD_RELPATH},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'

Index: pkgsrc/mail/qmail-run/files/qmailpop3d.sh
diff -u pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.17 pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.18
--- pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.17      Sat Aug  5 15:21:03 2017
+++ pkgsrc/mail/qmail-run/files/qmailpop3d.sh   Sun Jul 29 23:29:17 2018
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmailpop3d.sh,v 1.17 2017/08/05 15:21:03 schmonz Exp $
+# $NetBSD: qmailpop3d.sh,v 1.18 2018/07/29 23:29:17 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs).
 #
@@ -19,7 +19,7 @@ name="qmailpop3d"
 : ${qmailpop3d_tcpserver:="@PREFIX@/bin/tcpserver"}
 : ${qmailpop3d_prepop3d:=""}
 : ${qmailpop3d_pop3dcmd:="@PREFIX@/bin/qmail-pop3d"}
-: ${qmailpop3d_checkpassword:="@PREFIX@/bin/checkpassword"}
+: ${qmailpop3d_checkpassword:="@PREFIX@/@CHECKPASSWORD_RELPATH@"}
 : ${qmailpop3d_maildirname:="Maildir"}
 : ${qmailpop3d_log:="YES"}
 : ${qmailpop3d_logcmd:="logger -t nb${name} -p mail.info"}

Index: pkgsrc/mail/qmail-run/files/spamdyke-ofmipd.conf
diff -u pkgsrc/mail/qmail-run/files/spamdyke-ofmipd.conf:1.1 pkgsrc/mail/qmail-run/files/spamdyke-ofmipd.conf:1.2
--- pkgsrc/mail/qmail-run/files/spamdyke-ofmipd.conf:1.1        Mon Jan  9 04:58:09 2017
+++ pkgsrc/mail/qmail-run/files/spamdyke-ofmipd.conf    Sun Jul 29 23:29:17 2018
@@ -1,8 +1,8 @@
-# $NetBSD: spamdyke-ofmipd.conf,v 1.1 2017/01/09 04:58:09 schmonz Exp $
+# $NetBSD: spamdyke-ofmipd.conf,v 1.2 2018/07/29 23:29:17 schmonz Exp $
 #
 # Wrap qmail-ofmipd with SMTP AUTH.
 #
 hostname-file=@PKG_SYSCONFDIR@/control/me
 qmail-rcpthosts-file=@PKG_SYSCONFDIR@/control/rcpthosts
 smtp-auth-level=always
-smtp-auth-command="@PREFIX@/bin/checkpassword @TRUE@"
+smtp-auth-command="@PREFIX@/@CHECKPASSWORD_RELPATH@ @TRUE@"