fix distcc-config to default to uid 240, to close bug 35096

4 files changed, 17 insertions, 9 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 3d5af542434f..ee5a18b65c65 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/distcc
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.84 2003/11/21 17:52:44 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.85 2003/12/06 17:31:03 lisa Exp $
+
+  06 Dec 2003; Lisa Seelye <lisa@gentoo.org> files/2.11/distcc-config,
+  files/2.11.1p/distcc-config:
+  fix distcc-config to default to uid 240, to close bug 35096
+
+  06 Dec 2003; Lisa Seelye <lisa@gentoo.org> files/2.11.1p/distcc-config:
+  fix distcc-config to default to uid 240, to close bug 35096 (will fix the
+  lower versions in a second)
 
 *distcc-2.11.2-r1 (21 Nov 2003)
 
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index fbdc407f8293..70b69a57a5d5 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,4 +1,4 @@
-MD5 378661e1e8b4b2d84165a8a2f64a84e8 ChangeLog 14882
+MD5 85e933f334cd09c026d4c8dc273825f0 ChangeLog 15228
 MD5 16bbbf9b6b111668ff00046829e6b917 distcc-2.11.2-r1.ebuild 4051
 MD5 a1b583a4f17172ee9b85bfaecb7dee21 distcc-2.11.1.ebuild 3927
 MD5 6d0efb7bb3a7e30546d91844510da07d distcc-2.5-r1.ebuild 3215
@@ -17,10 +17,10 @@ MD5 813a6a43167076da271ef55188a77826 files/2.10/init 630
 MD5 3375d451fca8db4a3280b16679bc5858 files/2.10/distcc-config 7560
 MD5 e40dfa1f21a9a2301faaff21cf76e7d8 files/2.11/conf 655
 MD5 c8ff220b60c105fcede2c72f274995db files/2.11/init 630
-MD5 272d85cd71c7dd7eaf3772f895371a41 files/2.11/distcc-config 7560
+MD5 034d45b94b38d1410759852e4551373d files/2.11/distcc-config 7567
 MD5 66c4af6f8dd87d270e5da50341ca6e14 files/2.11.1p/conf 658
 MD5 606dd55609a04a0f21b9875259148332 files/2.11.1p/init 633
-MD5 d6231008aeb96f8c680e514d451c6d78 files/2.11.1p/distcc-config 4792
+MD5 07aefc863b9fc1f2fdf9fca1988b1977 files/2.11.1p/distcc-config 4806
 MD5 ee4f0fde9d5e6fe88bf7f513cf12920c files/2.8/001_fix_tempfile.patch.gz 251
 MD5 41f782125d594b7249fcd1fc6c306b02 files/2.8/conf 592
 MD5 9e01d7b626696716500bbf56c68a5680 files/2.8/distcc-config 7559
diff --git a/sys-devel/distcc/files/2.11.1p/distcc-config b/sys-devel/distcc/files/2.11.1p/distcc-config
index 950e6ec6dddc..a5f303feeb75 100644
--- a/sys-devel/distcc/files/2.11.1p/distcc-config
+++ b/sys-devel/distcc/files/2.11.1p/distcc-config
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.11.1p/distcc-config,v 1.2 2003/11/21 17:52:44 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.11.1p/distcc-config,v 1.3 2003/12/06 17:31:04 lisa Exp $
 
 import os, re, signal, sys, commands, pwd
 from string import rstrip
@@ -126,8 +126,8 @@ elif '--install' in tmpcmdline:
 	distcc_env.write('DCCC_PATH="/usr/lib/distcc/bin"\n')
 	distcc_env.write('DISTCC_VERBOSE="0"\n')
 	
-	if os.WEXITSTATUS(commands.getstatusoutput('/usr/sbin/useradd -g daemon -s /bin/false -d /dev/null -c "distccd" distcc')[0]) == 9:
-		os.WEXITSTATUS(commands.getstatusoutput('/usr/sbin/usermod -g daemon -s /bin/false -d /dev/null -c "distccd" distcc')[0])
+	if os.WEXITSTATUS(commands.getstatusoutput('/usr/sbin/useradd -u 240 -g daemon -s /bin/false -d /dev/null -c "distccd" distcc')[0]) == 9:
+		os.WEXITSTATUS(commands.getstatusoutput('/usr/sbin/usermod -u 240 -g daemon -s /bin/false -d /dev/null -c "distccd" distcc')[0])
 
 	foobar = pwd.getpwnam('distcc')
 	user   = foobar[2]
diff --git a/sys-devel/distcc/files/2.11/distcc-config b/sys-devel/distcc/files/2.11/distcc-config
index 72fdff6b662e..3f0e143f9cd6 100644
--- a/sys-devel/distcc/files/2.11/distcc-config
+++ b/sys-devel/distcc/files/2.11/distcc-config
@@ -8,7 +8,7 @@
 # This script developed by Zachary T Welch at Superlucidity Services, LLC
 #  based on ideas from irc discussion and the clear need for this support
 # 
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.11/distcc-config,v 1.1 2003/09/24 00:46:02 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.11/distcc-config,v 1.2 2003/12/06 17:31:04 lisa Exp $
 # Changelog
 # 
 # 21 Jul 2003 - Changed install environment to EXCLUDE DISTCC_HOSTS from /etc/env.d/02distcc.
@@ -87,7 +87,7 @@ dccc_install_user() {
 	USERFIX="/usr/sbin/${USERFIX}"
 	if [ -x "${USERFIX}" ]
 	then
-		if ! ${USERFIX} -g daemon -s /bin/false -d /dev/null \
+		if ! ${USERFIX} -u 240 -g daemon -s /bin/false -d /dev/null \
 				-c "distccd" distcc 
 		then
 			dccc_exit "unable to create or modify user"