From owner-svn-src-projects@FreeBSD.ORG  Sun Dec 16 21:10:23 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 78D7FA1A;
 Sun, 16 Dec 2012 21:10:23 +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 45ED28FC17;
 Sun, 16 Dec 2012 21:10:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGLAN8r052171;
 Sun, 16 Dec 2012 21:10:23 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGLAM5e052168;
 Sun, 16 Dec 2012 21:10:22 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212162110.qBGLAM5e052168@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sun, 16 Dec 2012 21:10:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244313 - projects/portbuild/scripts
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: Sun, 16 Dec 2012 21:10:23 -0000

Author: linimon (doc,ports committer)
Date: Sun Dec 16 21:10:22 2012
New Revision: 244313
URL: http://svnweb.freebsd.org/changeset/base/244313

Log:
  Get rid of group writeability.  Don't write .updated until it really has.

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

Modified: projects/portbuild/scripts/updatesnap
==============================================================================
--- projects/portbuild/scripts/updatesnap	Sun Dec 16 21:05:54 2012	(r244312)
+++ projects/portbuild/scripts/updatesnap	Sun Dec 16 21:10:22 2012	(r244313)
@@ -32,9 +32,6 @@ finish() {
 begin=$(date +%s)
 echo "Started at $(date)"
 
-# We need to preserve group writability
-umask 002
-
 uid=${PORTBUILD_USER}
 if [ ! -z "${PORTBUILD_GROUP}" ]; then
     gid=${PORTBUILD_GROUP}
@@ -93,7 +90,6 @@ for branch in $SRC_BRANCHES; do
       fi
       ${VCS_OVERWRITE_COMMAND} ${mountpoint}/src || finish 1
     fi
-    echo ${fulldate} > src/.updated
     # hack for zfs breakiness
     find . -group wheel | xargs chgrp ${gid}
     snapdate=$(stamp ${fulldate})
@@ -101,6 +97,7 @@ for branch in $SRC_BRANCHES; do
       echo "zfs snapshot ${zbase_prefix}${branch}/src@${snapdate}"
     fi
     zfs snapshot ${zbase_prefix}${branch}/src@${snapdate} || finish 1
+    echo ${fulldate} > src/.updated
 done
 
 finish 0

Modified: projects/portbuild/scripts/updatesnap.ports
==============================================================================
--- projects/portbuild/scripts/updatesnap.ports	Sun Dec 16 21:05:54 2012	(r244312)
+++ projects/portbuild/scripts/updatesnap.ports	Sun Dec 16 21:10:22 2012	(r244313)
@@ -32,9 +32,6 @@ finish() {
 begin=$(date +%s)
 echo "Started at $(date)"
 
-# We need to preserve group writability
-umask 002
-
 uid=${PORTBUILD_USER}
 if [ ! -z "${PORTBUILD_GROUP}" ]; then
     gid=${PORTBUILD_GROUP}
@@ -85,7 +82,6 @@ else
   fi
   ${VCS_OVERWRITE_COMMAND} ${head}/ports || finish 1
 fi
-echo ${fulldate} > ports/.updated
 # hack for zfs breakiness
 find . -group wheel | xargs chgrp ${gid}
 snapdate=$(stamp ${fulldate})
@@ -93,5 +89,6 @@ if [ $VERBOSE ]; then
   echo "zfs snapshot ${zhead}/ports@${snapdate}"
 fi
 zfs snapshot ${zhead}/ports@${snapdate} || finish 1
+echo ${fulldate} > ports/.updated
 
 finish 0