Apply patch to select correct min UID/GID for users. Hardcoded values

were 100/100 while Gentoo uses 1000/1000. See bug 312743
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 98 insertions, 4 deletions

diff --git a/gpe-base/gpe-login/ChangeLog b/gpe-base/gpe-login/ChangeLog
index cc40ba9fe40a..e06f3b7d9edb 100644
--- a/gpe-base/gpe-login/ChangeLog
+++ b/gpe-base/gpe-login/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gpe-base/gpe-login
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gpe-base/gpe-login/ChangeLog,v 1.8 2010/02/13 11:58:49 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/gpe-base/gpe-login/ChangeLog,v 1.9 2010/07/23 11:37:59 miknix Exp $
+
+*gpe-login-0.95-r4 (23 Jul 2010)
+
+  23 Jul 2010; Angelo Arrifano <miknix@gentoo.org>
+  -gpe-login-0.95-r3.ebuild, +gpe-login-0.95-r4.ebuild,
+  +files/gpe-login-min-uid.patch:
+  Apply patch to select correct min UID/GID for users. Hardcoded values
+  were 100/100 while Gentoo uses 1000/1000. See #312743
 
   13 Feb 2010; Angelo Arrifano <miknix@gentoo.org> -files/gentoo-badge2.png,
   gpe-login-0.95-r3.ebuild, +files/windowmanager.xsessiond-gentoo:
diff --git a/gpe-base/gpe-login/Manifest b/gpe-base/gpe-login/Manifest
index 1683fc69c6cd..7f86e9f61e85 100644
--- a/gpe-base/gpe-login/Manifest
+++ b/gpe-base/gpe-login/Manifest
@@ -1,5 +1,6 @@
 AUX gpe-login-0.95-cleanup.patch 1663 RMD160 0d5fb5ec8a86f82e21cb49a011609159a162de5d SHA1 80175c91a9323fd92d2427c09684287dd8462b2a SHA256 96852c9659de6aab449af1ec5e4e1fb3a6444496a1431f86bf3bf2a9e20affdb
 AUX gpe-login-0.95-gentoologo.patch 1229 RMD160 5fbd2bd64d7049810731a9fc5e8d789f3662da71 SHA1 a495bc0ff74376d61222a23364b08052ccf0d650 SHA256 091b67db8ea3f5b571ca5c7620c4bd718e5c76683085c894ade38f5b7b4a84ab
+AUX gpe-login-min-uid.patch 2280 RMD160 7af86c40b9d6359f5a17814cfefae8ae9ea81e4d SHA1 ecf3082a96837fb7ea26bb9a2cf75a91847dc9bc SHA256 3294ed6c1611d61ce3440f5e1444106b2103307580739892c67adaff1cf49a40
 AUX gpe-login.geometry-gentoo 69 RMD160 ebc6eef1e0d2366d095d64fd2a5d5a1d3820e992 SHA1 e30e13292b76bd21db645b54754d1be49def8c75 SHA256 4f7c92abb8b5f49008e0134e6dbf218885cf0d9dae5f3f205e504c8a77d7e688
 AUX gpe-login.pre-session-gentoo 362 RMD160 02f4531011678aed279a1e1e5f1b407ff76e5507 SHA1 7305cbb93ef7aa22a0806405caba7e2b155b36a2 SHA256 ff56b20b8fa9022c1d5234ab80861c3339ea8e498b67f09594ca0013cd06bf67
 AUX gpe-login.session-gentoo 366 RMD160 e1f9d6a9133f1c3699d524941df20337ff3fbf12 SHA1 d4f3d7bb4ebf8bbca25c7190acaaaa322e1f801b SHA256 fc24eee6bb63c66efecfb16b1e768b9b6456cf322135cf50a3c4da2f0c1b9290
@@ -10,6 +11,6 @@ AUX locale.default-gentoo 45 RMD160 ed8e5272a36a7de7e9fcbccb8b8e210a44d45d12 SHA
 AUX windowmanager.xsessiond-gentoo 99 RMD160 17bde056102b1fe21a0f1c08e972c22614f8ccc7 SHA1 7a8bf9e8018dda0c7fb46f7a4e5ab451de886271 SHA256 13fd44b19723cd94915daf8f0f814cf766657738d77653cb642f8a230d5ae0d0
 DIST gpe-login-0.95.tar.bz2 160704 RMD160 a1beb20125c44f6423d22a8b700233ae89d3a92e SHA1 8f689fd43322cc266a17b93e60e2c7635d933983 SHA256 8bea38af14c98354b1ee023475315ae3ba462d33b136a73cde9d83303b659d84
 DIST gpe-login-gentoo.png.bz2 715 RMD160 469331e0a5d0c222075d14e70da79706c471d100 SHA1 930241298c8b0a0be4769dc6435db817e41d505a SHA256 5c4ff3e8aaa5005978be7eeeeea4e6b19ca5dfba127b5371a09d5335fab3a3c1
-EBUILD gpe-login-0.95-r3.ebuild 2129 RMD160 31366950e56934f64580cd8c3e4c1e93e6614083 SHA1 2534080e5ecbec8d546bdecf8428a406e0e81b74 SHA256 0437e03df7c88c8c940ef5be26f29710c3928e0f82a27ab988d62e7753c0f661
-MISC ChangeLog 1950 RMD160 be613922eeb606f88ab2783e4ed6b41bbf05b70d SHA1 0bacdb2c2f1efc97c93fd640e58e345dc43c9111 SHA256 2fcebabf0402ebf94cb49f80c14a5d3f3ad58ca946091ab1f7059cc253921a04
+EBUILD gpe-login-0.95-r4.ebuild 2433 RMD160 d63ec56fcc3ac86df533dcb35abe9074bab9bc51 SHA1 b5a2fc6e991545cff29f35b646a6f117925bfd18 SHA256 a16804488c8be2d18bb94df9824a2db73b7680cf287dcc5599240d1fe7feca45
+MISC ChangeLog 2254 RMD160 3afb93473de2cb771953a9ffaa8f393289f6375b SHA1 4e212910616be05ff8fbd5b99508adfe35328751 SHA256 daad659b9efe6522d0a7a28e6949e97553bb7e65fe52ad4227dd8b50c9ea2d49
 MISC metadata.xml 215 RMD160 fedcb3b558152736b025a43fba9b0f72b26cab0a SHA1 7cdcbeff68c19a0ecc3bcb46b2bd094ee69cd48d SHA256 b80ac51746e7677bc32591254e54b62c49f2c6cc134fe2a29247958ba9a58a5f
