Fix xdm init script for entrance, bug #439760.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

4 files changed, 226 insertions, 5 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 2e6ec319489a..fde1f05064e2 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.685 2012/11/10 23:23:30 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.686 2012/11/11 01:49:30 chithanh Exp $
+
+  11 Nov 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xdm.initd-9, xorg-server-1.13.0-r1.ebuild:
+  Fix xdm init script for entrance, bug #439760.
 
 *xorg-server-1.13.0-r1 (10 Nov 2012)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f21072e076dd..b76cf238c3fd 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -4,6 +4,7 @@ AUX xdm.confd-4 562 SHA256 9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5
 AUX xdm.initd-3 5662 SHA256 36a4b4e5fcb4f7ae303e1dfc20b1ec005a7ada9448ebb96e518d8c992feb5475 SHA512 a1b8debcbd1eab7e1921e8a59ee01864bb8332aa4e0910336f24df53e085a1dee7b9a10c0fdf5f4db7ec72b3d711045fe0162f40472a4098abf4955c1d5c9d0a WHIRLPOOL 4eb0d5918d72e497a4c3b87f7948a2c4d223767dfc8281a89d3aba92ef3f1ba2d5d1fdd639e54839bacee24577ae8a768b64ca161bfeb226906e3ce30689326e
 AUX xdm.initd-5 5721 SHA256 de1a07296c7248a90fc39212f9b586816fd2f911af71624ad13ef55bf8a0fefa SHA512 014d4dbd7beb236f6c6260953c0c07744211fabd667426b76f5b87030bff5e8b1d1b98c938f1987ba436b5313888134cff18186afdf02627eacdd95b4a3660e8 WHIRLPOOL 921133ec9640aa4b71b91fd5694d3712ef07dda8a26c0a6e33f33cfb9facfefbc5b048f4472e19e19946b47a9a812459ce268952a09a1a64715f0f93d9259c48
 AUX xdm.initd-8 5702 SHA256 f5f97f5ac47738f352d172185b9256c78562a91510fd3d69dbc87bb3a5d0814f SHA512 daa949c3804d8480a0d6568c02ce2b9f2c3a51f4b630762e119e3faa9d03a4632c76589cb4e6eaca26dce73fe2cbfab9a7bf81726f9c4a65c65895f224b7a12c WHIRLPOOL d292e260d1fa1b85da01a44b009b7aa3d7ff534eabd5dd691a59f2548bcdb6d86218446fa99eca3810648abaa6f033b0299fdda364b232600d1cf4087ac2d4ea
+AUX xdm.initd-9 5700 SHA256 96b1fe826db2b46b08e055d57bffd9405616b7980d9e40e95f19e52bc49eef3f SHA512 a4f652aff6a03d902da7ce1c706396911e853e78031d3246b764cb67930f20935d5aa912834add9f839742e824c380d2793b6b62592a10ad1bde646623b419d3 WHIRLPOOL ebddb96a2552a76f1d2f13b25dd773c822e8a0a5135f950163426477c689d0c35a74946a3323103d604783244e3a2f0bee5f5009b50828c90227370b13c433a9
 AUX xorg-cve-2011-4028+4029.patch 671 SHA256 76b9bb4a928fa7179eb52ab3b2bd2ef6d7db83e0543ba80de37cdab05efa601c SHA512 1474c1045de134ec3224bd77d71ab00b57fcd0983eb2f45719ba3916f93020526ae0b4b62578ac8803556ad129d086f814acc957910df4d343d935c7556702ef WHIRLPOOL 183b05d47989b4c4991b37c9007d5b376ff44b627652c92da52eb93c61e452a7214467ad0366fcb2aebed8b65e4a473faa6cc52eb57d54c22a89c5616a602748
 AUX xorg-server-1.11-disable-tests-without-ddx.patch 2184 SHA256 e3b92e31843ff5046a96d3c4eb6ce67ab00e6422ffe92e7e7d13424b67dc844e SHA512 d6abd8d50f341ff1d7971c45ab44b50b7ca27cfe84418047f2d0ca722d22f0c5da54753bd80d7e172b3fc54b7aee79b526af5c9444f3c711e3dc6d596cbfcbbf WHIRLPOOL ba2239350399bfddf70968e8126f773fe3b64943f7b87691587a48fb0aa7553338315825c1d619dbebbee04b9fd1ed8326bd432969148ed012abd2e790c7d795
 AUX xorg-server-1.11-dix-pointerrootwin-send-focusin.patch 970 SHA256 c65e3499f6f2974d00bfcec6f6c6826982e87327b61d9621dce6c2bf26949a7d SHA512 6bae6d30aed0389f0f858b3d3cddd03bad15ec8c21bbf741c30b6163b69066a8dec311a48b82fe44aeab13d4258eac82e9ebb53c84150f60846e3a7f7c266163 WHIRLPOOL 1e3bdd0c95b136410c63dfa380c1b696bec6570aef110c4e526503e54c081e86ddb3e02a49c76ecf52433efa58a1a74bbd00255ac24d5f6db6980f4a674ee839
