From: Roy Marples Date: Fri, 13 Apr 2007 08:23:08 +0000 (+0000) Subject: I've been a bad bug and caused bugs #174071 and #174271. But I'm a good boy X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c1c2fd873df99b9c5c2c7757df8cf0a75e697a2;p=gentoo.git I've been a bad bug and caused bugs #174071 and #174271. But I'm a good boy now as I've fixed them :) Package-Manager: portage-2.1.2.3 --- diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index 9a5d80afbabe..23e13215620f 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,13 @@ # 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.79 2007/04/05 15:30:19 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.80 2007/04/13 08:23:08 uberlord Exp $ + +*xinit-1.0.3-r3 (13 Apr 2007) + + 13 Apr 2007; Roy Marples files/xdm.initd, + +xinit-1.0.3-r3.ebuild: + I've been a bad bug and caused bugs #174071 and #174271. But I'm a good boy + now as I've fixed them :) 05 Apr 2007; Roy Marples files/startDM.sh, files/xdm.initd: diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest index 789b2b86e6ee..576023a74b5b 100644 --- a/x11-apps/xinit/Manifest +++ b/x11-apps/xinit/Manifest @@ -22,10 +22,10 @@ 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.initd 4601 RMD160 862f9f63e38fbccc05af5b78047df85c484769b6 SHA1 e648b57f668456b9066d89bf18cbfdba0be97fa4 SHA256 56dd0b6a4df7f9b57a1ed0506989d6117033e347460ae9c8b5d29a1d2cac27ff -MD5 536c9b80dff6f857629d2c7a61aaa796 files/xdm.initd 4601 -RMD160 862f9f63e38fbccc05af5b78047df85c484769b6 files/xdm.initd 4601 -SHA256 56dd0b6a4df7f9b57a1ed0506989d6117033e347460ae9c8b5d29a1d2cac27ff files/xdm.initd 4601 +AUX xdm.initd 4645 RMD160 16121dfbbd7057bd59f22f86f265fcc1dc9782ca SHA1 fa6c6ab8e8331b01698e0d6f58f71644de5f3495 SHA256 a99cb3c5bb2fed770ff60677a627f55871e47c362a1684a7c1c3613efb814cbb +MD5 4da011f47d25411729838fffa34f07fd files/xdm.initd 4645 +RMD160 16121dfbbd7057bd59f22f86f265fcc1dc9782ca files/xdm.initd 4645 +SHA256 a99cb3c5bb2fed770ff60677a627f55871e47c362a1684a7c1c3613efb814cbb files/xdm.initd 4645 AUX xdm.start 3974 RMD160 67f3b69fc9c006146999271935e1ae06d093130a SHA1 12763e84e31632c0421159e8feca2f9855966b7b SHA256 151b697f62e335850118a5d7d113d83fb37f2a75407985cd1e433de93eb55ded MD5 5dd1b14c1942c59025be5fa7d470f281 files/xdm.start 3974 RMD160 67f3b69fc9c006146999271935e1ae06d093130a files/xdm.start 3974 @@ -52,14 +52,18 @@ EBUILD xinit-1.0.3-r2.ebuild 1503 RMD160 bfe1eea1ecd23c6b87cb146bf7e2d0e22eaeecb MD5 2a472fd2f501be4c61e00c122ed5ee88 xinit-1.0.3-r2.ebuild 1503 RMD160 bfe1eea1ecd23c6b87cb146bf7e2d0e22eaeecb2 xinit-1.0.3-r2.ebuild 1503 SHA256 088f79d72e4044694f38a755e27b67020d1321955430ef95ddfdb02e5a41f706 xinit-1.0.3-r2.ebuild 1503 +EBUILD xinit-1.0.3-r3.ebuild 1505 RMD160 74848598f267dcbab15155058fb9e31acbf92427 SHA1 95a509af55637f65ef0aec4d46255f15f25e7da5 SHA256 76114ffcb26c480615833a8135b229ddf65e8ba9e0f9c514b2cec4d3b8b434b8 +MD5 ba55d62b310b4f6d68a3b542251a6bc3 xinit-1.0.3-r3.ebuild 1505 +RMD160 74848598f267dcbab15155058fb9e31acbf92427 xinit-1.0.3-r3.ebuild 1505 +SHA256 76114ffcb26c480615833a8135b229ddf65e8ba9e0f9c514b2cec4d3b8b434b8 xinit-1.0.3-r3.ebuild 1505 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 12892 RMD160 1f4927419477fe6b53d87b7805172bd0fa1a70b9 SHA1 f7599183860946754dc9369feb1483ffacb73ddd SHA256 bd43a62ac7aa0333e28322a1b8b378f9fb6eaf6572824c6e8453800e99e9c2db -MD5 39609ea893fe98677dc6d27ae5f92532 ChangeLog 12892 -RMD160 1f4927419477fe6b53d87b7805172bd0fa1a70b9 ChangeLog 12892 -SHA256 bd43a62ac7aa0333e28322a1b8b378f9fb6eaf6572824c6e8453800e99e9c2db ChangeLog 12892 +MISC ChangeLog 13122 RMD160 cf7be285547dca13cc01d9978b657e74fe0bd4cf SHA1 c2d26ac312b8d1ad6f010fe15b3a0e00bba3237a SHA256 00c8b96005001e7bd106a1fdd511016b912903f3f9f64357b04246fe250a7c72 +MD5 473267f28d9eeceba6e0761fdbe08c42 ChangeLog 13122 +RMD160 cf7be285547dca13cc01d9978b657e74fe0bd4cf ChangeLog 13122 +SHA256 00c8b96005001e7bd106a1fdd511016b912903f3f9f64357b04246fe250a7c72 ChangeLog 13122 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 @@ -73,3 +77,6 @@ SHA256 a37b78e123e42af15479c362d492e682e687a13cb9c1f038ec3e395f12612242 files/di MD5 273fc0942d2b4ea4d51a2447ba6b1c77 files/digest-xinit-1.0.3-r2 235 RMD160 427f07a6108e50a618c487041421ba91e25f146f files/digest-xinit-1.0.3-r2 235 SHA256 a37b78e123e42af15479c362d492e682e687a13cb9c1f038ec3e395f12612242 files/digest-xinit-1.0.3-r2 235 +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 diff --git a/x11-apps/xinit/files/digest-xinit-1.0.3-r3 b/x11-apps/xinit/files/digest-xinit-1.0.3-r3 new file mode 100644 index 000000000000..c80598bf332d --- /dev/null +++ b/x11-apps/xinit/files/digest-xinit-1.0.3-r3 @@ -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.initd b/x11-apps/xinit/files/xdm.initd index 8f2d2db11289..100f0f5f0dd3 100755 --- a/x11-apps/xinit/files/xdm.initd +++ b/x11-apps/xinit/files/xdm.initd @@ -1,7 +1,7 @@ #!/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,v 1.3 2007/04/05 15:30:19 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd,v 1.4 2007/04/13 08:23:08 uberlord Exp $ # This is here to serve as a note to myself, and future developers. # @@ -66,7 +66,7 @@ setup_dm() { PIDFILE=/var/run/kdm.pid ;; entrance*) - EXE=/usr/sbin/enranced + EXE=/usr/sbin/entranced PIDFILE=/var/lib/entranced.pid ;; gdm|gnome) @@ -97,6 +97,8 @@ cmdline_opt() { for opt in $(cat /proc/cmdline) ; do [ "${opt}" = "${1}" ] && return 0 done + + return 1 } start() { @@ -145,7 +147,9 @@ stop() { 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 @@ -155,7 +159,7 @@ stop() { retval=$? fi - #switch back to original vt + # switch back to original vt if [ -n "${curvt}" ] ; then if type chvt >/dev/null 2>/dev/null ; then chvt "${curvt}" diff --git a/x11-apps/xinit/xinit-1.0.3-r3.ebuild b/x11-apps/xinit/xinit-1.0.3-r3.ebuild new file mode 100644 index 000000000000..63b5bca3ec7d --- /dev/null +++ b/x11-apps/xinit/xinit-1.0.3-r3.ebuild @@ -0,0 +1,55 @@ +# 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-r3.ebuild,v 1.1 2007/04/13 08:23:08 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 xdm + newconfd ${FILESDIR}/xdm.confd xdm + newpamd ${FILESDIR}/xserver.pamd xserver + + # Remove the XSTATICVT option as it's pointless on FreeBSD + # at this time. + if use x86-fbsd ; then + sed -i -e '1, /^$/ d' "${D}"/etc/conf.d/xdm || die + fi +}