diff options
| author | tnn <tnn> | 2010-02-28 19:33:00 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2010-02-28 19:33:00 +0000 |
| commit | 6eb3bc0244dd5719f91a786cbb053264787f6d06 (patch) | |
| tree | eb694f525c7f6dbf2df37b267c11ca6fb81e23f4 /mk/unprivileged.mk | |
| parent | b9f7b65c941ddc8170d29122151e8a06de47ecba (diff) | |
| download | pkgsrc-6eb3bc0244dd5719f91a786cbb053264787f6d06.tar.gz | |
Fix GAMES_USER handling in unprivileged mode.
ok joerg
Diffstat (limited to 'mk/unprivileged.mk')
| -rw-r--r-- | mk/unprivileged.mk | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/mk/unprivileged.mk b/mk/unprivileged.mk index 7aaa5469398..5c8ce3a048d 100644 --- a/mk/unprivileged.mk +++ b/mk/unprivileged.mk @@ -1,4 +1,4 @@ -# $NetBSD: unprivileged.mk,v 1.18 2009/12/30 12:21:15 abs Exp $ +# $NetBSD: unprivileged.mk,v 1.19 2010/02/28 19:33:00 tnn Exp $ # # This file collects definitions that are useful when using pkgsrc as an # unprivileged (non-root) user. It is included automatically by the @@ -150,6 +150,13 @@ REAL_ROOT_GROUP:= ${ROOT_GROUP} ROOT_GROUP= ${UNPRIVILEGED_GROUP} ROOT_USER= ${UNPRIVILEGED_USER} +. if !empty(_UNPRIVILEGED:Munprivileged) +# Override "games" account. +GAMES_GROUP= ${UNPRIVILEGED_GROUP} +GAMES_USER= ${UNPRIVILEGED_USER} +GAMEDIRMODE= 0755 +. endif + # Override user/group pairs used to install files. BINGRP= ${UNPRIVILEGED_GROUP} BINOWN= ${UNPRIVILEGED_USER} @@ -174,15 +181,6 @@ PKG_USERS_VARS?= # empty PKG_GROUPS_VARS?= # empty BUILD_DEFS+= ${PKG_USERS_VARS} ${PKG_GROUPS_VARS} -.if defined(SETGIDGAME) && !empty(SETGIDGAME:M[yY][eE][sS]) -. if defined(GAMES_USER) -PKG_USERS_VARS+= GAMES_USER -. endif -. if defined(GAMES_GROUP) -PKG_GROUPS_VARS+= GAMES_GROUP -. endif -.endif - # Override per-package custom users and groups, except for groups listed # in UNPRIVILEGED_GROUPS. . for _var_ in ${PKG_USERS_VARS} |