From owner-svn-ports-all@freebsd.org  Fri May 13 20:53:11 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 95D46B397EB;
 Fri, 13 May 2016 20:53:11 +0000 (UTC)
 (envelope-from jonathan@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 636141276;
 Fri, 13 May 2016 20:53:11 +0000 (UTC)
 (envelope-from jonathan@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4DKrAWJ098344;
 Fri, 13 May 2016 20:53:10 GMT (envelope-from jonathan@FreeBSD.org)
Received: (from jonathan@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4DKrAAt098343;
 Fri, 13 May 2016 20:53:10 GMT (envelope-from jonathan@FreeBSD.org)
Message-Id: <201605132053.u4DKrAAt098343@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jonathan set sender to
 jonathan@FreeBSD.org using -f
From: Jonathan Anderson <jonathan@FreeBSD.org>
Date: Fri, 13 May 2016 20:53:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r415154 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 May 2016 20:53:11 -0000

Author: jonathan (src committer)
Date: Fri May 13 20:53:10 2016
New Revision: 415154
URL: https://svnweb.freebsd.org/changeset/ports/415154

Log:
  Fix "need root" logic for PORT_DBDIR.
  
  When PORT_DBDIR is set to a user directory, we shouldn't need su to
  manipulate options. This also shouldn't depend on INSTALL_BY_USER, as
  building != installing.
  
  Approved by:	portmgr (bapt)
  Differential Revision:	https://reviews.freebsd.org/D6349

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Fri May 13 20:46:57 2016	(r415153)
+++ head/Mk/bsd.port.mk	Fri May 13 20:53:10 2016	(r415154)
@@ -5246,7 +5246,8 @@ do-config:
 	@${ECHO_MSG} "===> No options to configure"
 .else
 	@optionsdir=${OPTIONS_FILE:H}; \
-	if [ ${UID} != 0 -a -z "${INSTALL_AS_USER}" -a ! -w "${PORT_DBDIR}" ] ; then \
+	if [ ! -w "${PORT_DBDIR}" -a "`stat -f %u ${PORT_DBDIR:H}`" = 0 ]; \
+	then \
 		${ECHO_MSG} "===>  Switching to root credentials to create $${optionsdir}"; \
 		(${SU_CMD} "${SH} -c \"${MKDIR} $${optionsdir} 2> /dev/null\"") || \
 			(${ECHO_MSG} "===> Cannot create $${optionsdir}, check permissions"; exit 1); \
@@ -5282,7 +5283,8 @@ do-config:
 			${ECHO_CMD} "OPTIONS_FILE_UNSET+=$${i}" >> $${TMPOPTIONSFILE}; \
 		fi; \
 	done; \
-	if [ ${UID} != 0 -a -z "${INSTALL_AS_USER}" -a ! -w "${OPTIONS_FILE:H}" ]; then \
+	if [ ! -w "${OPTIONS_FILE:H}" -a "`stat -f %u ${OPTIONS_FILE:H}`" != ${UID} ]; \
+	then \
 		${ECHO_MSG} "===>  Switching to root credentials to write ${OPTIONS_FILE}"; \
 		${SU_CMD} "${CAT} $${TMPOPTIONSFILE} > ${OPTIONS_FILE}"; \
 		${ECHO_MSG} "===>  Returning to user credentials"; \