diff options
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 10 | ||||
| -rw-r--r-- | x11-apps/xinit/Manifest | 23 | ||||
| -rw-r--r-- | x11-apps/xinit/files/digest-xinit-1.0.3-r4 | 3 | ||||
| -rw-r--r-- | x11-apps/xinit/files/xdm.confd-1 | 10 | ||||
| -rwxr-xr-x | x11-apps/xinit/files/xdm.initd-1 | 199 | ||||
| -rw-r--r-- | x11-apps/xinit/xinit-1.0.3-r4.ebuild | 49 |
6 files changed, 289 insertions, 5 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index 292b34a754cc..7bdc83a2c336 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.87 2007/05/20 22:24:10 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.88 2007/05/23 12:21:51 uberlord Exp $ + +*xinit-1.0.3-r4 (23 May 2007) + + 23 May 2007; Roy Marples <uberlord@gentoo.org> +files/xdm.confd-1, + +files/xdm.initd-1, +xinit-1.0.3-r4.ebuild: + New init script does away with STATICVT option. + A static VT is always preferred, and we check to see if VT7 is + available. 20 May 2007; Jeroen Roovers <jer@gentoo.org> xinit-1.0.3-r3.ebuild: Stable for HPPA (bug #175465). diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest index ffa0edd1add4..371d046e18ef 100644 --- a/x11-apps/xinit/Manifest +++ b/x11-apps/xinit/Manifest @@ -22,10 +22,18 @@ AUX xdm.confd 668 RMD160 336b367da62beb39bcf4ce60efc07c7c00dc7133 SHA1 57e33bae4 MD5 1ef321642c38bfb020e92723722319fb files/xdm.confd 668 RMD160 336b367da62beb39bcf4ce60efc07c7c00dc7133 files/xdm.confd 668 SHA256 d8b6828dae11bd2e632c9000b087d59c66192e1e21183124e7bf90ddee09f128 files/xdm.confd 668 +AUX xdm.confd-1 553 RMD160 ed01c98bd9e669c7ef4b31e8084c26feacdd7456 SHA1 8e3c7739c1446f9568c20c7266e9ebd74b9157d4 SHA256 0e58beab8245a12c5fbcb3c450d78f5cf0cfe9f2820d5e8914da4e4acde1569d +MD5 e878f0ef27c8c7e3e6fa274de5189eb3 files/xdm.confd-1 553 +RMD160 ed01c98bd9e669c7ef4b31e8084c26feacdd7456 files/xdm.confd-1 553 +SHA256 0e58beab8245a12c5fbcb3c450d78f5cf0cfe9f2820d5e8914da4e4acde1569d files/xdm.confd-1 553 AUX xdm.initd 4658 RMD160 c9b1269ffede498cd6cedd8f0adf1e458133e40b SHA1 52e366698ddc8f77bc828e2994b744dc441b489e SHA256 4f3c7a331bd3d09abac14b5a08ae9e451d5e8eb019e05b1d1990a4e8bd54bbcf MD5 035d2632f2049efc46be2023c1e6fe0d files/xdm.initd 4658 RMD160 c9b1269ffede498cd6cedd8f0adf1e458133e40b files/xdm.initd 4658 SHA256 4f3c7a331bd3d09abac14b5a08ae9e451d5e8eb019e05b1d1990a4e8bd54bbcf files/xdm.initd 4658 +AUX xdm.initd-1 5121 RMD160 73e9bb8132ba1908cf735c29466e09963398e991 SHA1 5e75f049e3ca01d11463ced74beb4b649a143d51 SHA256 2f2f6342a87a156f912fba838fb095c7d8e5f4be194e6517fd62ae0f1e98e0c3 +MD5 2c6effa3312847bc31bfc6e138c6ae69 files/xdm.initd-1 5121 +RMD160 73e9bb8132ba1908cf735c29466e09963398e991 files/xdm.initd-1 5121 +SHA256 2f2f6342a87a156f912fba838fb095c7d8e5f4be194e6517fd62ae0f1e98e0c3 files/xdm.initd-1 5121 AUX xdm.start 3974 RMD160 67f3b69fc9c006146999271935e1ae06d093130a SHA1 12763e84e31632c0421159e8feca2f9855966b7b SHA256 151b697f62e335850118a5d7d113d83fb37f2a75407985cd1e433de93eb55ded MD5 5dd1b14c1942c59025be5fa7d470f281 files/xdm.start 3974 RMD160 67f3b69fc9c006146999271935e1ae06d093130a files/xdm.start 3974 @@ -56,14 +64,18 @@ EBUILD xinit-1.0.3-r3.ebuild 1494 RMD160 020b6aa7e59c3bc1e799df695e8bd13b915270b MD5 aedcfc4d5a4b43aae761e7dbdd7dfab8 xinit-1.0.3-r3.ebuild 1494 RMD160 020b6aa7e59c3bc1e799df695e8bd13b915270b2 xinit-1.0.3-r3.ebuild 1494 SHA256 2084b53c4b04b33fc5b73f0ca6cae1433d4b0ee7cf2537851b69a49366b15abc xinit-1.0.3-r3.ebuild 1494 +EBUILD xinit-1.0.3-r4.ebuild 1350 RMD160 9c90547f54b4c39d2a8eb59c20dedb80a9c96330 SHA1 550cc40aed217eb1a36dab918d6e9094d500aa42 SHA256 9bc669adc5313773ffec0d8ee6d17502faf454b54af42d6f37cf7dd5e9988d91 +MD5 97186b2f6243b1be852ddd4a4262469d xinit-1.0.3-r4.ebuild 1350 +RMD160 9c90547f54b4c39d2a8eb59c20dedb80a9c96330 xinit-1.0.3-r4.ebuild 1350 +SHA256 9bc669adc5313773ffec0d8ee6d17502faf454b54af42d6f37cf7dd5e9988d91 xinit-1.0.3-r4.ebuild 1350 EBUILD xinit-1.0.3.ebuild 1336 RMD160 4395f36048cc77b18430f512172cb11340a942e4 SHA1 e37465a133ad1df799166cd55c5c3f929ea730d6 SHA256 aea3003858e5cec5d12e116e9a20496662c9d443193ca10a46d568b9af663c99 MD5 24a82969244654b6d5f3c7fbf05b102b xinit-1.0.3.ebuild 1336 RMD160 4395f36048cc77b18430f512172cb11340a942e4 xinit-1.0.3.ebuild 1336 SHA256 aea3003858e5cec5d12e116e9a20496662c9d443193ca10a46d568b9af663c99 xinit-1.0.3.ebuild 1336 -MISC ChangeLog 13911 RMD160 06521c1b7f906d5be44b64667d4d1a5a835175bf SHA1 300934ac135009cf8085d68de453fb10ea27c837 SHA256 3b2b79ec7112b3d1d71a8cd896e048cad87fc7cd5ea8768261f3327af9b8b58d -MD5 6a7e4dd9922c1b9d51b662fefea6d1c6 ChangeLog 13911 -RMD160 06521c1b7f906d5be44b64667d4d1a5a835175bf ChangeLog 13911 -SHA256 3b2b79ec7112b3d1d71a8cd896e048cad87fc7cd5ea8768261f3327af9b8b58d ChangeLog 13911 +MISC ChangeLog 14192 RMD160 a237fbc3601ef89da93aeec33be8e4bb676f3ad4 SHA1 cffca6f0675360a7f536e585e519e4852f5316ec SHA256 ef00a557853eac0036eab5dc7ace6fb13b4bf64967dabf1d1b8fa14b3765dd83 +MD5 1c95f3cae85ad30b5bb5326d96942f39 ChangeLog 14192 +RMD160 a237fbc3601ef89da93aeec33be8e4bb676f3ad4 ChangeLog 14192 +SHA256 ef00a557853eac0036eab5dc7ace6fb13b4bf64967dabf1d1b8fa14b3765dd83 ChangeLog 14192 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 @@ -80,3 +92,6 @@ SHA256 a37b78e123e42af15479c362d492e682e687a13cb9c1f038ec3e395f12612242 files/di MD5 273fc0942d2b4ea4d51a2447ba6b1c77 files/digest-xinit-1.0.3-r3 235 RMD160 427f07a6108e50a618c487041421ba91e25f146f files/digest-xinit-1.0.3-r3 235 SHA256 a37b78e123e42af15479c362d492e682e687a13cb9c1f038ec3e395f12612242 files/digest-xinit-1.0.3-r3 235 +MD5 273fc0942d2b4ea4d51a2447ba6b1c77 files/digest-xinit-1.0.3-r4 235 +RMD160 427f07a6108e50a618c487041421ba91e25f146f files/digest-xinit-1.0.3-r4 235 +SHA256 a37b78e123e42af15479c362d492e682e687a13cb9c1f038ec3e395f12612242 files/digest-xinit-1.0.3-r4 235 diff --git a/x11-apps/xinit/files/digest-xinit-1.0.3-r4 b/x11-apps/xinit/files/digest-xinit-1.0.3-r4 new file mode 100644 index 000000000000..c80598bf332d --- /dev/null +++ b/x11-apps/xinit/files/digest-xinit-1.0.3-r4 @@ -0,0 +1,3 @@ +MD5 f04a903cc0e18b3c338f58eb90f6caf8 xinit-1.0.3.tar.bz2 97629 +RMD160 e0299e1cb07d12400b9513752dccde1dc0d9cb78 xinit-1.0.3.tar.bz2 97629 +SHA256 c77a58cba815eb1dde2242a819e80d7d84d753678837ac24d385e3ec65d33186 xinit-1.0.3.tar.bz2 97629 diff --git a/x11-apps/xinit/files/xdm.confd-1 b/x11-apps/xinit/files/xdm.confd-1 new file mode 100644 index 000000000000..6f1fd8ce1702 --- /dev/null +++ b/x11-apps/xinit/files/xdm.confd-1 @@ -0,0 +1,10 @@ +# We always try and start X on a static VT. The various DMs normally default +# to using VT7. If you wish to use the xdm init script, then you should ensure +# that the VT checked is the same VT your DM wants to use. We do this check to +# ensure that you have't accidently configured something to run on the VT +# in your /etc/inittab file so that you don't get a dead keyboard. +CHECKVT=7 + +# What display manager do you use ? [ xdm | gdm | kdm | entrance ] +# NOTE: If this is set in /etc/rc.conf, that setting will override this one. +DISPLAYMANAGER="xdm" diff --git a/x11-apps/xinit/files/xdm.initd-1 b/x11-apps/xinit/files/xdm.initd-1 new file mode 100755 index 000000000000..a6f5c3f0a3a7 --- /dev/null +++ b/x11-apps/xinit/files/xdm.initd-1 @@ -0,0 +1,199 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-1,v 1.1 2007/05/23 12:21:51 uberlord 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 + + +# Start X Font Server before X +depend() { + need localmount + + # 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) Could use lirc mouse as input device + # (#70689 comment #92) Start after consolefont to avoid display corruption + after bootmisc readahead-list ypbind autofs openvpn gpm netmount lircd consolefont + before alsasound + + # Start before X + use acpid consolekit hald xfs +} + +setup_dm() { + local MY_XDM="$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')" + + # Load our root path from profile.env + # Needed for kdm + PATH="${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")" + + case "${MY_XDM}" in + kdm|kde|kde2|kde3) + EXE="$(which kdm)" + # kdm takes too long to create a pidfile for baselayout-2 + #PIDFILE=/var/run/kdm.pid + PIDFILE= + ;; + entrance*) + EXE=/usr/sbin/entranced + PIDFILE=/var/lib/entranced.pid + ;; + gdm|gnome) + EXE=/usr/bin/gdm + [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary + PIDFILE=/var/run/gdm.pid + ;; + wdm) + EXE=/usr/bin/wdm + PIDFILE= + ;; + *) + EXE= + # Fix #65586, where MY_XDM is empty so EXE=somedir + [ -x "/usr/bin/${MY_XDM}" ] && [ -f "/usr/bin/${MY_XDM}" ] \ + && EXE="/usr/bin/${MY_XDM}" + if [ -z "${EXE}" ] ; then + EXE=/usr/bin/xdm + PIDFILE=/var/run/xdm.pid + fi + ;; + esac + + if ! [ -x "${EXE}" ] ; then + EXE=/usr/bin/xdm + PIDFILE=/var/run/xdm.pid + fi +} + +cmdline_opt() { + if [ $# -ne 1 ] || ! [ -r /proc/cmdline ]; then + return 1 + fi + + for opt in $(cat /proc/cmdline) ; do + [ "${opt}" = "${1}" ] && return 0 + done + + return 1 +} + +# Check to see if something is defined on our VT +vtstatic() { + if [ -e /etc/inittab ] ; then + grep -Eq "^[^#]+.*\<tty7\>" /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 cmdline_opt nox ; then + einfo "Skipping ${EXE}, received 'nox'" + return 0 + fi + + ebegin "Setting up ${EXE##*/}" + #save the prefered DM + save_options "service" "${EXE}" + save_options "name" "${NAME}" + save_options "pidfile" "${PIDFILE}" + + 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>/dev/null + 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 retval=0 + local curvt= + if [ -t 0 ] ; then + if type fgconsole >/dev/null 2>/dev/null ; 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="$(get_options "service")" + local myname="$(get_options "name")" + local mypidfile="$(get_options "pidfile")" + local 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>/dev/null ; 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-apps/xinit/xinit-1.0.3-r4.ebuild b/x11-apps/xinit/xinit-1.0.3-r4.ebuild new file mode 100644 index 000000000000..4a5057ff88cd --- /dev/null +++ b/x11-apps/xinit/xinit-1.0.3-r4.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.3-r4.ebuild,v 1.1 2007/05/23 12:21:51 uberlord Exp $ + +# Must be before x-modular eclass is inherited +# This is enabled due to modified Makefile.am from the patches +SNAPSHOT="yes" + +inherit x-modular pam + +DESCRIPTION="X Window System initializer" + +LICENSE="${LICENSE} GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="minimal" + +RDEPEND="x11-apps/xauth + x11-libs/libX11" +DEPEND="${RDEPEND}" +PDEPEND="!minimal? ( x11-wm/twm + x11-apps/xclock + x11-apps/xrdb + x11-apps/xsm + x11-terms/xterm )" + +PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch + ${FILESDIR}/gentoo-startx-customization-0.99.4.patch" + +src_unpack() { + x-modular_unpack_source + x-modular_patch_source + + sed -i -e "s:^XINITDIR.*:XINITDIR = \$(sysconfdir)/X11/xinit:g" ${S}/Makefile.am + + x-modular_reconf_source +} + +src_install() { + x-modular_src_install + exeinto /etc/X11 + doexe ${FILESDIR}/chooser.sh ${FILESDIR}/startDM.sh + exeinto /etc/X11/Sessions + doexe ${FILESDIR}/Xsession + exeinto /etc/X11/xinit + doexe ${FILESDIR}/xinitrc + newinitd ${FILESDIR}/xdm.initd-1 xdm + newconfd ${FILESDIR}/xdm.confd-1 xdm + newpamd ${FILESDIR}/xserver.pamd xserver +} |