[pkgsrc/trunk]: pkgsrc/mail/qmail Honor custom values of ${QMAIL_DAEMON_USER}...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e883975c3845
branches:  trunk
changeset: 361882:e883975c3845
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Thu Apr 27 20:35:10 2017 +0000

description:
Honor custom values of ${QMAIL_DAEMON_USER} and ${QMAIL_QMAIL_GROUP}.

diffstat:

 mail/qmail/INSTALL  |  6 ++++--
 mail/qmail/Makefile |  4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (44 lines):

diff -r 148fb731302a -r e883975c3845 mail/qmail/INSTALL
--- a/mail/qmail/INSTALL        Thu Apr 27 20:27:36 2017 +0000
+++ b/mail/qmail/INSTALL        Thu Apr 27 20:35:10 2017 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: INSTALL,v 1.7 2017/03/20 16:23:19 schmonz Exp $
+# $NetBSD: INSTALL,v 1.8 2017/04/27 20:35:10 schmonz Exp $
 
 DOCDIR=@DOCDIR@
 EGDIR=@EGDIR@
 OPENSSL=@OPENSSL@
 PKGMANDIR=@PKGMANDIR@
 QMAILDIR=@QMAILDIR@
+QMAIL_DAEMON_USER=@QMAIL_DAEMON_USER@
+QMAIL_QMAIL_GROUP=@QMAIL_QMAIL_GROUP@
 QMAIL_QUEUE_DIR=@QMAIL_QUEUE_DIR@
 QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@
 
@@ -78,7 +80,7 @@
 
 # ${OPENSSL} req -new -x509 -nodes -days 366 -out ${SERVERCERT} -keyout ${SERVERCERT}
 # chmod 640 ${SERVERCERT}
-# chown qmaild:qmail ${SERVERCERT}
+# chown ${QMAIL_DAEMON_USER}:${QMAIL_QMAIL_GROUP} ${SERVERCERT}
 # ln -s ${SERVERCERT} ${PKG_SYSCONFDIR}/control/clientcert.pem
 # update_tmprsadh
 
diff -r 148fb731302a -r e883975c3845 mail/qmail/Makefile
--- a/mail/qmail/Makefile       Thu Apr 27 20:27:36 2017 +0000
+++ b/mail/qmail/Makefile       Thu Apr 27 20:35:10 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2017/04/08 18:22:51 schmonz Exp $
+# $NetBSD: Makefile,v 1.85 2017/04/27 20:35:10 schmonz Exp $
 #
 
 DISTNAME=              ${PKGNAME_NOREV}
@@ -57,6 +57,8 @@
 FILES_SUBST+=          OPENSSL=${OPENSSL:Q}
 FILES_SUBST+=          PKGMANDIR=${PKGMANDIR:Q} SHAREDIR=${SHAREDIR:Q}
 FILES_SUBST+=          QMAILDIR=${QMAILDIR:Q}
+FILES_SUBST+=          QMAIL_DAEMON_USER=${QMAIL_DAEMON_USER:Q}
+FILES_SUBST+=          QMAIL_QMAIL_GROUP=${QMAIL_QMAIL_GROUP:Q}
 FILES_SUBST+=          QMAIL_QUEUE_DIR=${QMAIL_QUEUE_DIR:Q}
 FILES_SUBST+=          QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q}
 FILES_SUBST+=          PKGNAME=${PKGNAME:Q}