From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Aug 7 08:00:22 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 28E7E1065672 for ; Sun, 7 Aug 2011 08:00:22 +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 08ECA8FC0C for ; Sun, 7 Aug 2011 08:00:22 +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 p7780L7S030069 for ; Sun, 7 Aug 2011 08:00:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p7780LDC030068; Sun, 7 Aug 2011 08:00:21 GMT (envelope-from gnats) Resent-Date: Sun, 7 Aug 2011 08:00:21 GMT Resent-Message-Id: <201108070800.p7780LDC030068@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, Sahil Tandon Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AEA39106566B for ; Sun, 7 Aug 2011 07:51:33 +0000 (UTC) (envelope-from sahil@spartan.hamla.org) Received: from spartan.hamla.org (spartan.hamla.org [206.251.255.30]) by mx1.freebsd.org (Postfix) with ESMTP id 93AD38FC12 for ; Sun, 7 Aug 2011 07:51:33 +0000 (UTC) Received: by spartan.hamla.org (Postfix, from userid 1001) id 207FE170F9; Sun, 7 Aug 2011 03:52:02 -0400 (EDT) Message-Id: <20110807075202.207FE170F9@spartan.hamla.org> Date: Sun, 7 Aug 2011 03:52:02 -0400 (EDT) From: Sahil Tandon To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: ohauer@FreeBSD.org, portmgr@FreeBSD.org Subject: ports/159577: [PATCH] ports/Mk/bsd.port.mk: fix and simplify adding USERS to GROUPS X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Sahil Tandon List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Aug 2011 08:00:22 -0000 >Number: 159577 >Category: ports >Synopsis: [PATCH] ports/Mk/bsd.port.mk: fix and simplify adding USERS to GROUPS >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Aug 07 08:00:21 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Sahil Tandon >Release: FreeBSD 9.0-CURRENT i386 >Organization: >Environment: >Description: In the attached patch, I aim to fix the USERS/GROUPS problem described in a recent thread on freebsd-ports: http://lists.freebsd.org/pipermail/freebsd-ports/2011-August/069053.html I also removed a DEBUG line that I believe was unintentionally committed as an artifact of ports/152498 (see flz's last comment in the audit-trail). >How-To-Repeat: See abovementioned thread. >Fix: --- bsd.port.mk.diff begins here --- Index: bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.690 diff -u -r1.690 bsd.port.mk --- bsd.port.mk 21 Jul 2011 15:10:46 -0000 1.690 +++ bsd.port.mk 7 Aug 2011 07:36:02 -0000 @@ -4237,14 +4237,13 @@ IFS=","; for _login in $$members; do \ for _user in ${USERS}; do \ if [ "x$${_user}" = "x$${_login}" ]; then \ - list=`${PW} usershow $${_login} -P | ${SED} -ne 's/.*Groups: //p'`; \ - ${ECHO_MSG} "Setting \`$${_login}' groups to \`$$list$${list:+,}${_group}'."; \ - ${PW} usermod $${_login} -G $$list$${list:+,}${_group}; \ - ${ECHO_CMD} "@exec list=\`${PW} usershow $${_login} -P | ${SED} -ne 's/.*Groups: //p'\`; \ - echo \"Setting '$${_login}' groups to '$$list$${list:+,}${_group}'.\"; \ - ${PW} usermod $${_login} -G $${list},${_group}" >> ${TMPPLIST}; \ - else \ - ${ECHO_MSG} "==> DEBUG skip login $${_login} => not defined in USERS \"( ${USERS} )\""; \ + if ! ${PW} groupshow ${_group} | ${GREP} -qw $${_login}; then \ + ${ECHO_MSG} "Adding user \`$${_login}' to group \`${_group}'."; \ + ${PW} groupmod ${_group} -m $${_login}; \ + fi; \ + ${ECHO_CMD} "@exec if ! ${PW} groupshow ${_group} | ${GREP} -qw $${_login}; then \ + echo \"Adding user '$${_login}' to group '${_group}'.\"; \ + ${PW} groupmod ${_group} -m $${_login}; fi" >> ${TMPPLIST}; \ fi; \ done; \ done; \ --- bsd.port.mk.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: