From owner-svn-ports-all@freebsd.org  Mon Oct 31 22:37:22 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 82E45C28068;
 Mon, 31 Oct 2016 22:37:22 +0000 (UTC)
 (envelope-from bdrewery@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 414CF12CB;
 Mon, 31 Oct 2016 22:37:22 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9VMbLUg016162;
 Mon, 31 Oct 2016 22:37:21 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9VMbL1d016161;
 Mon, 31 Oct 2016 22:37:21 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201610312237.u9VMbL1d016161@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 31 Oct 2016 22:37:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r425033 - head/Mk/Scripts
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.23
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: Mon, 31 Oct 2016 22:37:22 -0000

Author: bdrewery
Date: Mon Oct 31 22:37:21 2016
New Revision: 425033
URL: https://svnweb.freebsd.org/changeset/ports/425033

Log:
  Fix package upgrade setting wrong ownership on a package's $HOME.
  
  This happens when the UID/GID doesn't match the expected number from
  UIDs/GIDs.
  
  https://github.com/freebsd/pkg/issues/1485 has more details.
  
  With hat:	portmgr
  Discussed with:	bapt, mat

Modified:
  head/Mk/Scripts/do-users-groups.sh

Modified: head/Mk/Scripts/do-users-groups.sh
==============================================================================
--- head/Mk/Scripts/do-users-groups.sh	Mon Oct 31 21:52:51 2016	(r425032)
+++ head/Mk/Scripts/do-users-groups.sh	Mon Oct 31 22:37:21 2016	(r425033)
@@ -117,7 +117,7 @@ if [ -n "${USERS}" ]; then
 				/|/nonexistent|/var/empty)
 					;;
 				*)
-					echo "${dp_INSTALL} -d -g $gid -o $uid $homedir" >> "${dp_UG_INSTALL}"
+					echo "${dp_INSTALL} -d -g $login -o $login $homedir" >> "${dp_UG_INSTALL}"
 					;;
 			esac
 		done <<-eot