summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin>2015-10-15 10:40:52 +0000
committerjperkin <jperkin>2015-10-15 10:40:52 +0000
commitdddf74d84fe00929df5a2139edfff6ea9049a1ab (patch)
tree44c82afa31e5f8609f1d5556bcbef22b91eb8428
parent626944b6a9adf2f33ba4b217b5dc58172c014c6c (diff)
downloadpkgsrc-dddf74d84fe00929df5a2139edfff6ea9049a1ab.tar.gz
Update user-darwin to version 20151015.
Increase the pkgsrc UID range to 300-499. We can no longer afford to avoid conflicts with the 400-499 range used by Fink, as pkgsrc now has around 200 users and the previous range was insufficient for bulk builds. Ideally there would be a way to use a temporary OpenDirectory database for builds, as while a large range is required for full bulk builds and we're going to hit even this additional limit soon, it's unlikely a user installation will require the full range. However, finding a way to do this is proving elusive.
-rw-r--r--sysutils/user_darwin/Makefile4
-rwxr-xr-xsysutils/user_darwin/files/useradd.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/sysutils/user_darwin/Makefile b/sysutils/user_darwin/Makefile
index 8454556b911..c243f0cd75e 100644
--- a/sysutils/user_darwin/Makefile
+++ b/sysutils/user_darwin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2014/10/09 14:07:00 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2015/10/15 10:40:52 jperkin Exp $
#
-DISTNAME= user-darwin-20130712
+DISTNAME= user-darwin-20151015
CATEGORIES= sysutils
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/sysutils/user_darwin/files/useradd.sh b/sysutils/user_darwin/files/useradd.sh
index 2f3bd9087cc..de6a0b7ba08 100755
--- a/sysutils/user_darwin/files/useradd.sh
+++ b/sysutils/user_darwin/files/useradd.sh
@@ -21,12 +21,12 @@ getnextuid()
{
# Find an unused UID. Constraints:
# * must be <500 (typical OS X user accounts are 500 and up)
- # * must be <400 (Fink uses 400 and up)
# * must be from a reasonably sized range
+ # As of El Capitan, Apple use up to UID 252 for system accounts.
used_uids=`nireport . /users uid 2>/dev/null || \
dscl . -readall /users UniqueID | grep '^UniqueID:' | cut -d' ' -f2`
- low_uid=300; high_uid=399
+ low_uid=300; high_uid=499
# Try to use the GID as the UID.
maybe_uid=$1