diff options
author | schmonz <schmonz@pkgsrc.org> | 2018-07-29 23:29:17 +0000 |
---|---|---|
committer | schmonz <schmonz@pkgsrc.org> | 2018-07-29 23:29:17 +0000 |
commit | 29c7836953985c3f436892b12080a676b33bb294 (patch) | |
tree | a610b67204259c1c66080c60774014a3b955e36d /mail/qmail-run | |
parent | 076697850a45586a50570d1601b7a898e5c92a7c (diff) | |
download | pkgsrc-29c7836953985c3f436892b12080a676b33bb294.tar.gz |
Detect the checkpassword program of the installed qmail, so we can refer
to it from config files and rc.d scripts. Bump version.
Diffstat (limited to 'mail/qmail-run')
-rw-r--r-- | mail/qmail-run/Makefile | 23 | ||||
-rw-r--r-- | mail/qmail-run/files/qmailpop3d.sh | 4 | ||||
-rw-r--r-- | mail/qmail-run/files/spamdyke-ofmipd.conf | 4 |
3 files changed, 24 insertions, 7 deletions
diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile index 27eb2066e1e..4fd1272dc39 100644 --- a/mail/qmail-run/Makefile +++ b/mail/qmail-run/Makefile @@ -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' diff --git a/mail/qmail-run/files/qmailpop3d.sh b/mail/qmail-run/files/qmailpop3d.sh index cb0f471f552..c11dc49e1e3 100644 --- a/mail/qmail-run/files/qmailpop3d.sh +++ b/mail/qmail-run/files/qmailpop3d.sh @@ -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"} diff --git a/mail/qmail-run/files/spamdyke-ofmipd.conf b/mail/qmail-run/files/spamdyke-ofmipd.conf index fba05132c72..5396429e4cf 100644 --- a/mail/qmail-run/files/spamdyke-ofmipd.conf +++ b/mail/qmail-run/files/spamdyke-ofmipd.conf @@ -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@" |