From owner-svn-src-projects@FreeBSD.ORG  Mon Feb 11 12:42:06 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id BA096628;
 Mon, 11 Feb 2013 12:42:06 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 948D465D;
 Mon, 11 Feb 2013 12:42:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BCg6wS093636;
 Mon, 11 Feb 2013 12:42:06 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BCg68T093635;
 Mon, 11 Feb 2013 12:42:06 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201302111242.r1BCg68T093635@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 11 Feb 2013 12:42:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r246665 - projects/portbuild/admin/tools
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Feb 2013 12:42:06 -0000

Author: linimon (doc,ports committer)
Date: Mon Feb 11 12:42:06 2013
New Revision: 246665
URL: http://svnweb.freebsd.org/changeset/base/246665

Log:
  Checkpoint of changes to once again allow PORTBUILD_USER to clone from
  svn repositories.
  
  Submitted by:	crees

Modified:
  projects/portbuild/admin/tools/newmkportbuild

Modified: projects/portbuild/admin/tools/newmkportbuild
==============================================================================
--- projects/portbuild/admin/tools/newmkportbuild	Mon Feb 11 12:39:35 2013	(r246664)
+++ projects/portbuild/admin/tools/newmkportbuild	Mon Feb 11 12:42:06 2013	(r246665)
@@ -79,6 +79,9 @@ zfs unallow -u ${SRCBUILD_USER} ${ZFS_VO
 
 # reset the "zfsportbuildadmin" permission set if it already exists. 
 zfs unallow -s @zfsportbuildadmin ${ZFS_VOLUME} 2> /dev/null   
+
+# reset the "zfssnapadmin" permission set if it already exists.
+zfs unallow -s @zfssnapadmin ${ZFS_VOLUME} 2> /dev/null   
 zfs unallow -u ${PORTBUILD_USER} ${ZFS_VOLUME} 2> /dev/null
 
 # create the "zfsalladmin" permission set.
@@ -87,6 +90,9 @@ zfs allow -s @zfsalladmin ${ZFS_PERMISSI
 # create the "zfsportbuildadmin" permission set.
 zfs allow -s @zfsportbuildadmin ${ZFS_PERMISSIONSET} ${ZFS_VOLUME}/portbuild || exit 1
 
+# create the "zfssnapadmin" permission set.
+zfs allow -s @zfssnapadmin ${ZFS_PERMISSIONSET_SNAPS} ${ZFS_VOLUME}/${SNAP_DIRECTORY} || exit 1
+
 # delegate the "zfsalladmin" permission set to the SRCBUILD_USER. 
 zfs allow -du ${SRCBUILD_USER} @zfsalladmin ${ZFS_VOLUME} || exit 1
 zfs allow -lu ${SRCBUILD_USER} @zfsalladmin ${ZFS_VOLUME} || exit 1
@@ -115,6 +121,9 @@ done
 # delegate the "zfsportbuildadmin" permission set to the PORTBUILD_USER. 
 zfs allow -du ${PORTBUILD_USER} @zfsportbuildadmin ${ZFS_VOLUME}/portbuild || exit 1
 
+# delegate the "zfssnapadmin" permission set to the PORTBUILD_USER.
+zfs allow -du ${PORTBUILD_USER} @zfssnapadmin ${ZFS_VOLUME}/${SNAP_DIRECTORY} || exit 1
+
 echo "results of ZFS operations:"
 zfs list ${ZFS_VOLUME}
 zfs allow ${ZFS_VOLUME}
@@ -137,6 +146,9 @@ done
 echo "checking out the repository as user ${PORTBUILD_USER} ..."
 su -m ${PORTBUILD_USER} -c "${VCS_CHECKOUT_COMMAND} ${VCS_PORTBUILD_REPOSITORY} ${ZFS_MOUNTPOINT}/portbuild" || exit 1
 
+# XXX MCL now have to move some directories over, create different
+# XXX MCL ownerships, and so forth.
+
 echo "$0: you should now be able to edit files in ${ZFS_MOUNTPOINT}/portbuild/conf."
 
 # create convenience directories.  failure is annoying but non-fatal.