From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 13 21:10:12 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 534C3106566C for ; Sun, 13 Mar 2011 21:10:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 15C3C8FC14 for ; Sun, 13 Mar 2011 21:10:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p2DLAB5E002983 for ; Sun, 13 Mar 2011 21:10:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p2DLABch002982; Sun, 13 Mar 2011 21:10:11 GMT (envelope-from gnats) Resent-Date: Sun, 13 Mar 2011 21:10:11 GMT Resent-Message-Id: <201103132110.p2DLABch002982@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Eitan Adler Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29B46106564A for ; Sun, 13 Mar 2011 21:04:38 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id F342D8FC08 for ; Sun, 13 Mar 2011 21:04:37 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p2DL4bgW056134 for ; Sun, 13 Mar 2011 21:04:37 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p2DL4bbt056133; Sun, 13 Mar 2011 21:04:37 GMT (envelope-from nobody) Message-Id: <201103132104.p2DL4bbt056133@red.freebsd.org> Date: Sun, 13 Mar 2011 21:04:37 GMT From: Eitan Adler To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/155543: [bsd.port.mk] [patch] currently id -0 is run a number of times despite X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Mar 2011 21:10:12 -0000 >Number: 155543 >Category: ports >Synopsis: [bsd.port.mk] [patch] currently id -0 is run a number of times despite >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Mar 13 21:10:11 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Eitan Adler >Release: >Organization: >Environment: >Description: id -u is run a number of times throughout bsd.port.mk. The first time the value gets stored into a variable UID. The attached patch attempts to use the cached value instead of running id multiple times. Aside from the typical exp-run required this patch needs to be tested when installing by a non-root user and when switching back and forth (via su_cmd). >How-To-Repeat: >Fix: Index: bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.674 diff -u -r1.674 bsd.port.mk --- bsd.port.mk 7 Mar 2011 07:32:05 -0000 1.674 +++ bsd.port.mk 13 Mar 2011 20:41:51 -0000 @@ -3655,7 +3655,7 @@ fi; \ done .if !defined(EXTRACT_PRESERVE_OWNERSHIP) - @if [ `${ID} -u` = 0 ]; then \ + @if [ ${UID} = 0 ]; then \ ${CHMOD} -R ug-s ${WRKDIR}; \ ${CHOWN} -R 0:0 ${WRKDIR}; \ fi @@ -4076,7 +4076,7 @@ .if !target(install-mtree) install-mtree: @${MKDIR} ${PREFIX} - @if [ `${ID} -u` != 0 ]; then \ + @if [ ${UID} != 0 ]; then \ if [ -w ${PREFIX}/ ]; then \ ${ECHO_MSG} "Warning: not superuser, you may get some errors during installation."; \ else \ @@ -4085,7 +4085,7 @@ fi; \ fi .if !defined(NO_MTREE) - @if [ `${ID} -u` = 0 ]; then \ + @if [ ${UID} = 0 ]; then \ if [ ! -f ${MTREE_FILE} ]; then \ ${ECHO_MSG} "Error: mtree file \"${MTREE_FILE}\" is missing."; \ ${ECHO_MSG} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \ @@ -6135,7 +6135,7 @@ ${ECHO_CMD} WITHOUT_$${i}=true >> $${TMPOPTIONSFILE}; \ fi; \ done; \ - if [ `${ID} -u` != 0 -a "x${INSTALL_AS_USER}" = "x" ]; then \ + if [ ${UID} != 0 -a "x${INSTALL_AS_USER}" = "x" ]; then \ ${ECHO_MSG} "===> Switching to root credentials to write ${OPTIONSFILE}"; \ ${SU_CMD} "${CAT} $${TMPOPTIONSFILE} > ${OPTIONSFILE}"; \ ${ECHO_MSG} "===> Returning to user credentials"; \ @@ -6228,7 +6228,7 @@ .if defined(OPTIONS) && exists(${OPTIONSFILE}) -@${ECHO_MSG} "===> Removing user-configured options for ${PKGNAME}"; \ optionsdir=${OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \ - if [ `${ID} -u` != 0 -a "x${INSTALL_AS_USER}" = "x" ]; then \ + if [ ${UID} != 0 -a "x${INSTALL_AS_USER}" = "x" ]; then \ ${ECHO_MSG} "===> Switching to root credentials to remove ${OPTIONSFILE} and $${optionsdir}"; \ ${SU_CMD} "${RM} -f ${OPTIONSFILE} ; \ ${RMDIR} $${optionsdir}"; \ >Release-Note: >Audit-Trail: >Unformatted: