tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

setgid games patch, step 1



This patch begins tidying up the infrastructure related to setgid
games, as follows:

   - introduce USE_GAMESGROUP, which does what SETGIDGAME used to
   - retain SETGIDGAME as an alias (for now)
   - always define GAMES_USER, GAMES_GROUP, GAMEMODE, GAMEDIRMODE, and
     GAMEDATAMODE
   - do not define these separately in every platform/*.mk file
   - handle these properly when unprivileged
   - update the comments/documentation for these vars
   - describe GAMEOWN and GAMEGRP as deprecated
   - add GAMEDATA_PERMS and GAMEDIR_PERMS
   - fix a bug which was mixing the "games" group and "games" user

This doesn't do everything that needs to be done but it seems like a
reasonable set of things to commit as a starting point.

Because this touches infrastructure and there are a number of things
in here I'm not particularly familiar with I'm posting it for review,
so if someone could take a look to see if I've done anything
particularly dumb I'd appreciate it.


Index: unprivileged.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/unprivileged.mk,v
retrieving revision 1.20
diff -u -r1.20 unprivileged.mk
--- unprivileged.mk     28 Feb 2010 19:57:52 -0000      1.20
+++ unprivileged.mk     6 Jul 2010 01:04:15 -0000
@@ -154,6 +154,7 @@
 # Override "games" account.
 GAMES_GROUP=           ${UNPRIVILEGED_GROUP}
 GAMES_USER=            ${UNPRIVILEGED_USER}
+GAMEDATAMODE=          0644
 GAMEDIRMODE=           0755
 GAMEMODE=              0755
 .  endif
Index: defaults/mk.conf
===================================================================
RCS file: /cvsroot/pkgsrc/mk/defaults/mk.conf,v
retrieving revision 1.191
diff -u -r1.191 mk.conf
--- defaults/mk.conf    8 Jun 2010 19:04:09 -0000       1.191
+++ defaults/mk.conf    6 Jul 2010 01:04:17 -0000
@@ -541,10 +541,20 @@
 # Possible: any shell commands
 # Default: none
 
-SETGIDGAME?=   no
-# This flags specifies whether or not certain games are installed setgid,
-# which would allow them to write to a group-owned score file.
-# See also:    GAMEGRP, GAMEMODE, GAMEOWN
+USE_GAMESGROUP?=       no
+SETGIDGAME?=           ${USE_GAMESGROUP}
+# This flag specifies whether a package uses the "games" group; if it is
+# set, the GAMES_GROUP, GAMEMODE, SETGID_GAMES_PERMS, etc. variables can
+# be used to install setgid games and their data files.
+#
+# SETGIDGAME is a deprecated alternative variable with the same
+# purpose but a murky history and unclear semantics; it is being
+# phased out because it conflicts with a like-named build variable in
+# the NetBSD base system.
+#
+# XXX: This variable should not be defined here.
+#
+# See also:    GAMES_GROUP, GAMEMODE
 # Possible:    yes, no
 # Default:     no
 
@@ -873,46 +883,58 @@
 # Possible: any group name
 # Default: jserver
 
-.if !empty(SETGIDGAME:M[yY][eE][sS])
-GAMEDATAMODE?= 664
-.else
-GAMEDATAMODE?= ${SHAREMODE}
-.endif
-# Used for various games to allow writing to a group-owned score file.
-# See also:    GAMEMODE, GAMEOWN, SETGIDGAME
-# Possible:    any file ownership
-# Default:     ${SHAREMODE} if SETGIDGAME is not set to 'yes', 644 otherwise
+GAMES_USER?=   games
+# Used by games to own writeable material, normally in ${VARBASE}.
+# GAMES_USER has historically been "games" but in the absence of setuid
+# games, which are generally a bad idea, a games user is fairly pointless
+# and is expected to be removed in the future.
+# See also:    GAMES_GROUP, USE_GAMESGROUP
+# Possible:    any user name
+# Default:     games
 
-GAMEGRP?=      ${BINGRP}
-# Used for various games to allow writing to a group-owned score file.
-# If SETGIDGAME is 'yes', setting this to a dedicated group, such as 'games'
-# would make sense.
-# See also:    GAMEMODE, GAMEOWN, SETGIDGAME
+GAMES_GROUP?=  games
+# Used by games to own writeable material, normally in ${VARBASE}.
+# See also:    GAMES_USER, GAMEMODE, GAMEDIRMODE, GAMEDATAMODE, USE_GAMESGROUP
 # Possible:    any group name
-# Default:     ${BINGRP}
+# Default:     games
 
-GAMEMODE?=     ${BINMODE}
-# Used for various games to allow writing to a group-owned score file.
-# If SETGIDGAME is 'yes', setting this to 2555 would make sense.
-# See also:    GAMEGRP, GAMEOWN, SETGIDGAME
+GAMEMODE?=     2555
+# Used by setgid games to install the setgid executable itself.
+# Note that USE_GAMESGROUP must be set to make the games group actually
+# exist.
+# See also:    GAMES_GROUP, GAMEDIRMODE, GAMEDATAMODE, USE_GAMESGROUP
 # Possible:    any mode
-# Default:     ${BINMODE}
+# Default:     2555
 
-GAMEDIRMODE?=  ${PKGDIRMODE}
-# Used for various games to allow writing to a group-owned directory
-# e.g. for logfiles.
-# If SETGIDGAME is 'yes', setting this to 0775 would make sense.
-# See also:    GAMEGRP, GAMEOWN, GAMEMODE, SETGIDGAME
+GAMEDIRMODE?=  775
+# Used by setgid games to allow writing to a group-owned directory for
+# e.g. logfiles. Note that this variable should only be used for
+# directories where the game needs write access at runtime; otherwise
+# stick to ${PKGDIRMODE}.
+# See also:    GAMES_USER, GAMES_GROUP, GAMEMODE, USE_GAMESGROUP
 # Possible:    any mode
-# Default:     ${PKGDIRMODE}
+# Default:     775
+
+GAMEDATAMODE?= 664
+# Used by setgid games as the permissions for writeable material, such
+# as score files, normally found in ${VARBASE}.
+# See also:    GAMES_USER, GAMES_GROUP, USE_GAMESGROUP
+# Possible:    any file ownership
+# Default:     664
+
+GAMEGRP?=      ${GAMES_GROUP}
+# Legacy form of GAMES_GROUP; should only be used in the context of
+# supporting packages that use bsd.*.mk.
+# See also:    GAMES_GROUP, USE_GAMESGROUP
+# Possible:    any group name
+# Default:     GAMES_GROUP
 
-GAMEOWN?=      ${BINOWN}
-# Used for various games to allow writing to a group-owned score file.
-# If SETGIDGAME is 'yes', setting this to a dedicated user, such as 'games'
-# would make sense.
-# See also:    GAMEGRP, GAMEMODE, SETGIDGAME
+GAMEOWN?=      ${GAMES_USER}
+# Legacy form of GAMES_USER; should only be used in the context of
+# supporting packages that use bsd.*.mk.
+# See also:    GAMES_USER
 # Possible:    any user name
-# Default:     ${BINOWN}
+# Default:     GAMES_USER
 
 GNU_PROGRAM_PREFIX?=   g
 # This is the prefix to add for GNU programs, like gls or gnutouch.
Index: pkginstall/bsd.pkginstall.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/pkginstall/bsd.pkginstall.mk,v
retrieving revision 1.50
diff -u -r1.50 bsd.pkginstall.mk
--- pkginstall/bsd.pkginstall.mk        15 Jun 2010 19:23:56 -0000      1.50
+++ pkginstall/bsd.pkginstall.mk        6 Jul 2010 01:04:18 -0000
@@ -203,9 +203,14 @@
 FILES_SUBST+=          PKG_USER_HOME=${_PKG_USER_HOME:Q}
 FILES_SUBST+=          PKG_USER_SHELL=${_PKG_USER_SHELL:Q}
 
-# If SETGIDGAME == yes, then we need the "games" user and group.
-.if defined(SETGIDGAME) && !empty(SETGIDGAME:M[yY][eE][sS])
-PKG_GROUPS+=   ${GAMES_USER}
+# If USE_GAMESGROUP == yes, then we need the "games" group.
+# SETGIDGAME is a deprecated alias for USE_GAMESGROUP.
+#
+# For now we also create the "games" user; this should not be used and
+# should be removed at some point.
+.if (defined(USE_GAMESGROUP) && !empty(USE_GAMESGROUP:M[yY][eE][sS])) ||\
+    (defined(SETGIDGAME) && !empty(SETGIDGAME:M[yY][eE][sS]))
+PKG_GROUPS+=   ${GAMES_GROUP}
 PKG_USERS+=    ${GAMES_USER}:${GAMES_GROUP}
 .endif
 
@@ -377,15 +382,30 @@
 #      SPECIAL_PERMS+= /path/to/suidroot ${SETUID_ROOT_PERMS}
 #
 # SETGID_GAMES_PERMS is a convenience definition to note an executable is
-# meant to be setgid-game, and should be used as follows:
+# meant to be setgid games, and should be used as follows:
 #
 #      SPECIAL_PERMS+= /path/to/sgidgame ${SETGID_GAMES_PERMS}
 #
+# GAMEDATA_PERMS and GAMEDIR_PERMS are convenience defintiions for files
+# that are meant to be accessed by things that are setgid games. Because
+# such files should normally be under ${VARBASE}, generally these 
+# definitions should be used roughly as follows:
+#
+#      REQD_DIRS_PERMS+=  /path/to/scoredir ${GAMEDIR_PERMS}
+#      REQD_FILES_PERMS+= /dev/null /path/to/scorefile ${GAMEDATA_PERMS}
+#
+# Note that GAMEDIR_PERMS should only be used when the game requires
+# write access to scribble in its directory; many games do not, in which
+# case REQD_DIRS instead of REQD_DIRS_PERMS can be used and GAMEDIR_PERMS
+# is not needed.
+#
 # Keywords: setuid setgid st_mode perms
 #
 SPECIAL_PERMS?=                # empty
 SETUID_ROOT_PERMS?=    ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 4511
 SETGID_GAMES_PERMS?=   ${GAMES_USER} ${GAMES_GROUP} ${GAMEMODE}
+GAMEDATA_PERMS?=       ${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+GAMEDIR_PERMS?=                ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
 
 _INSTALL_PERMS_FILE=           ${_PKGINSTALL_DIR}/perms
 _INSTALL_PERMS_DATAFILE=       ${_PKGINSTALL_DIR}/perms-data
Index: platform/AIX.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/AIX.mk,v
retrieving revision 1.34
diff -u -r1.34 AIX.mk
--- platform/AIX.mk     26 Jul 2009 05:32:43 -0000      1.34
+++ platform/AIX.mk     6 Jul 2010 01:04:18 -0000
@@ -76,17 +76,3 @@
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
 #_OPSYS_MAX_CMDLEN_CMD=        /sbin/sysctl -n kern.argmax
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMES_USER=           games
-#GAMES_GROUP=          games
-#GAMEOWN=              ${GAMES_USER}
-#GAMEGRP=              ${GAMES_GROUP}
-#GAMEMODE=             2555
-#GAMEDIRMODE=          0775
-#.endif
Index: platform/BSDOS.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/BSDOS.mk,v
retrieving revision 1.27
diff -u -r1.27 BSDOS.mk
--- platform/BSDOS.mk   26 Jul 2009 05:32:43 -0000      1.27
+++ platform/BSDOS.mk   6 Jul 2010 01:04:18 -0000
@@ -84,17 +84,3 @@
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
 #_OPSYS_MAX_CMDLEN_CMD=        /sbin/sysctl -n kern.argmax
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMES_USER=           games
-#GAMES_GROUP=          games
-#GAMEOWN=              ${GAMES_USER}
-#GAMEGRP=              ${GAMES_GROUP}
-#GAMEMODE=             2555
-#GAMEDIRMODE=          0775
-#.endif
Index: platform/Darwin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/Darwin.mk,v
retrieving revision 1.42
diff -u -r1.42 Darwin.mk
--- platform/Darwin.mk  24 Sep 2009 06:31:27 -0000      1.42
+++ platform/Darwin.mk  6 Jul 2010 01:04:19 -0000
@@ -127,17 +127,3 @@
 .if empty(OS_VERSION:M[0-8].*) && exists(/bin/ksh)
 WRAPPER_BIN_SH?=       /bin/ksh
 .endif
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMES_USER=           games
-#GAMES_GROUP=          games
-#GAMEOWN=              ${GAMES_USER}
-#GAMEGRP=              ${GAMES_GROUP}
-#GAMEMODE=             2555
-#GAMEDIRMODE=          0775
-#.endif
Index: platform/DragonFly.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/DragonFly.mk,v
retrieving revision 1.38
diff -u -r1.38 DragonFly.mk
--- platform/DragonFly.mk       16 Dec 2009 19:48:09 -0000      1.38
+++ platform/DragonFly.mk       6 Jul 2010 01:04:19 -0000
@@ -84,16 +84,3 @@
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-GAMES_USER=            games
-GAMES_GROUP=           games
-GAMEOWN=               ${GAMES_USER}
-GAMEGRP=               ${GAMES_GROUP}
-GAMEMODE=              2555
-GAMEDIRMODE=           0775
-.endif
Index: platform/FreeBSD.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/FreeBSD.mk,v
retrieving revision 1.26
diff -u -r1.26 FreeBSD.mk
--- platform/FreeBSD.mk 26 Jul 2009 05:32:43 -0000      1.26
+++ platform/FreeBSD.mk 6 Jul 2010 01:04:19 -0000
@@ -87,16 +87,3 @@
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-GAMES_USER=            games
-GAMES_GROUP=           games
-GAMEOWN=               ${GAMES_USER}
-GAMEGRP=               ${GAMES_GROUP}
-GAMEMODE=              2555
-GAMEDIRMODE=           0775
-.endif
Index: platform/Haiku.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/Haiku.mk,v
retrieving revision 1.2
diff -u -r1.2 Haiku.mk
--- platform/Haiku.mk   20 Jun 2010 04:05:39 -0000      1.2
+++ platform/Haiku.mk   6 Jul 2010 01:04:19 -0000
@@ -74,17 +74,3 @@
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
 #_OPSYS_MAX_CMDLEN_CMD=        /sbin/sysctl -n kern.argmax
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMES_USER=           games
-#GAMES_GROUP=          games
-#GAMEOWN=              ${GAMES_USER}
-#GAMEGRP=              ${GAMES_GROUP}
-#GAMEMODE=             2555
-#GAMEDIRMODE=          0775
-#.endif
Index: platform/IRIX.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/IRIX.mk,v
retrieving revision 1.35
diff -u -r1.35 IRIX.mk
--- platform/IRIX.mk    26 Jul 2009 05:32:43 -0000      1.35
+++ platform/IRIX.mk    6 Jul 2010 01:04:19 -0000
@@ -110,17 +110,3 @@
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD= /usr/sbin/sysconf ARG_MAX
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMES_USER=           games
-#GAMES_GROUP=          games
-#GAMEOWN=              ${GAMES_USER}
-#GAMEGRP=              ${GAMES_GROUP}
-#GAMEMODE=             2555
-#GAMEDIRMODE=          0775
-#.endif
Index: platform/Interix.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/Interix.mk,v
retrieving revision 1.63
diff -u -r1.63 Interix.mk
--- platform/Interix.mk 16 Dec 2009 19:48:09 -0000      1.63
+++ platform/Interix.mk 6 Jul 2010 01:04:19 -0000
@@ -160,17 +160,3 @@
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD= ${ECHO} 262144
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMES_USER=           games
-#GAMES_GROUP=          games
-#GAMEOWN=              ${GAMES_USER}
-#GAMEGRP=              ${GAMES_GROUP}
-#GAMEMODE=             2555
-#GAMEDIRMODE=          0775
-#.endif
Index: platform/Linux.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/Linux.mk,v
retrieving revision 1.39
diff -u -r1.39 Linux.mk
--- platform/Linux.mk   20 May 2010 07:57:23 -0000      1.39
+++ platform/Linux.mk   6 Jul 2010 01:04:19 -0000
@@ -93,20 +93,6 @@
 # FIXME: Adjust to work on this system and enable the lines below.
 #_OPSYS_MAX_CMDLEN_CMD=        /sbin/sysctl -n kern.argmax
 
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMES_USER=           games
-#GAMES_GROUP=          games
-#GAMEOWN=              ${GAMES_USER}
-#GAMEGRP=              ${GAMES_GROUP}
-#GAMEMODE=             2555
-#GAMEDIRMODE=          0775
-#.endif
-
 .if (${MACHINE_ARCH} == "x86_64")
 ABI?=  64
 LIBABISUFFIX?=          64
Index: platform/NetBSD.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/NetBSD.mk,v
retrieving revision 1.32
diff -u -r1.32 NetBSD.mk
--- platform/NetBSD.mk  26 Jul 2009 05:32:43 -0000      1.32
+++ platform/NetBSD.mk  6 Jul 2010 01:04:19 -0000
@@ -147,16 +147,3 @@
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-GAMES_USER=            games
-GAMES_GROUP=           games
-GAMEOWN=               ${GAMES_USER}
-GAMEGRP=               ${GAMES_GROUP}
-GAMEMODE=              2555
-GAMEDIRMODE=           0775
-.endif
Index: platform/OpenBSD.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/OpenBSD.mk,v
retrieving revision 1.29
diff -u -r1.29 OpenBSD.mk
--- platform/OpenBSD.mk 26 Jul 2009 05:32:43 -0000      1.29
+++ platform/OpenBSD.mk 6 Jul 2010 01:04:19 -0000
@@ -100,17 +100,3 @@
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMES_USER=           games
-#GAMES_GROUP=          games
-#GAMEOWN=              ${GAMES_USER}
-#GAMEGRP=              ${GAMES_GROUP}
-#GAMEMODE=             2555
-#GAMEDIRMODE=          0775
-#.endif
Index: platform/SunOS.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/SunOS.mk,v
retrieving revision 1.38
diff -u -r1.38 SunOS.mk
--- platform/SunOS.mk   16 Dec 2009 19:48:09 -0000      1.38
+++ platform/SunOS.mk   6 Jul 2010 01:04:19 -0000
@@ -89,16 +89,3 @@
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
 #_OPSYS_MAX_CMDLEN_CMD=        /sbin/sysctl -n kern.argmax
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-GAMES_USER=            games
-GAMES_GROUP=           games
-GAMEOWN=               ${GAMES_USER}
-GAMEGRP=               ${GAMES_GROUP}
-GAMEMODE=              2555
-GAMEDIRMODE=           0775
-.endif
Index: platform/UnixWare.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/UnixWare.mk,v
retrieving revision 1.28
diff -u -r1.28 UnixWare.mk
--- platform/UnixWare.mk        26 Jul 2009 05:32:43 -0000      1.28
+++ platform/UnixWare.mk        6 Jul 2010 01:04:19 -0000
@@ -82,17 +82,3 @@
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
 #_OPSYS_MAX_CMDLEN_CMD=        /sbin/sysctl -n kern.argmax
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per defaults/mk.conf).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMES_USER=           games
-#GAMES_GROUP=          games
-#GAMEOWN=              ${GAMES_USER}
-#GAMEGRP=              ${GAMES_GROUP}
-#GAMEMODE=             2555
-#GAMEDIRMODE=          0775
-#.endif


-- 
David A. Holland
dholland%netbsd.org@localhost


Home | Main Index | Thread Index | Old Index