diff options
| author | spz <spz@pkgsrc.org> | 2011-01-29 17:16:32 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2011-01-29 17:16:32 +0000 |
| commit | ae1b4b4cc6264e0da85a3c3988ad36124cad272e (patch) | |
| tree | 8f371f840998ef7bec280bb629c014af74b4f6ed /mk | |
| parent | 42aec27b904f53f5125fc9262888a2ceb5970fe6 (diff) | |
| download | pkgsrc-ae1b4b4cc6264e0da85a3c3988ad36124cad272e.tar.gz | |
stop majordomo from chowning /var/tmp to user majordom due to a superannuated
default in mk/defaults/mk.conf
remove the non-shared defaults and put in the setting that actually gets
used by more than one package (namely, MAJORDOMO_HOMEDIR)
don't make the majordom user own more than it actually needs to
make resend, archive, request-answer and medit honor the MAJORDOMO_CF
environment variable over the command line option, so that someone calling
these via the wrapper (which sets the environment variable) can't make
the majordom user execute random perl code by specifying it as config file.
Thanks to salo for finding this issue.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/defaults/mk.conf | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 1835c74e7be..017bebb0986 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.197 2010/12/25 08:51:41 adam Exp $ +# $NetBSD: mk.conf,v 1.198 2011/01/29 17:16:32 spz Exp $ # # This file provides default values for variables that may be overridden @@ -1239,20 +1239,11 @@ MAILAGENT_ORGANIZATION?= Example Company # Possible: valid hostname/email addresses/any company name # Defaults: see above -MAJORDOMO_GROUP?= majordom -# Used by the majordomo package as the groupid majordomo runs at. -# Possible: any -# Default: majordom - -MAJORDOMO_TMPDIR?= ${VARBASE}/tmp -# Used by the majordomo package as the directory to store temp files. +MAJORDOMO_HOMEDIR?= ${VARBASE}/majordomo +# Used by the majordomo package as the directory the lists dir is in +# also used by the distribute package # Possible: any directory. -# Default: ${VARBASE}/tmp - -MAJORDOMO_USER?= majordom -# Used by majordomo package as the userid majordomo runs at. -# Possible: any -# Default: majordom +# Default: ${VARBASE}/majordomo #MAKEINFO_ARGS?= # flags to be passed to makeinfo(1), if any. Warning: only use if you |