svn commit: r243880 - projects/portbuild/scripts

[Mark Linimon]

Author: linimon (doc,ports committer)
Date: Wed Dec  5 06:59:17 2012
New Revision: 243880
URL: http://svnweb.freebsd.org/changeset/base/243880

Log:
  Remove yet more uid:gid hardcoding.

Modified:
  projects/portbuild/scripts/buildproxy
  projects/portbuild/scripts/updatesnap
  projects/portbuild/scripts/updatesnap.ports

Modified: projects/portbuild/scripts/buildproxy
==============================================================================
--- projects/portbuild/scripts/buildproxy	Wed Dec  5 06:54:07 2012	(r243879)
+++ projects/portbuild/scripts/buildproxy	Wed Dec  5 06:59:17 2012	(r243880)
@@ -58,13 +58,17 @@ def process(cmd, sockfile):
 
 config = getConfig( pbc, CONFIG_SUBDIR, CONFIG_FILENAME )
 BUILDPROXY_SOCKET_FILE = config.get( 'BUILDPROXY_SOCKET_FILE' )
+PORTBUILD_GROUP = config.get( 'PORTBUILD_GROUP' )
 
 if os.path.exists(BUILDPROXY_SOCKET_FILE):
     os.unlink(BUILDPROXY_SOCKET_FILE)
 s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
 s.bind(BUILDPROXY_SOCKET_FILE)
-os.chmod(BUILDPROXY_SOCKET_FILE, 0660)
-os.chown(BUILDPROXY_SOCKET_FILE, -1, getgidbyname('portmgr'))
+if not PORTBUILD_GROUP:
+    os.chmod(BUILDPROXY_SOCKET_FILE, 0600)
+else:
+    os.chmod(BUILDPROXY_SOCKET_FILE, 0660)
+    os.chown(BUILDPROXY_SOCKET_FILE, -1, getgidbyname(PORTBUILD_GROUP))
 
 s.listen(10)
 

Modified: projects/portbuild/scripts/updatesnap
==============================================================================
--- projects/portbuild/scripts/updatesnap	Wed Dec  5 06:54:07 2012	(r243879)
+++ projects/portbuild/scripts/updatesnap	Wed Dec  5 06:59:17 2012	(r243880)
@@ -32,16 +32,23 @@ finish() {
 begin=$(date +%s)
 echo "Started at $(date)"
 
-# We need to preserve group writability so portmgr group can write
+# We need to preserve group writability
 umask 002
 
+uid=${PORTBUILD_USER}
+if [ ! -z "${PORTBUILD_GROUP}" ]; then
+    gid=${PORTBUILD_GROUP}
+else
+    gid=${uid}
+fi
+
 # create /a/snap if not already there
 if [ ! -d ${base} ]; then
   echo "creating new base directory using ${base}"
   mkdir -p ${base} || finish 1
   echo "zfs create -o mountpoint=${base} ${zbase}"
   zfs create -o mountpoint=${base} ${zbase} || finish 1
-  chown -R portmgr:portmgr ${base}
+  chown -R ${uid}:${gid} ${base}
   chmod -R g+w ${base}
 fi
 
@@ -53,7 +60,7 @@ for branch in $SRC_BRANCHES; do
     mkdir ${mountpoint} || finish 1
     echo "zfs create -o mountpoint=${mountpoint} ${zbase_prefix}${branch}"
     zfs create -o mountpoint=${mountpoint} ${zbase_prefix}${branch} || finish 1
-    chown -R portmgr:portmgr ${mountpoint}
+    chown -R ${uid}:${gid} ${mountpoint}
     chmod -R g+w ${mountpoint}
   fi
   # create /a/snap/src-<branch>/src if not already there
@@ -62,7 +69,7 @@ for branch in $SRC_BRANCHES; do
     mkdir ${mountpoint}/src || finish 1
     echo "zfs create -o mountpoint=${mountpoint}/src ${zbase_prefix}${branch}/src"
     zfs create -o mountpoint=${mountpoint}/src ${zbase_prefix}${branch}/src || finish 1
-    chown -R portmgr:portmgr ${mountpoint}/src
+    chown -R ${uid}:${gid} ${mountpoint}/src
     chmod -R g+w ${mountpoint}/src
   fi
   cd ${mountpoint}
@@ -88,7 +95,7 @@ for branch in $SRC_BRANCHES; do
     fi
     echo ${fulldate} > src/.updated
     # hack for zfs breakiness
-    find . -group wheel|xargs chgrp portmgr
+    find . -group wheel | xargs chgrp ${gid}
     snapdate=$(stamp ${fulldate})
     if [ $VERBOSE ]; then
       echo "zfs snapshot ${zbase_prefix}${branch}/src@${snapdate}"

Modified: projects/portbuild/scripts/updatesnap.ports
==============================================================================
--- projects/portbuild/scripts/updatesnap.ports	Wed Dec  5 06:54:07 2012	(r243879)
+++ projects/portbuild/scripts/updatesnap.ports	Wed Dec  5 06:59:17 2012	(r243880)
@@ -32,16 +32,23 @@ finish() {
 begin=$(date +%s)
 echo "Started at $(date)"
 
-# We need to preserve group writability so portmgr group can write
+# We need to preserve group writability
 umask 002
 
+uid=${PORTBUILD_USER}
+if [ ! -z "${PORTBUILD_GROUP}" ]; then
+    gid=${PORTBUILD_GROUP}
+else
+    gid=${uid}
+fi
+
 # create /a/snap/ if not already there
 if [ ! -d ${base} ]; then
   echo "creating new base directory using ${base}"
   mkdir -p ${base} || finish 1
   echo "zfs create -o mountpoint=${base} ${zbase}"
   zfs create -o mountpoint=${base} ${zbase} || finish 1
-  chown -R portmgr:portmgr ${base}
+  chown -R ${uid}:${gid} ${base}
   chmod -R g+w ${base}
 fi
 
@@ -51,7 +58,7 @@ if [ ! -d ${head} ]; then
   mkdir ${head} || finish 1
   echo "zfs create -o mountpoint=${head} ${zhead}"
   zfs create -o mountpoint=${head} ${zhead} || finish 1
-  chown -R portmgr:portmgr ${head}
+  chown -R ${uid}:${gid} ${head}
   chmod -R g+w ${head}
 fi
 
@@ -61,7 +68,7 @@ if [ ! -d ${head}/ports ]; then
   mkdir ${head}/ports || finish 1
   echo "zfs create -o mountpoint=${head}/ports ${zhead}/ports"
   zfs create -o mountpoint=${head}/ports ${zhead}/ports || finish 1
-  chown -R portmgr:portmgr ${head}/ports
+  chown -R ${uid}:${gid} ${head}/ports
   chmod -R g+w ${head}/ports
 fi
 
@@ -80,7 +87,7 @@ else
 fi
 echo ${fulldate} > ports/.updated
 # hack for zfs breakiness
-find . -group wheel|xargs chgrp portmgr
+find . -group wheel | xargs chgrp ${gid}
 snapdate=$(stamp ${fulldate})
 if [ $VERBOSE ]; then
   echo "zfs snapshot ${zhead}/ports@${snapdate}"