diff options
author | 2009-09-14 16:19:03 +0000 | |
---|---|---|
committer | 2009-09-14 16:19:03 +0000 | |
commit | ecd681b5ec3a50cd302aaedc19a7902a4f77905f (patch) | |
tree | 0e22ee1dc80a580c3ee9ea7cd3e016ed23b336c3 /x11-apps | |
parent | Version bump (diff) | |
download | historical-ecd681b5ec3a50cd302aaedc19a7902a4f77905f.tar.gz historical-ecd681b5ec3a50cd302aaedc19a7902a4f77905f.tar.bz2 historical-ecd681b5ec3a50cd302aaedc19a7902a4f77905f.zip |
rev bump for bug #156570.
Package-Manager: portage-2.2_rc40/cvs/Linux i686
Diffstat (limited to 'x11-apps')
-rw-r--r-- | x11-apps/xinit/ChangeLog | 12 | ||||
-rw-r--r-- | x11-apps/xinit/Manifest | 15 | ||||
-rw-r--r-- | x11-apps/xinit/files/x-setup.initd-1 | 10 | ||||
-rwxr-xr-x | x11-apps/xinit/files/xdm.initd-3 | 202 | ||||
-rw-r--r-- | x11-apps/xinit/xinit-1.0.8-r5.ebuild | 69 |
5 files changed, 296 insertions, 12 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index 190b3833c22d..7a98187e427c 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.132 2009/08/31 09:09:18 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.133 2009/09/14 16:19:02 williamh Exp $ + +*xinit-1.0.8-r5 (14 Sep 2009) + + 14 Sep 2009; William Hubbs <williamh@gentoo.org> +files/x-setup.initd-1, + +xinit-1.0.8-r5.ebuild, +files/xdm.initd-3: + rev bump for bug #156570. + The x-setup script now checks the kernel command line for gentoo=nox, + and creates /etc/init.d/.noxdm if this option is passed. + The xdm script now looks only for the file /etc/init.d/.noxdm + to know when to skip starting X. 31 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org> files/xdm.initd-2: Adjust xdm init script to die bit sane way. Per bug #207075. diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest index 1f49ad42eb9d..115b2a4d37fe 100644 --- a/x11-apps/xinit/Manifest +++ b/x11-apps/xinit/Manifest @@ -1,15 +1,14 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de5114871f8500f428a03f87a42714d0ce14 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3 AUX chooser.sh 1496 RMD160 4d474c23dc10f2f33006885305002df7fd3197f9 SHA1 7e8f6a8238add6a1501964821d0b3ffd1ad92b80 SHA256 70bde060d86c313b90ab21a8eb9b101b08637297a1a5b4dec13e1c305ec4d1e8 AUX gentoo-startx-customization-1.0.4.patch 3863 RMD160 65d35c3aaf72861dbf393bb23aaac97763725891 SHA1 ab0acf592dfbdfe961489f3a417be350aefac1dd SHA256 eb0a88592a22203c9e7cb4ea3051f2b96adb244585ae4b990b384b6d8a35559c AUX gentoo-startx-customization-1.0.8.patch 3953 RMD160 cf0bc0b1439437b8a92a1f569445e8fbef1bb1cd SHA1 8020676fe7c9a2fed0c2a09cea0c273984a3cdc0 SHA256 29d6a004240672b86d6cc34e9cab5dcc88abcb84974d98b1085a9eb0dc852f38 AUX nolisten-tcp-and-black-background.patch 381 RMD160 f767995059b6b3826e662ad71fd9348609383dc2 SHA1 8210062a9e3bac93e9d5b0a18633e6a98a6829f4 SHA256 481252dd205a0eefcfdf1a265b2c359280363ceaf1460ca5eab42b9eb3b3c826 AUX startDM.sh 858 RMD160 d7ef866ddd09e3d4117b3363aaa6382a9b8cd153 SHA1 1b826dfb4d5a184d6d7cc1995d685b55c9c188ac SHA256 a7aca1e37e5b8fecb49aa96c4e2850547a47e154edabcdbd1cfcb8ab49337549 +AUX x-setup.initd-1 315 RMD160 96b3f9f886569dbe0a71a1e7313de3dd197f8319 SHA1 e7ee2f80d641ff95303f0bbe31efa2c8d998d08a SHA256 908cafd6324e668b6ebf31e1b193a32e40ab30831f0909829379f13ad38128a1 AUX xdm.confd-1 722 RMD160 3a4f800a37935e711112ede9c847837104e4100f SHA1 d3b2551ec7be8e5cfa42cc14e1d47ab37ac9f116 SHA256 1f6a2bb28e499698bbdba825d6dcbc81622579b1cf5c9e33538b252d254935c3 AUX xdm.initd-1 5207 RMD160 c95d2df2feff76770ece8f0ec86e9bb53d76a257 SHA1 faefdeeca446fff29da2f4e546a3b0bcc94e6372 SHA256 891c7b060c6b47c135b32ffd918a0b6add5e9c7c03893ee0c1d56b64bd7987ea AUX xdm.initd-2 5455 RMD160 d88b99f7b4e7f181ad7c5ee817b881e0f2f797b6 SHA1 d3656459d81e195e7c8d829f82d7a9a32f26592f SHA256 ea6567021649df1084e2bc136a12a067b8bdf70e44978c6e3560e37d47141a23 +AUX xdm.initd-3 5331 RMD160 37bb41e4ebe3e147e2f1460484bfe00019a7e514 SHA1 c1612eac25e9e634063442b36ed140f70e0bb2ad SHA256 3cf770db2a997423092ab28dddd76614576fcaf9a1b3966b01876de7d916cdb8 AUX xdm.start 3974 RMD160 67f3b69fc9c006146999271935e1ae06d093130a SHA1 12763e84e31632c0421159e8feca2f9855966b7b SHA256 151b697f62e335850118a5d7d113d83fb37f2a75407985cd1e433de93eb55ded AUX xinit-1.0.4-console-kit.patch 4956 RMD160 286437f158d6a9ec588377b01d2b336d391bff37 SHA1 8d1ef61ec11bdf0308474560f0ed5156a6714d5f SHA256 65fd0800ccdecca979c8943755c5656fd022b54a160b32489ad95495521949e4 AUX xinitrc 1059 RMD160 3f3ae64f6056055d3d42e471a5dd4263aa1b66db SHA1 edd6919448086273a73b1de897afe93e01b046c8 SHA256 53871c9c3198b38d73b08da3837d1331240a5d45e987a5b8135e7116c02d8eff @@ -24,13 +23,7 @@ EBUILD xinit-1.0.5-r2.ebuild 1746 RMD160 787348be67fe9fe57ba22bb05a6e8286f08b777 EBUILD xinit-1.0.8-r2.ebuild 1795 RMD160 5af656de1216810164bec4e7cfe27337bbe9db37 SHA1 44cbb28758a11741b68c2192a2ccda126f52cc41 SHA256 e3ccfa7db24fea55c14d1e41fb23263f63d2ca0921c6a7e15f7eb29b8c76bb82 EBUILD xinit-1.0.8-r3.ebuild 1924 RMD160 daea591250fc80d64032be5b32aa641375b91cde SHA1 8982722c65ddcd5f3ac2f39ec587e05c521e5b59 SHA256 2b3da814a3367dbd9b8a53cc61a71adea7b6778d58ac8955a7f31d71b73d5637 EBUILD xinit-1.0.8-r4.ebuild 2146 RMD160 76cfb718bcfd7ab710a7e3bb609a42c60172654e SHA1 33f000c3b440b517e5a1d5c60e346e6af38874e6 SHA256 ff68cfbbd6f36428a7bfefa0d28e409bdf5492f2df1b309066e46f22543f7cd7 +EBUILD xinit-1.0.8-r5.ebuild 2202 RMD160 e461b67b29d6cc77dc21aae16234812b6b62bd4c SHA1 d20ec6a9e0047d8e9b8a4069e288b1fbe7195ce5 SHA256 24cfc897b3f783aac1a221e4057193f4e63f02f1e8d90a962ea9dafe8698fd5c EBUILD xinit-1.0.8.ebuild 1743 RMD160 e69d30cd92810870fbb9bf4f0896778c4e162c30 SHA1 9704fa014525f1e45dddcc658d6d83990e21961a SHA256 8ed635360a4136209fe0249c53bd3254367957dec543a5f1a1f1b06fc8cefd63 -MISC ChangeLog 20694 RMD160 933696c3e41c8186ddc2a3f565c5075adfdee4bc SHA1 2b8b32cda5e65585f4516632f68cec82cb4fb597 SHA256 4dd0c91252894f70b26271ba2cef3a7c74d56fba6a54f6aee3224494b4cdb5f7 +MISC ChangeLog 21105 RMD160 d353f26df42b35035b37504863f4f27e9fe28132 SHA1 bbc02f963e8fb433a262fab96da09687987219d2 SHA256 fa34d0b9a0f6322105f12f8101b81ca3be06e0634f6707d4c3cf0497f428bef0 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkqbk0cACgkQHB6c3gNBRYcxnACeKiCCbRZB5wD0XC+l7mUjF3vL -Ht8AmwR6fXiF+3e1swLWTywVLPHGBwi3 -=usrU ------END PGP SIGNATURE----- diff --git a/x11-apps/xinit/files/x-setup.initd-1 b/x11-apps/xinit/files/x-setup.initd-1 new file mode 100644 index 000000000000..8fe5fdcd2ff9 --- /dev/null +++ b/x11-apps/xinit/files/x-setup.initd-1 @@ -0,0 +1,10 @@ +#!/sbin/runscript +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/x-setup.initd-1,v 1.1 2009/09/14 16:19:03 williamh Exp $ + +start() { + if check_bootparam "nox" ; then + touch /etc/init.d/.noxdm + fi +} diff --git a/x11-apps/xinit/files/xdm.initd-3 b/x11-apps/xinit/files/xdm.initd-3 new file mode 100755 index 000000000000..79c0f695b4c4 --- /dev/null +++ b/x11-apps/xinit/files/xdm.initd-3 @@ -0,0 +1,202 @@ +#!/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-3,v 1.1 2009/09/14 16:19:03 williamh 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 x-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 + after bootmisc consolefont modules netmount + after readahead-list ypbind autofs openvpn gpm lircmd + 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= + ;; + kdm-*) + EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm" + 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= + ;; + gpe) + EXE=/usr/bin/gpe-dm + PIDFILE=/var/run/gpe-dm.pid + ;; + *) + 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 + 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/init.d/.noxdm ] ; then + einfo "Skipping ${EXE}, /etc/init.d/.noxdm found" + rm /etc/init.d/.noxdm + return 1 + 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.8-r5.ebuild b/x11-apps/xinit/xinit-1.0.8-r5.ebuild new file mode 100644 index 000000000000..60aa1d695c53 --- /dev/null +++ b/x11-apps/xinit/xinit-1.0.8-r5.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.8-r5.ebuild,v 1.1 2009/09/14 16:19:02 williamh Exp $ + +EAPI="2" + +# 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="hal minimal pam" + +RDEPEND="x11-apps/xauth + x11-libs/libX11 + hal? ( sys-auth/consolekit sys-apps/dbus[X] )" +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-1.0.8.patch + "${FILESDIR}"/xinit-1.0.4-console-kit.patch ) + +pkg_setup() { + CONFIGURE_OPTIONS="$(use_with hal consolekit)" +} + +src_prepare() { + 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 || die + exeinto /etc/X11/Sessions + doexe "${FILESDIR}"/Xsession || die + exeinto /etc/X11/xinit + doexe "${FILESDIR}"/xinitrc || die + newinitd "${FILESDIR}"/xdm.initd-3 xdm + newinitd "${FILESDIR}"/x-setup.initd-1 x-setup + newconfd "${FILESDIR}"/xdm.confd-1 xdm + newpamd "${FILESDIR}"/xserver.pamd xserver +} + +pkg_postinst() { + x-modular_pkg_postinst + ewarn "If you use startx to start X instead of a login manager like gdm/kdm," + ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or" + ewarn "any executable. When you run startx, it will run this as the login session." + ewarn "You can set this in a file in /etc/env.d/ for the entire system," + ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)." + ewarn "Here's an example of setting it for the whole system:" + ewarn " echo XSESSION=\"Gnome\" > /etc/env.d/90xsession" + ewarn " env-update && source /etc/profile" +} |