@@ -29,9 +30,9 @@ EBUILD xorg-server-1.11.4-r1.ebuild 7327 SHA256 30bc70e87963b3d77d8afbd601e5b484
 EBUILD xorg-server-1.12.2.ebuild 7041 SHA256 ada60fc7b00e3b01b5feada0f1747655db8b69c6c51c8521031ada65d574d85a SHA512 145ea8acda707d48f667e2c41de42c0da448d97d8db3be02be864f1890f73992d438fb96bc7a3e9a7affde044b891a2b7ccb9444a0fd3461ba9d573482128e94 WHIRLPOOL 6969f2ca0e1d2080ae952b19ceafe74aa981816ee87ae2ad368717090f516c51399053d921dc1ad1307beaacf2c3b0b4d02e54e093791a44e54c02bd4854cfa6
 EBUILD xorg-server-1.12.3.ebuild 7000 SHA256 b94249687067305cf8f23c23ba408eefec0d6d22a5626a134878b7c53682f3d3 SHA512 278ed71b622b90632c2925df13a8696ac4066acc289eb08cfa7a4dd77d8ba403e42249880902cb837071b784a8e0d731d156e674ace62188e6de6e6f5543b3cd WHIRLPOOL ad71f4dc35a08f14c35083ae8e643308936acfdd9e8adff8fade2f189602ab5a64ccff424c7c297650eb106c80cc50a6fde22f74ac895d0e899fb33c11b7ff8b
 EBUILD xorg-server-1.12.4.ebuild 7000 SHA256 58cf0b8a51fef0fab07052b339a5f522f0eb5596e2eb5c13fee7107d079336e3 SHA512 9182d92b9938f1c482723b881bf2115ec3ded3ecdd92e78c6aacdc8bac3bdd0b143f5f5c78326bffa9ad2f364279fed4cc231ddd6de7854de4a63bf21b91dda4 WHIRLPOOL 53b16e482fb2f0cf3e8316bc9ee82f4f0a8fc9ddee9a3f5c9c9f6b377a2832315e80e64d0fb7354d8d9a63e8c5a31f52866b5e29ee98915ab0df745aa05d4a0b
-EBUILD xorg-server-1.13.0-r1.ebuild 7148 SHA256 c915607d1811d3480c25e37bd7853fcbb42b37dc3a7591d39f8bc7e0f5dd24be SHA512 50ebaffbb314cea500f7539f2362929507de547ce67dae85d2adf2ebd25857758898a417db239e11c51b60668d6e4aff60eb9ce34260b067a9594441f893dd21 WHIRLPOOL 7adfb3b20369dd956d906d21df03857d140aac629885bbe10d2756fd2ff4346614affa5a5d0d23ca36751314fbbe55e230072dc401df528d5d89369326151016
+EBUILD xorg-server-1.13.0-r1.ebuild 7148 SHA256 5e6a3bebb06ef39ab465bca10f6f026b0b561159e4fd6d35204ad56c4af5ab99 SHA512 3a7951c421337db6981fa71c9baf930366fb4299114cbea475f962e07e86be552ca5da8bc717e937c4776be959270ba26dbf9f1170080fcafee554141c894efe WHIRLPOOL 25b8c26588192efd158315d63d1ae21f4d977a76c1156168bb95da04f149094a0fde5458b9bfb3167bc79ebdbc5b5ff75ef516a4771ace127195ce9a7026b9e5
 EBUILD xorg-server-1.13.0.ebuild 7029 SHA256 ce472df502a5ea7609f99ada7d2aad4c9be23e222ea7cd3280171e13745578e2 SHA512 6f3d472027d1219e3bf10f1c414c96490eec6900128e20390619833a541d616eddcfc64faa39d1bf5a197da8880b2296e763edcc9c3fe9ad7eed5b0b080dc30e WHIRLPOOL a90d9a3c971834956352ee8a2ad19360b7272388f4d756188efe9d559636d82dbc519710e2082fed948e64f7a3cef3eb84ab28d059fc7d9dc47431970226dd36
 EBUILD xorg-server-1.9.5-r1.ebuild 7863 SHA256 92cd8aba95353f41ced9c7f3122583fbfd182d9f1d7e093bb2a68a53b9d10399 SHA512 4ef89d71c28335aa928fc15c5dcab8c97a6e9c6b3aef57df1dabe20606135e2d0a05331789a253d91c5a14cd0ae0c68f14cd21ac75b35db94028bb1cb9e579be WHIRLPOOL dfee9948a59f130f8bde7545e23eebe083e2da8780ad2d10f58cb1b82b9d40bb0f66cc3070ebcf8182de325bf392e5d203e1d3e6054857b1efe9fca264e32f5a
