diff options
| author | jlam <jlam> | 2008-03-04 06:45:33 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-03-04 06:45:33 +0000 |
| commit | f357f16945a548269dc226551899cb002e1e2ad0 (patch) | |
| tree | 53927b9cc2c07e26be3e7581f09a05ed030ac452 /mk/pkginstall | |
| parent | 399213d782cae019cc0034f4f6b9215c109273c8 (diff) | |
| download | pkgsrc-f357f16945a548269dc226551899cb002e1e2ad0.tar.gz | |
+ Conditionally add GAMES_USER and GAMES_GROUP to the platform *.mk
files. These variables are currently usable if ${SETGIDGAME} == yes.
These variables should be used when describing ownership of files
and directories to the pkginstall framework, e.g.
SPECIAL_PERMS= bin/foogame ${GAMES_USER} ${GAMES_GROUP} 2555
+ Rename SETGID_GAME_PERMS to SETGID_GAMES_PERMS because the default
group name is "games".
+ Define SETGID_GAMES_PERMS in terms of GAMES_USER and GAMES_GROUP so
that these names are protected from the normal flow of unprivileged.mk.
This fixes the +INSTALL scripts in "user-destdir" packages to
correctly refer to the games:games instead of the user:group of the
user that built the packages.
Diffstat (limited to 'mk/pkginstall')
| -rw-r--r-- | mk/pkginstall/bsd.pkginstall.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk index 75c691400c8..4fa046604b1 100644 --- a/mk/pkginstall/bsd.pkginstall.mk +++ b/mk/pkginstall/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.44 2008/03/04 05:55:42 jlam Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.45 2008/03/04 06:45:33 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and implements the # common INSTALL/DEINSTALL scripts framework. To use the pkginstall @@ -50,7 +50,7 @@ _PKG_VARS.pkginstall+= \ FONTS_DIRS.ttf FONTS_DIRS.type1 FONTS_DIRS.x11 \ _SYS_VARS.pkginstall= \ SETUID_ROOT_PERMS \ - SETGID_GAME_PERMS \ + SETGID_GAMES_PERMS \ SHLIB_TYPE \ LDCONFIG_ADD_CMD \ LDCONFIG_REMOVE_CMD @@ -363,16 +363,16 @@ su-create-usergroup: ${_INSTALL_USERGROUP_UNPACKER} # # SPECIAL_PERMS+= /path/to/suidroot ${SETUID_ROOT_PERMS} # -# SETGID_GAME_PERMS is a convenience definition to note an executable is +# SETGID_GAMES_PERMS is a convenience definition to note an executable is # meant to be setgid-game, and should be used as follows: # -# SPECIAL_PERMS+= /path/to/sgidgame ${SETGID_GAME_PERMS} +# SPECIAL_PERMS+= /path/to/sgidgame ${SETGID_GAMES_PERMS} # # Keywords: setuid setgid st_mode perms # SPECIAL_PERMS?= # empty SETUID_ROOT_PERMS?= ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 4511 -SETGID_GAME_PERMS?= ${GAMEOWN} ${GAMEGRP} ${GAMEMODE} +SETGID_GAMES_PERMS?= ${GAMES_USER} ${GAMES_GROUP} ${GAMEMODE} _INSTALL_PERMS_FILE= ${_PKGINSTALL_DIR}/perms _INSTALL_PERMS_DATAFILE= ${_PKGINSTALL_DIR}/perms-data |