svn commit: r425033 - head/Mk/Scripts

[Bryan Drewery]

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