-MISC ChangeLog 34802 SHA256 f9ddb15888f665361c5debf6266e398c46571067ffd3ee43da8e043376f77a98 SHA512 21a941d0bb4faaf4e31783556c11bc7d52ea07e2285b6ccb29eb4810bb20bb35ab325aefa1031e391678b0eac452a4e52fe71d2d5b33d80dbead71f141b77e5d WHIRLPOOL 590c419aebd88521b428a21389ff3c7eddbeeeddc8aed38d4ee5955d8ebdff89523a41fc1cbb64cdae64cd46fd589d16114d57b91deaa51292deeba53c54fc0f
+MISC ChangeLog 34973 SHA256 344ee40bf63dec9ed258b82955265c21a936b12a2a68998d1cffb3ba1075958a SHA512 79212ea119a3c19b00f6bfaca32dfd54ee94c129ba94d86638b839e7558e100e7ff8e1b61cdd4aefc776a711ed36382239d1e87e6df4bfe9889e6d52f1ce0b7c WHIRLPOOL 9d3c2b2edf87a7c34cae55dec7eff1a977160497d40a36669f781ffe73146c807c0d5bf9b5ea96b4d0ae6e8d18cc218523a52e02f10c0ec9b8e868afe7ea3586
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
 MISC metadata.xml 537 SHA256 38cd6ed34cf5447cbc3e0a9c4a9e24d5af12e2a12b80b106821bb19e69d2281f SHA512 6b66fd87c679bd696c5b6f7c32026a2bdaf827f3ea375eb908965352c259354dc242321199cebfab72a8d7854e459798ee851feedc18fa36496aec965ca28676 WHIRLPOOL 751bb9c7446f7bfd44674256bee09d05252b03686be445538a1026c2075533660a3895a8d68f4b77cd3575f4cf589df2bcf9a6e1e493c13f169895f413ea6c78
