From 395cf1ce11ed109ed0d027e200c9ddef0eb6e82e Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@gentoo.org>
Date: Wed, 23 Jun 2010 21:24:50 +0000
Subject: [PATCH] Add -r to groupadd and useradd so that users and groups
 created on Linux are created in the system range as defined by login.defs.
 Fixes bug #264519 & bug #262559

---
 eclass/eutils.eclass | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index c2b407a1c0bc..5bc2c72a3809 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.344 2010/05/20 02:21:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.345 2010/06/23 21:24:50 cardoe Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -708,13 +708,13 @@ enewuser() {
 
 	*)
 		if [[ -z $@ ]] ; then
-			useradd ${opts} \
+			useradd -r ${opts} \
 				-c "added by portage for ${PN}" \
 				${euser} \
 				|| die "enewuser failed"
 		else
 			einfo " - Extra: $@"
-			useradd ${opts} "$@" \
+			useradd -r ${opts} "$@" \
 				${euser} \
 				|| die "enewuser failed"
 		fi
@@ -837,7 +837,8 @@ enewgroup() {
 		;;
 
 	*)
-		groupadd ${opts} ${egroup} || die "enewgroup failed"
+		# We specify -r so that we get a GID in the system range from login.defs
+		groupadd -r ${opts} ${egroup} || die "enewgroup failed"
 		;;
 	esac
 	export SANDBOX_ON="${oldsandbox}"
-- 
2.26.2