CVS commit: pkgsrc/mail/qmail

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Apr 27 20:35:11 UTC 2017

Modified Files:
        pkgsrc/mail/qmail: INSTALL Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/qmail/INSTALL
cvs rdiff -u -r1.84 -r1.85 pkgsrc/mail/qmail/Makefile

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/INSTALL
diff -u pkgsrc/mail/qmail/INSTALL:1.7 pkgsrc/mail/qmail/INSTALL:1.8
--- pkgsrc/mail/qmail/INSTALL:1.7       Mon Mar 20 16:23:19 2017
+++ pkgsrc/mail/qmail/INSTALL   Thu Apr 27 20:35:10 2017
@@ -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 @@ NOTE: If you don't already have an SSL c
 
 # ${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
 

Index: pkgsrc/mail/qmail/Makefile
diff -u pkgsrc/mail/qmail/Makefile:1.84 pkgsrc/mail/qmail/Makefile:1.85
--- pkgsrc/mail/qmail/Makefile:1.84     Sat Apr  8 18:22:51 2017
+++ pkgsrc/mail/qmail/Makefile  Thu Apr 27 20:35:10 2017
@@ -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+=         DOCDIR=${DOCDIR:Q} EGDIR=
 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}