diff --git a/x11-base/xorg-server/files/xdm.initd-9 b/x11-base/xorg-server/files/xdm.initd-9
new file mode 100644
index 000000000000..c7767383d946
--- /dev/null
+++ b/x11-base/xorg-server/files/xdm.initd-9
@@ -0,0 +1,216 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-9,v 1.1 2012/11/11 01:49:30 chithanh Exp $
+
+# This is here to serve as a note to myself, and future developers.
+#
+# Any Display manager (gdm,kdm,xdm) has the following problem:  if
+# it is started before any getty, and no vt is specified, it will
+# usually run on vt2.  When the getty on vt2 then starts, and the
+# DM is already started, the getty will take control of the keyboard,
+# leaving us with a "dead" keyboard.
+#
+# Resolution: add the following line to /etc/inittab
+#
+#  x:a:once:/etc/X11/startDM.sh
+#
+# and have /etc/X11/startDM.sh start the DM in daemon mode if
+# a lock is present (with the info of what DM should be started),
+# else just fall through.
+#
+# How this basically works, is the "a" runlevel is a additional
+# runlevel that you can use to fork processes with init, but the
+# runlevel never gets changed to this runlevel.  Along with the "a"
+# runlevel, the "once" key word means that startDM.sh will only be
+# run when we specify it to run, thus eliminating respawning
+# startDM.sh when "xdm" is not added to the default runlevel, as was
+# done previously.
+#
+# This script then just calls "telinit a", and init will run
+# /etc/X11/startDM.sh after the current runlevel completes (this
+# script should only be added to the actual runlevel the user is
+# using).
+#
+# Martin Schlemmer
+# aka Azarah
+# 04 March 2002
+
+depend() {
+	need localmount xdm-setup
+
+	# this should start as early as possible
+	# we can't do 'before *' as that breaks it
+	# (#139824) Start after ypbind and autofs for network authentication
+	# (#145219 #180163) Could use lirc mouse as input device
+	# (#70689 comment #92) Start after consolefont to avoid display corruption
+	# (#291269) Start after quota, since some dm need readable home
+	# (#390609) gdm-3 will fail when dbus is not running
+	# (#366753) starting keymaps after X causes problems
+	after bootmisc consolefont modules netmount
+	after readahead-list ypbind autofs openvpn gpm lircmd
+	after quota keymaps
+	before alsasound
+
+	# Start before X
+	use consolekit dbus xfs
+}
+
+setup_dm() {
+	local MY_XDM
+	
+	MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')
+
+	# Load our root path from profile.env
+	# Needed for kdm
+	PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
+
+	NAME=
+	case "${MY_XDM}" in
+		kdm|kde)
+			EXE=/usr/bin/kdm
+			PIDFILE=/var/run/kdm.pid
+			;;
+		entrance*)
+			EXE=/usr/sbin/entrance
+			PIDFILE=/var/run/entrance.pid
+			;;
+		gdm|gnome)
+			EXE=/usr/bin/gdm
+			[ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
+			PIDFILE=/var/run/gdm.pid
+			;;
+		wdm)
+			EXE=/usr/bin/wdm
+			PIDFILE=
+			;;
+		gpe)
+			EXE=/usr/bin/gpe-dm
+			PIDFILE=/var/run/gpe-dm.pid
+			;;
+		lxdm)
+			EXE=/usr/sbin/lxdm-binary
+			PIDFILE=/var/run/lxdm.pid
+			START_STOP_ARGS="--background"
+			;;
+		lightdm)
+			EXE=/usr/sbin/lightdm
+			PIDFILE=/var/run/lightdm.pid
+			START_STOP_ARGS="--background"
+			;;
+		*)
+			# first find out if there is such executable
+			EXE="$(command -v ${MY_XDM} 2>/dev/null)"
+			PIDFILE="/var/run/${MY_XDM}.pid"
+
+			# warn user that he is doing sick things if the exe was not found
+			if [ -z "${EXE}" ]; then
+				echo "ERROR: Your XDM value is invalid."
+				echo "  No ${MY_XDM} executable could be found on your system."
+			fi
+			;;
+	esac
+
+	if ! [ -x "${EXE}" ]; then
+		EXE=/usr/bin/xdm
+		PIDFILE=/var/run/xdm.pid
+		if ! [ -x "/usr/bin/xdm" ]; then
+			echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"
+			echo "	or install x11-apps/xdm package"
+			eend 255
+		fi
+	fi
+}
+
+# Check to see if something is defined on our VT
+vtstatic() {
+	if [ -e /etc/inittab ] ; then
+		grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
+	elif [ -e /etc/ttys ] ; then
+		grep -q "^ttyv$(($1 - 1))" /etc/ttys
+	else
+		return 1
+	fi
+}
+
+start() {
+	local EXE NAME PIDFILE
+	setup_dm
+
+	if [ -f /etc/.noxdm ]; then
+		einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed."
+		rm /etc/.noxdm
+		return 0
+	fi
+
+	ebegin "Setting up ${EXE##*/}"
+
+	# save the prefered DM
+	save_options "service" "${EXE}"
+	save_options "name"    "${NAME}"
+	save_options "pidfile" "${PIDFILE}"
+	save_options "start_stop_args" "${START_STOP_ARGS}"
+
+	if [ -n "${CHECKVT-y}" ] ; then
+		if vtstatic "${CHECKVT:-7}" ; then
+			if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then
+				ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
+				telinit a >/dev/null 2>&1
+				return 0
+			else
+				eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
+				return 1
+			fi
+		fi
+	fi
+
+	/etc/X11/startDM.sh
+	eend 0
+}
+
+stop() {
+	local curvt retval
+
+	retval=0
+	if [ -t 0 ]; then
+		if type fgconsole >/dev/null 2>&1; then
+			curvt=$(fgconsole 2>/dev/null)
+		else
+			curvt=$(tty)
+			case "${curvt}" in
+				/dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;;
+				*) curvt= ;;
+			esac
+		fi
+	fi
+	local myexe myname mypidfile myservice
+	myexe=$(get_options "service")
+	myname=$(get_options "name")
+	mypidfile=$(get_options "pidfile")
+	myservice=${myexe##*/}
+
+	[ -z "${myexe}" ] && return 0
+
+	ebegin "Stopping ${myservice}"
+
+	if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then
+		start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
+			${mypidfile:+--pidfile} ${mypidfile} \
+			${myname:+--name} ${myname}
+		retval=${?}
+	fi
+
+	# switch back to original vt
+	if [ -n "${curvt}" ]; then
+		if type chvt >/dev/null 2>&1; then
+			chvt "${curvt}"
+		else
+			vidcontrol -s "$((curvt + 1))"
+		fi
+	fi
+
+	eend ${retval} "Error stopping ${myservice}"
+	return ${retval}
+}
+
+# vim: set ts=4 :
diff --git a/x11-base/xorg-server/xorg-server-1.13.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.13.0-r1.ebuild
index 2541a2a58c49..d008a6d42331 100644
--- a/x11-base/xorg-server/xorg-server-1.13.0-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.13.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.13.0-r1.ebuild,v 1.1 2012/11/10 23:23:30 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.13.0-r1.ebuild,v 1.2 2012/11/11 01:49:30 chithanh Exp $
 
 EAPI=4
 
@@ -188,7 +188,7 @@ src_install() {
 	fi
 
 	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-8 xdm
+	newinitd "${FILESDIR}"/xdm.initd-9 xdm
 	newconfd "${FILESDIR}"/xdm.confd-4 xdm
 
 	# install the @x11-module-rebuild set for Portage