CVS commit: [pkgsrc-2017Q1] pkgsrc/mk/defaults

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon Apr 17 15:58:28 UTC 2017

Modified Files:
        pkgsrc/mk/defaults [pkgsrc-2017Q1]: mk.conf options.description

Log Message:
Pullup ticket #5297 - requested by schmonz
mk/default: prerequisites for qmail pull-up

Revisions pulled up:
- mk/defaults/mk.conf                                           1.272
- mk/defaults/options.description                               1.525,1.527

---
   Module Name: pkgsrc
   Committed By:        schmonz
   Date:                Sat Apr  1 01:08:07 UTC 2017

   Modified Files:
        pkgsrc/mk/defaults: options.description

   Log Message:
   Describe qmail-srs option (Sender Rewriting Scheme).

---
   Module Name: pkgsrc
   Committed By:        schmonz
   Date:                Tue Apr  4 07:44:13 UTC 2017

   Modified Files:
        pkgsrc/mk/defaults: mk.conf

   Log Message:
   Define default names for qmail users and groups.

---
   Module Name: pkgsrc
   Committed By:        schmonz
   Date:                Sun Apr  9 13:02:32 UTC 2017

   Modified Files:
        pkgsrc/mk/defaults: options.description

   Log Message:
   Describe qmail-run-ofmipd.


To generate a diff of this commit:
cvs rdiff -u -r1.271.2.1 -r1.271.2.2 pkgsrc/mk/defaults/mk.conf
cvs rdiff -u -r1.524.2.1 -r1.524.2.2 pkgsrc/mk/defaults/options.description

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/defaults/mk.conf
diff -u pkgsrc/mk/defaults/mk.conf:1.271.2.1 pkgsrc/mk/defaults/mk.conf:1.271.2.2
--- pkgsrc/mk/defaults/mk.conf:1.271.2.1        Sun Apr 16 14:38:21 2017
+++ pkgsrc/mk/defaults/mk.conf  Mon Apr 17 15:58:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.271.2.1 2017/04/16 14:38:21 bsiegert Exp $
+# $NetBSD: mk.conf,v 1.271.2.2 2017/04/17 15:58:28 bsiegert Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -1503,6 +1503,24 @@ QMAILDIR?= ${VARBASE}/qmail
 # Possible: any valid location
 # Default: ${VARBASE}/qmail
 
+QMAIL_ALIAS_USER?=     alias
+QMAIL_DAEMON_USER?=    qmaild
+QMAIL_LOG_USER?=       qmaill
+QMAIL_ROOT_USER?=      ${REAL_ROOT_USER}
+QMAIL_PASSWD_USER?=    qmailp
+QMAIL_QUEUE_USER?=     qmailq
+QMAIL_REMOTE_USER?=    qmailr
+QMAIL_SEND_USER?=      qmails
+# System users for qmail-related programs.
+# Possible: any user names
+# Default: alias, qmaild, qmaill, root, qmailp, qmailq, qmailr, qmails
+
+QMAIL_QMAIL_GROUP?=    qmail
+QMAIL_NOFILES_GROUP?=  nofiles
+# System groups for qmail-related programs.
+# Possible: any group names
+# Default: qmail, nofiles
+
 QMAIL_QFILTER_TMPDIR?= ${VARBASE}/tmp/qmail-qfilter
 # The temporary directory for qmail-qfilter.
 # Possible: a directory writable only by qmail-qfilter's UID

Index: pkgsrc/mk/defaults/options.description
diff -u pkgsrc/mk/defaults/options.description:1.524.2.1 pkgsrc/mk/defaults/options.description:1.524.2.2
--- pkgsrc/mk/defaults/options.description:1.524.2.1    Thu Apr 13 11:15:39 2017
+++ pkgsrc/mk/defaults/options.description      Mon Apr 17 15:58:28 2017
@@ -615,6 +615,8 @@ qmail-outgoingip    Patch to force a partic
 qmail-qregex           Patch to SMTP-reject customizable patterns.
 qmail-rcptcheck                Patch to SMTP-reject via a script or program.
 qmail-realrcptto       Patch to SMTP-reject nonexistent recipients.
+qmail-run-ofmipd       Enable dependency on mess822 for ofmipd service.
+qmail-srs              Patch to implement Sender Rewriting Scheme with libsrs2.
 qmail-viruscan         Patch to SMTP-reject certain types of MIME attachments.
 qpopper-servermode     Enable server mode.
 qt                     Enable support for QT.