diff --git a/gpe-base/gpe-login/files/gpe-login-min-uid.patch b/gpe-base/gpe-login/files/gpe-login-min-uid.patch
new file mode 100644
index 000000000000..26ece3226611
--- /dev/null
+++ b/gpe-base/gpe-login/files/gpe-login-min-uid.patch
@@ -0,0 +1,75 @@
+diff -Naurp gpe-login-0.95/configure.ac gpe-login-0.95.orig/configure.ac
+--- gpe-login-0.95/configure.ac	2008-08-13 18:12:22.000000000 +0000
++++ gpe-login-0.95.orig/configure.ac	2010-04-02 03:38:59.000000000 +0000
+@@ -4,11 +4,34 @@ AC_PREREQ(2.59)
+ AC_INIT(gpe-login,0.95,gpe-list@linuxtogo.org)
+ AC_CONFIG_SRCDIR([gpe-login.c])
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
++AM_CONFIG_HEADER([config.h:config.h.in])
+ 
+ AC_PROG_CC
+ AC_STDC_HEADERS
+ AC_PROG_INSTALL
+ 
++AC_ARG_WITH([min-valid-uid],
++            [AS_HELP_STRING([--with-min-valid-uid=N],
++              [Set the minimal UID for valid users (default: 100).])],
++            [],
++            [with_min_valid_uid=100])
++
++AS_IF([test "x$with_min_valid_uid" != "x"], [
++  AC_DEFINE_UNQUOTED([MIN_UID], [$with_min_valid_uid],
++            [Minimal UID for valid users.])
++])
++
++AC_ARG_WITH([min-valid-gid],
++            [AS_HELP_STRING([--with-min-valid-gid=N],
++              [Set the minimal GID for valid users (default: 100).])],
++            [],
++            [with_min_valid_gid=100])
++
++AS_IF([test "x$with_min_valid_gid" != "x"], [
++  AC_DEFINE_UNQUOTED([MIN_GID], [$with_min_valid_gid],
++            [Minimal GID for valid users.])
++])
++
+ 
+ DEP_MODULES="glib-2.0 >= 2.2 libgpewidget"
+ DEP_MODULES_LOCK="x11"
+diff -Naurp gpe-login-0.95/gpe-login.c gpe-login-0.95.orig/gpe-login.c
+--- gpe-login-0.95/gpe-login.c	2010-04-02 03:41:41.000000000 +0000
++++ gpe-login-0.95.orig/gpe-login.c	2010-04-02 03:40:35.000000000 +0000
+@@ -44,6 +44,13 @@
+ #include <gpe/spacing.h>
+ #include <gpe/translabel.h>
+ 
++#ifdef HAVE_CONFIG_H 
++#include <config.h> 
++#else
++#define MIN_GID 100
++#define MIN_UID 100
++#endif /* HAVE_CONFIG_H */ 
++
+ #include "gpe-ownerinfo.h"
+ 
+ #define _(x) gettext(x)
+@@ -348,7 +355,7 @@ slurp_passwd (GtkWidget *menu)
+ 	  && strcmp (pw->pw_passwd, "*"))
+ 	root_password_set = TRUE;
+ 
+-      if (pw->pw_uid < 100 || pw->pw_uid >= 65534)
++      if (pw->pw_uid < MIN_UID || pw->pw_uid >= 65534)
+ 	continue;
+ 
+       have_users = TRUE;
+@@ -717,8 +724,8 @@ enter_newuser_callback (GtkWidget *widge
+   char salt[2];
+   char buf[256];
+   char home[80];
+-  gid_t gid = 100;
+-  uid_t uid = 100;
++  gid_t gid = MIN_UID;
++  uid_t uid = MIN_GID;
+   FILE *fp;
+ 
+   username = gtk_entry_get_text (GTK_ENTRY (entry_username));
diff --git a/gpe-base/gpe-login/gpe-login-0.95-r3.ebuild b/gpe-base/gpe-login/gpe-login-0.95-r4.ebuild
index e5feb47e1c1b..f620b45857d5 100644
--- a/gpe-base/gpe-login/gpe-login-0.95-r3.ebuild
+++ b/gpe-base/gpe-login/gpe-login-0.95-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gpe-base/gpe-login/gpe-login-0.95-r3.ebuild,v 1.2 2010/02/13 11:58:49 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/gpe-base/gpe-login/gpe-login-0.95-r4.ebuild,v 1.1 2010/07/23 11:37:59 miknix Exp $
 
 GPE_TARBALL_SUFFIX="bz2"
 inherit gpe eutils autotools
@@ -14,6 +14,11 @@ SLOT="0"
 KEYWORDS="~arm ~amd64 ~x86"
 IUSE="branding"
 
+# Options for gpe-login-min-uid.patch
+GPECONF="${GPECONF}
+--with-min-valid-uid=1000
+--with-min-valid-gid=1000"
+
 DEPEND="${DEPEND} gpe-base/libgpewidget"
 RDEPEND="${RDEPEND} ${DEPEND}
 	x11-misc/xkbd
@@ -45,6 +50,11 @@ src_unpack() {
 	# the X11/Xinit.d path
 	epatch "${FILESDIR}/${P}-cleanup.patch"
 
+	# Patch to allow filtering system accounts from login window,
+	# cortesy of yvasilev: #312743
+	# This should be merged with upstream at some point.
+	epatch "${FILESDIR}/${PN}-min-uid.patch"
+
 	eautoreconf
 }