On Gentoo, minimum gid/uid for non-system is 1000, not 500.

Package-Manager: portage-2.1.2_pre1

4 files changed, 139 insertions, 11 deletions

diff --git a/sys-libs/libuser/ChangeLog b/sys-libs/libuser/ChangeLog
index 3acd2696d5b9..7b78ac17f4f2 100644
--- a/sys-libs/libuser/ChangeLog
+++ b/sys-libs/libuser/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libuser
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libuser/ChangeLog,v 1.2 2006/09/05 20:53:18 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libuser/ChangeLog,v 1.3 2006/09/22 05:36:22 dberkholz Exp $
+
+  22 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/0.54.6-raise-minimum-ids-to-1000.patch, libuser-0.54.6.ebuild:
+  On Gentoo, minimum gid/uid for non-system is 1000, not 500.
 
   05 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   libuser-0.54.6.ebuild:
diff --git a/sys-libs/libuser/Manifest b/sys-libs/libuser/Manifest
index 82cdbac1140b..c31c534d5ca7 100644
--- a/sys-libs/libuser/Manifest
+++ b/sys-libs/libuser/Manifest
@@ -1,12 +1,16 @@
+AUX 0.54.6-raise-minimum-ids-to-1000.patch 3535 RMD160 350cf24aeeb0dbb0ee56ece5f99551f9d4c4c335 SHA1 011a609148d127a1bf29d42076c1c7e8f35116f2 SHA256 90202b27376d99457649616583631c1d07bc41a09d362832810fa718004bdcfe
+MD5 225083f27d1c43a56a88cc4ce5db8689 files/0.54.6-raise-minimum-ids-to-1000.patch 3535
+RMD160 350cf24aeeb0dbb0ee56ece5f99551f9d4c4c335 files/0.54.6-raise-minimum-ids-to-1000.patch 3535
+SHA256 90202b27376d99457649616583631c1d07bc41a09d362832810fa718004bdcfe files/0.54.6-raise-minimum-ids-to-1000.patch 3535
 DIST libuser-0.54.6-2.1.src.rpm 1133192 RMD160 d77f2ee068e9ac9b9d6f0a708240da4fa15d3920 SHA1 741f564a19f1917223e12be4184f786fca9c5b01 SHA256 07f6e75b2362442d76d0f4766eba2e74cb94aa5a5cfbbca24b09bb87b2d30693
-EBUILD libuser-0.54.6.ebuild 1106 RMD160 610f654adb50892d3b98f9340ed31eee0349d79e SHA1 941d782eefcc70a2536e7a863562608a4816865b SHA256 3002a2ac7657e37b69d0776509826fda821c9c746dc8576d8ec124d44b948ae4
-MD5 7fec016951220a105ce57c6db344f74b libuser-0.54.6.ebuild 1106
-RMD160 610f654adb50892d3b98f9340ed31eee0349d79e libuser-0.54.6.ebuild 1106
-SHA256 3002a2ac7657e37b69d0776509826fda821c9c746dc8576d8ec124d44b948ae4 libuser-0.54.6.ebuild 1106
-MISC ChangeLog 533 RMD160 4cb9cdd204218956a271c06277f0730cf9f4f820 SHA1 fee68318c945004a828f00bae20ad2aa79beaa04 SHA256 dd26c48f7483f8a0edbaf908f01722ed7cb7e828df8f290842e2897ec0a40ddc
-MD5 04d3218815bea0f017638148bee306b8 ChangeLog 533
-RMD160 4cb9cdd204218956a271c06277f0730cf9f4f820 ChangeLog 533
-SHA256 dd26c48f7483f8a0edbaf908f01722ed7cb7e828df8f290842e2897ec0a40ddc ChangeLog 533
+EBUILD libuser-0.54.6.ebuild 1218 RMD160 f0bf1746b1b26b237842f7bd1ca1b276ec23fb31 SHA1 68ec6fd192ecc04c062b70fcf0ee81fbaa3ae1e7 SHA256 dfc1ee2f00f723062536d46098b30e6a1f50c1d2770a8ddd999d45a23919694d
+MD5 7468f0492698d3dd915ab85c3f8e989d libuser-0.54.6.ebuild 1218
+RMD160 f0bf1746b1b26b237842f7bd1ca1b276ec23fb31 libuser-0.54.6.ebuild 1218
+SHA256 dfc1ee2f00f723062536d46098b30e6a1f50c1d2770a8ddd999d45a23919694d libuser-0.54.6.ebuild 1218
+MISC ChangeLog 723 RMD160 4e92091fd0ba588bce4bb27f735c4a9ac23404eb SHA1 54b3bad3762b12413d579195dd0df0afd6e70e10 SHA256 a779229906552c9b832d0175bad365fa153ff72b9feec7219acbfe8cbfa2eb2c
+MD5 0170ee74a7b7cb353d2f0ad4593f6595 ChangeLog 723
+RMD160 4e92091fd0ba588bce4bb27f735c4a9ac23404eb ChangeLog 723
+SHA256 a779229906552c9b832d0175bad365fa153ff72b9feec7219acbfe8cbfa2eb2c ChangeLog 723
 MISC metadata.xml 252 RMD160 212f61f15769b523e0fa55ed5d872d85536b4043 SHA1 5f9d6137a829b96482aacd60baf98160b49dc514 SHA256 b3aaf1e941b12ded57dea3530d59b8db42716f5e805efb6338101c135beac506
 MD5 4f7fe0eacb3ba0ef618e04831e4a7517 metadata.xml 252
 RMD160 212f61f15769b523e0fa55ed5d872d85536b4043 metadata.xml 252
