(#10486) Don't run Xwilling script as the nobody user, /bin/false can't run anything (Kashif Shaikh). (#12767) Use sessreg to register and unregister sessions with wtmp and utmp (Arcady Genkin). (#70689) Set defaultvt to vt7 rather than blank; part of the 'Start login manager sooner' optimization. This also requires updating the xinit dep to 1.0.2-r2.

(Portage version: 2.1_pre7-r5)

6 files changed, 57 insertions, 9 deletions

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index 1a3b94af446e..03d2482c8f1e 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-apps/xdm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.40 2006/04/20 05:38:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.41 2006/04/20 06:34:22 spyderous Exp $
+
+*xdm-1.0.3-r1 (20 Apr 2006)
+
+  20 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; +files/wtmp.patch,
+  +files/xwilling-hang.patch, -xdm-1.0.3.ebuild, +xdm-1.0.3-r1.ebuild:
+  (#10486) Don't run Xwilling script as the nobody user, /bin/false can't run
+  anything (Kashif Shaikh). (#12767) Use sessreg to register and unregister
+  sessions with wtmp and utmp (Arcady Genkin). (#70689) Set defaultvt to vt7
+  rather than blank; part of the 'Start login manager sooner' optimization.
+  This also requires updating the xinit dep to 1.0.2-r2.
 
   20 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; -files/xdm.start:
   Remove unused file.
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index c67bf56b806c..f55368d3a83e 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -4,15 +4,15 @@ SHA256 4a37c2ad698e9936e4d9c8c73553a472e2a620f8a51fc3576a73f0ab4d31e594 ChangeLo
 MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/Xsession 1521
 RMD160 c02efb9e96a8dc836d71aa1b47c36358ad61129c files/Xsession 1521
 SHA256 8a09cd1cef9ebce190e13009e8b21a8504eac1cec3fc31a10d3740b6c7aa49b6 files/Xsession 1521
-MD5 5125d709aee8c1d22f4e6a1c6b1cb431 files/digest-xdm-1.0.3 232
-RMD160 bff021630b720e9145e1698a5c9813de415451e3 files/digest-xdm-1.0.3 232
-SHA256 07f9231d76c3ab21b874127d4d269f35516a76cdf91322b959e78cc640ed3979 files/digest-xdm-1.0.3 232
+MD5 5125d709aee8c1d22f4e6a1c6b1cb431 files/digest-xdm-1.0.3-r1 232
+RMD160 bff021630b720e9145e1698a5c9813de415451e3 files/digest-xdm-1.0.3-r1 232
+SHA256 07f9231d76c3ab21b874127d4d269f35516a76cdf91322b959e78cc640ed3979 files/digest-xdm-1.0.3-r1 232
 MD5 4a17967449d093f6430fbee47a24afba files/xdm.pamd 169
 RMD160 a48ee2ed15d64412fb0035b3c18fe602d6175501 files/xdm.pamd 169
 SHA256 edf108933d7ebfdd0b601e7bbe0a47601f16a5e45a1af26fde3eefce8079a288 files/xdm.pamd 169
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 321c383362bb0a0b4a0a404ef11d2f05 xdm-1.0.3.ebuild 1223
-RMD160 afc6a93f3495f919048b9ec87bfa22957d1a23ca xdm-1.0.3.ebuild 1223
-SHA256 b5d758f42ed2391a87532922a7fec1fdfbaa84a05f78b47962d5064b4fcbb46a xdm-1.0.3.ebuild 1223
+MD5 accfba2bfa6e7dc0d45ff552576d44d0 xdm-1.0.3-r1.ebuild 1272
+RMD160 3b9972795ba053dd12954e17635c79e4149eb435 xdm-1.0.3-r1.ebuild 1272
+SHA256 53b6998566382857b093c5594fa1064f2c329cfcc9f0a774013d4f2130249cba xdm-1.0.3-r1.ebuild 1272
diff --git a/x11-apps/xdm/files/digest-xdm-1.0.3-r1 b/x11-apps/xdm/files/digest-xdm-1.0.3-r1
new file mode 100644
index 000000000000..ca5e8506386b
--- /dev/null
+++ b/x11-apps/xdm/files/digest-xdm-1.0.3-r1
@@ -0,0 +1,3 @@
+MD5 4540fd015672f8fb8590ab16f4974cfe xdm-1.0.3.tar.bz2 352952
+RMD160 ce94a9c7c4cf690f4caa9a05f47918634240e987 xdm-1.0.3.tar.bz2 352952
+SHA256 086cd942e96e0a4cd111107aa59f4d9aca0e8ac05a4c350a5855a9ac0cc4bada xdm-1.0.3.tar.bz2 352952
diff --git a/x11-apps/xdm/files/wtmp.patch b/x11-apps/xdm/files/wtmp.patch
new file mode 100644
index 000000000000..6d2d0a9c3441
--- /dev/null
+++ b/x11-apps/xdm/files/wtmp.patch
@@ -0,0 +1,18 @@
+diff -urN xdm-1.0.3.orig/config/GiveConsole xdm-1.0.3/config/GiveConsole
+--- xdm-1.0.3.orig/config/GiveConsole	2006-04-19 22:40:45.000000000 -0700
++++ xdm-1.0.3/config/GiveConsole	2006-04-19 23:06:51.000000000 -0700
+@@ -8,3 +8,5 @@
+ # causing serious grief.
+ #
+ chown $USER /dev/console
++/usr/bin/sessreg -a -w "/var/log/wtmp" -u "/var/run/utmp" \
++	-x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
+diff -urN xdm-1.0.3.orig/config/TakeConsole xdm-1.0.3/config/TakeConsole
+--- xdm-1.0.3.orig/config/TakeConsole	2006-04-19 22:40:45.000000000 -0700
++++ xdm-1.0.3/config/TakeConsole	2006-04-19 23:07:37.000000000 -0700
+@@ -5,3 +5,5 @@
+ #
+ chmod 622 /dev/console
+ chown root /dev/console
++/usr/bin/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \
++	-x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
diff --git a/x11-apps/xdm/files/xwilling-hang.patch b/x11-apps/xdm/files/xwilling-hang.patch
new file mode 100644
index 000000000000..93a0b14fd54a
--- /dev/null
+++ b/x11-apps/xdm/files/xwilling-hang.patch
@@ -0,0 +1,11 @@
+--- xdm-1.0.3.orig/config/xdm-config.cpp	2006-04-19 22:40:45.000000000 -0700
++++ xdm-1.0.3/config/xdm-config.cpp	2006-04-19 23:10:44.000000000 -0700
+@@ -18,7 +18,7 @@
+ DisplayManager.servers:		XDMCONFIGDIR/Xservers
+ DisplayManager.accessFile:	XDMCONFIGDIR/Xaccess
+ DisplayManager*resources:	XDMCONFIGDIR/Xresources
+-DisplayManager.willing:		SU nobody -c XDMSCRIPTDIR/Xwilling
++DisplayManager.willing:		XDMSCRIPTDIR/Xwilling
+ ! All displays should use authorization, but we cannot be sure
+ ! X terminals may not be configured that way, so they will require
+ ! individual resource settings.
diff --git a/x11-apps/xdm/xdm-1.0.3.ebuild b/x11-apps/xdm/xdm-1.0.3-r1.ebuild
index a65c5fd387f5..65738f831827 100644
--- a/x11-apps/xdm/xdm-1.0.3.ebuild
+++ b/x11-apps/xdm/xdm-1.0.3-r1.ebuild
@@ -1,27 +1,33 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.0.3.ebuild,v 1.2 2006/04/02 15:03:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.0.3-r1.ebuild,v 1.1 2006/04/20 06:34:22 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
 
 inherit multilib x-modular pam
 
+DEFAULTVT="vt7"
+
 DESCRIPTION="X.Org xdm application"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="xprint ipv6 pam"
 RDEPEND="x11-apps/xrdb
 	x11-libs/libXdmcp
 	x11-libs/libXaw
-	>=x11-apps/xinit-0.99.1_pre20050905-r1
+	>=x11-apps/xinit-1.0.2-r2
 	x11-libs/libX11
 	x11-libs/libXt"
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
+PATCHES="${FILESDIR}/wtmp.patch
+	${FILESDIR}/xwilling-hang.patch"
+
 CONFIGURE_OPTIONS="$(use_enable xprint)
 	$(use_enable ipv6)
 	$(use_with pam)
+	--with-default-vt=${DEFAULTVT}
 	--with-xdmconfigdir=/etc/X11/xdm"
 
 pkg_setup() {