diff --git a/sys-libs/libuser/files/0.54.6-raise-minimum-ids-to-1000.patch b/sys-libs/libuser/files/0.54.6-raise-minimum-ids-to-1000.patch
new file mode 100644
index 000000000000..8dbb3f650600
--- /dev/null
+++ b/sys-libs/libuser/files/0.54.6-raise-minimum-ids-to-1000.patch
@@ -0,0 +1,114 @@
+Index: libuser.conf
+===================================================================
+RCS file: /usr/local/CVS/libuser/libuser.conf,v
+retrieving revision 1.1
+diff -u -b -B -r1.1 libuser.conf
+--- libuser.conf	10 Oct 2005 22:11:13 -0000	1.1
++++ libuser.conf	22 Sep 2006 05:27:53 -0000
+@@ -25,7 +25,7 @@
+ 
+ [userdefaults]
+ LU_USERNAME = %n
+-# LU_UIDNUMBER = 500
++# LU_UIDNUMBER = 1000
+ LU_GIDNUMBER = %u
+ # LU_USERPASSWORD = !!
+ # LU_GECOS = %n
+@@ -44,7 +44,7 @@
+ 
+ [groupdefaults]
+ LU_GROUPNAME = %n
+-# LU_GIDNUMBER = 500
++# LU_GIDNUMBER = 1000
+ # LU_GROUPPASSWORD = !!
+ # LU_MEMBERUID =
+ # LU_ADMINISTRATORUID =
+Index: apps/lgroupadd.1
+===================================================================
+RCS file: /usr/local/CVS/libuser/apps/lgroupadd.1,v
+retrieving revision 1.1
+diff -u -b -B -r1.1 lgroupadd.1
+--- apps/lgroupadd.1	15 Jan 2005 14:19:53 -0000	1.1
++++ apps/lgroupadd.1	22 Sep 2006 05:27:53 -0000
+@@ -45,7 +45,7 @@
+ The group is a system group.
+ Groups that are not marked as system groups
+ usually have automatically selected group IDs above a certain value
+-(500 by default).
++(1000 by default).
+ This information is also passed to the
+ .B libuser
+ backends.
+Index: apps/luseradd.1
+===================================================================
+RCS file: /usr/local/CVS/libuser/apps/luseradd.1,v
+retrieving revision 1.1
+diff -u -b -B -r1.1 luseradd.1
+--- apps/luseradd.1	15 Jan 2005 14:19:53 -0000	1.1
++++ apps/luseradd.1	22 Sep 2006 05:27:53 -0000
+@@ -104,7 +104,7 @@
+ The user is a system user.
+ Users that are not marked as system user
+ usually have automatically selected user IDs above a certain value
+-(500 by default).
++(1000 by default).
+ This information is also passed to the
+ .B libuser
+ backends.
+Index: docs/libuser.conf.5.in
+===================================================================
+RCS file: /usr/local/CVS/libuser/docs/libuser.conf.5.in,v
+retrieving revision 1.2
+diff -u -b -B -r1.2 libuser.conf.5.in
+--- docs/libuser.conf.5.in	21 Feb 2006 16:17:32 -0000	1.2
++++ docs/libuser.conf.5.in	22 Sep 2006 05:27:53 -0000
+@@ -183,7 +183,7 @@
+ .B LU_UIDNUMBER
+ A decimal number, the first allowed UID value for regular users (not system
+ users).
+-Default value is \fB500\fR.
++Default value is \fB1000\fR.
+ 
+ .P
+ All other variables have the same names as the attribute names from
+@@ -222,7 +222,7 @@
+ .B LU_GIDNUMBER
+ A decimal number, the first allowed GID value for regular groups (not system
+ groups).
+-Default value is \fB500\fR.
++Default value is \fB1000\fR.
+ 
+ .P
+ The other variables follow the same rules as in the
+Index: lib/user.c
+===================================================================
+RCS file: /usr/local/CVS/libuser/lib/user.c,v
+retrieving revision 1.81
+diff -u -b -B -r1.81 user.c
+--- lib/user.c	6 Mar 2006 03:02:52 -0000	1.81
++++ lib/user.c	22 Sep 2006 05:27:54 -0000
+@@ -33,7 +33,7 @@
+ #include "user_private.h"
+ #include "internal.h"
+ 
+-#define DEFAULT_ID 500
++#define DEFAULT_ID 1000
+ 
+ enum lu_dispatch_id {
+ 	uses_elevated_privileges = 0x0003,
+Index: python/admin.c
+===================================================================
+RCS file: /usr/local/CVS/libuser/python/admin.c,v
+retrieving revision 1.43
+diff -u -b -B -r1.43 admin.c
+--- python/admin.c	1 May 2006 04:51:21 -0000	1.43
++++ python/admin.c	22 Sep 2006 05:27:55 -0000
+@@ -1308,7 +1308,7 @@
+ 	char *keywords[] = { "start", NULL };
+ 	struct libuser_admin *me = (struct libuser_admin *) self;
+ 
+-	PY_LONG_LONG start = 500;
++	PY_LONG_LONG start = 1000;
+ 
+ 	g_return_val_if_fail(self != NULL, NULL);
+ 
diff --git a/sys-libs/libuser/libuser-0.54.6.ebuild b/sys-libs/libuser/libuser-0.54.6.ebuild
index dfca0d4c085c..b368bd049cf0 100644
--- a/sys-libs/libuser/libuser-0.54.6.ebuild
+++ b/sys-libs/libuser/libuser-0.54.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libuser/libuser-0.54.6.ebuild,v 1.2 2006/09/05 20:53:18 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libuser/libuser-0.54.6.ebuild,v 1.3 2006/09/22 05:36:22 dberkholz Exp $
 
-inherit rpm
+inherit eutils rpm
 
 # Revision of the RPM. Shouldn't affect us, as we're just grabbing the source
 # tarball out of it
@@ -26,6 +26,12 @@ RDEPEND="=dev-libs/glib-2*
 	sasl? ( dev-libs/cyrus-sasl )"
 DEPEND="${RDEPEND}"
 
+src_unpack() {
+	rpm_src_unpack
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-raise-minimum-ids-to-1000.patch
+}
+
 src_compile() {
 	econf \
 		$(use_with ldap) \