summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2009-10-06 16:44:39 +0000
committerWilliam Hubbs <williamh@gentoo.org>2009-10-06 16:44:39 +0000
commita0fdd4cae9bcb1cd277e9c807f905f30b1958a0d (patch)
treeb6c33899b7a9c05ed8b080923bbdf8a4d4c9e410 /x11-apps/xinit
parentRESTRICT="mirror" because the license doesn't explicitely grant permission to... (diff)
downloadhistorical-a0fdd4cae9bcb1cd277e9c807f905f30b1958a0d.tar.gz
historical-a0fdd4cae9bcb1cd277e9c807f905f30b1958a0d.tar.bz2
historical-a0fdd4cae9bcb1cd277e9c807f905f30b1958a0d.zip
moved .noxdm to /etc for security bug #287913.
Package-Manager: portage-2.2_rc44/cvs/Linux i686
Diffstat (limited to 'x11-apps/xinit')
-rw-r--r--x11-apps/xinit/ChangeLog48
-rw-r--r--x11-apps/xinit/Manifest7
-rw-r--r--x11-apps/xinit/files/xdm-setup.initd-14
-rwxr-xr-xx11-apps/xinit/files/xdm.initd-38
-rw-r--r--x11-apps/xinit/xinit-1.0.8-r9.ebuild77
5 files changed, 114 insertions, 30 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 46747cda4384..27416ffe224a 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,16 +1,22 @@
# 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.151 2009/10/05 16:07:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.152 2009/10/06 16:44:39 williamh Exp $
- 05 Oct 2009; Raúl Porcel <armin76@gentoo.org> xinit-1.0.8-r8.ebuild:
+*xinit-1.0.8-r9 (06 Oct 2009)
+
+ 06 Oct 2009; William Hubbs <williamh@gentoo.org> files/xdm-setup.initd-1,
+ +xinit-1.0.8-r9.ebuild, files/xdm.initd-3:
+ Moved .noxdm to /etc for security bug #287913.
+
+ 05 Oct 2009; Raúl Porcel <armin76@gentoo.org> xinit-1.0.8-r8.ebuild:
arm/ia64/s390/sh/sparc stable wrt #156570
- 01 Oct 2009; Rémi Cardona <remi@gentoo.org> -files/xdm.initd-1,
+ 01 Oct 2009; Rémi Cardona <remi@gentoo.org> -files/xdm.initd-1,
-files/gentoo-startx-customization-1.0.4.patch, -files/xdm.start,
-files/xsession.env.d:
prune ${FILESDIR}
- 01 Oct 2009; Rémi Cardona <remi@gentoo.org> -xinit-1.0.4.ebuild,
+ 01 Oct 2009; Rémi Cardona <remi@gentoo.org> -xinit-1.0.4.ebuild,
-xinit-1.0.5-r1.ebuild, -xinit-1.0.5-r2.ebuild, -xinit-1.0.8.ebuild,
-xinit-1.0.8-r2.ebuild, -xinit-1.0.8-r3.ebuild:
drop old ebuilds
@@ -46,28 +52,28 @@
when .noxdm is touched so that it will not be restarted in later
runlevels.
- 23 Sep 2009; Rémi Cardona <remi@gentoo.org> files/xdm-setup.initd-1,
+ 23 Sep 2009; Rémi Cardona <remi@gentoo.org> files/xdm-setup.initd-1,
files/xdm.initd-3:
touch the .noxdm file in / instead of /etc/init.d (partly fixes bug
#285929
- 21 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+ 21 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
xinit-1.0.8-r8.ebuild:
Remove not required dependencies (aka kill hal useflag). Per #g-dev
discussion.
*xinit-1.0.8-r8 (21 Sep 2009)
- 21 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+ 21 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+xinit-1.0.8-r8.ebuild:
Revbump the xinint for the last commit so automagicness is fixed even for
those whom already compiled the thing.
- 21 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+ 21 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
xinit-1.0.8-r7.ebuild:
Disable automagicness. Per bug #285741.
- 19 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+ 19 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
xinit-1.0.8-r7.ebuild, metadata.xml:
Adjust the hal/consolekit mess to be more sane.
@@ -97,10 +103,10 @@
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:
+ 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.
- 28 Aug 2009; Petteri Räty <betelgeuse@gentoo.org> xinit-1.0.8-r4.ebuild:
+ 28 Aug 2009; Petteri Räty <betelgeuse@gentoo.org> xinit-1.0.8-r4.ebuild:
Migrate to EAPI 2 in order to get rid of built_with_use.
23 Jun 2009; Tobias Klausmann <klausman@gentoo.org> xinit-1.0.8-r4.ebuild:
@@ -109,7 +115,7 @@
30 May 2009; Angelo Arrifano files/xdm.confd-1, files/xdm.initd-2:
Add GPE (gpe-dm) support.
- 15 May 2009; Raúl Porcel <armin76@gentoo.org> xinit-1.0.8-r4.ebuild:
+ 15 May 2009; Raúl Porcel <armin76@gentoo.org> xinit-1.0.8-r4.ebuild:
arm/s390 stable
05 May 2009; Christian Faulhammer <fauli@gentoo.org> xinit-1.0.4.ebuild,
@@ -125,7 +131,7 @@
16 Apr 2009; Jeroen Roovers <jer@gentoo.org> xinit-1.0.8-r4.ebuild:
Stable for HPPA (bug #251832).
- 15 Apr 2009; Raúl Porcel <armin76@gentoo.org> xinit-1.0.8-r4.ebuild:
+ 15 Apr 2009; Raúl Porcel <armin76@gentoo.org> xinit-1.0.8-r4.ebuild:
ia64/sh stable wrt #251832
06 Apr 2009; Friedrich Oslage <bluebird@gentoo.org> xinit-1.0.8-r4.ebuild:
@@ -134,7 +140,7 @@
05 Apr 2009; Markus Meier <maekke@gentoo.org> xinit-1.0.8-r4.ebuild:
x86 stable, bug #251832
- 05 Apr 2009; Olivier Crête <tester@gentoo.org> xinit-1.0.8-r4.ebuild:
+ 05 Apr 2009; Olivier Crête <tester@gentoo.org> xinit-1.0.8-r4.ebuild:
Stable on amd64, bug #251832
03 Apr 2009; Brent Baude <ranger@gentoo.org> xinit-1.0.8-r4.ebuild:
@@ -197,7 +203,7 @@
14 Dec 2007; nixnut <nixnut@gentoo.org> xinit-1.0.5-r1.ebuild:
Stable on ppc wrt bug 201998
- 12 Dec 2007; Raúl Porcel <armin76@gentoo.org> xinit-1.0.5-r1.ebuild:
+ 12 Dec 2007; Raúl Porcel <armin76@gentoo.org> xinit-1.0.5-r1.ebuild:
alpha/ia64 stable wrt #201998
12 Dec 2007; Ferris McCormick <fmccor@gentoo.org> xinit-1.0.5-r1.ebuild:
@@ -239,7 +245,7 @@
10 Sep 2007; Jeroen Roovers <jer@gentoo.org> xinit-1.0.4.ebuild:
Stable for HPPA (bug #191615).
- 09 Sep 2007; Raúl Porcel <armin76@gentoo.org> xinit-1.0.4.ebuild:
+ 09 Sep 2007; Raúl Porcel <armin76@gentoo.org> xinit-1.0.4.ebuild:
alpha/ia64 stable wrt #191615
08 Sep 2007; Joseph Jezak <josejx@gentoo.org> xinit-1.0.4.ebuild:
@@ -266,7 +272,7 @@
09 Jul 2007; Roy Marples <uberlord@gentoo.org> files/xdm.initd-1:
The xdm init script is now after modules, #179032.
- 02 Jul 2007; Raúl Porcel <armin76@gentoo.org> xinit-1.0.3-r3.ebuild:
+ 02 Jul 2007; Raúl Porcel <armin76@gentoo.org> xinit-1.0.3-r3.ebuild:
alpha stable wrt #175465
24 Jun 2007; Joshua Kinard <kumba@gentoo.org> xinit-1.0.3-r4.ebuild:
@@ -299,7 +305,7 @@
Move logic operations out of [ ] tests, so we have consistent syntax of the
code logic.
- 25 Apr 2007; Raúl Porcel <armin76@gentoo.org> xinit-1.0.3-r3.ebuild:
+ 25 Apr 2007; Raúl Porcel <armin76@gentoo.org> xinit-1.0.3-r3.ebuild:
Stable on ia64 wrt bug #175465
25 Apr 2007; Markus Rothe <corsair@gentoo.org> xinit-1.0.3-r3.ebuild:
@@ -445,7 +451,7 @@
11 May 2006; Donnie Berkholz <spyderous@gentoo.org>; files/xdm.start,
-xinit-1.0.2-r3.ebuild, +xinit-1.0.2-r4.ebuild:
(#133060) Also use hald, or it's possible to log in without the desktop
- environment handling events (Tiziano Müller).
+ environment handling events (Tiziano Müller).
23 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; files/xdm.confd:
(#131032) Also note that for dynamic VT, you need to remove the VT arg from
@@ -493,7 +499,7 @@
04 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; +xinit-1.0.2.ebuild:
Better portability among different /bin/sh'es.
- 31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> xinit-1.0.1.ebuild:
+ 31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> xinit-1.0.1.ebuild:
Add ~x86-fbsd keyword.
23 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>; files/chooser.sh:
@@ -559,7 +565,7 @@
Bump for 7.0RC2. Also add regenerated startx customization patch, which was
probably around longer than I've been using Linux.
- 02 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> xinit-0.99.2-r1.ebuild:
+ 02 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> xinit-0.99.2-r1.ebuild:
If you use dopamd, inherit pam eclass.
30 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 9eecdae03667..39b897eb0fc7 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -3,10 +3,10 @@ AUX chooser.sh 1496 RMD160 4d474c23dc10f2f33006885305002df7fd3197f9 SHA1 7e8f6a8
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 xdm-setup.initd-1 339 RMD160 8be48225ea6df9434d78981437cdbfdd29e10055 SHA1 15e723b54c27a422e9d53b98b3c5471e111817c2 SHA256 bce5865e7da9bcedeef66e8ce1b6fc7e303cf8d1f44ecb0e6347c045414a7d7d
+AUX xdm-setup.initd-1 339 RMD160 7f3dd869a116cc206d3aab54021ed56950c11dd3 SHA1 1b759d0b1a0da0718be7a204826497c4fb705ceb SHA256 6bfa22583442d276d7d388281a4202bc7a0ce459f0c0596f9bf9a8ffdf82b244
AUX xdm.confd-1 722 RMD160 3a4f800a37935e711112ede9c847837104e4100f SHA1 d3b2551ec7be8e5cfa42cc14e1d47ab37ac9f116 SHA256 1f6a2bb28e499698bbdba825d6dcbc81622579b1cf5c9e33538b252d254935c3
AUX xdm.initd-2 5455 RMD160 d88b99f7b4e7f181ad7c5ee817b881e0f2f797b6 SHA1 d3656459d81e195e7c8d829f82d7a9a32f26592f SHA256 ea6567021649df1084e2bc136a12a067b8bdf70e44978c6e3560e37d47141a23
-AUX xdm.initd-3 5378 RMD160 a8f0f0dd7687c35d1c56dad074efd67624195d23 SHA1 307c4a46036ad63a09c2ccb69fc0d2c65ba5ab4f SHA256 59961db339fa8316802b1712ae306da529d50eae25419b0ef0a78735ea8ee323
+AUX xdm.initd-3 5409 RMD160 42f55537f7a59bd9943ab884fcc4a4ca98f7eefa SHA1 c0cfa748a9e5eabb8a68153cb8f88283e5100e85 SHA256 4f43b65ef4a164d17b070d8474b7f34b61d089895552345a6f6135145df5b764
AUX xinit-1.0.4-console-kit.patch 4956 RMD160 286437f158d6a9ec588377b01d2b336d391bff37 SHA1 8d1ef61ec11bdf0308474560f0ed5156a6714d5f SHA256 65fd0800ccdecca979c8943755c5656fd022b54a160b32489ad95495521949e4
AUX xinitrc 1059 RMD160 3f3ae64f6056055d3d42e471a5dd4263aa1b66db SHA1 edd6919448086273a73b1de897afe93e01b046c8 SHA256 53871c9c3198b38d73b08da3837d1331240a5d45e987a5b8135e7116c02d8eff
AUX xserver.pamd 125 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 SHA1 e35845021328044659036b9f82a95c17f21beb25 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2
@@ -14,5 +14,6 @@ DIST xinit-1.0.8.tar.bz2 117049 RMD160 d01b299e6e96c2b5318aaec479c81670b94e2129
EBUILD xinit-1.0.8-r4.ebuild 2146 RMD160 76cfb718bcfd7ab710a7e3bb609a42c60172654e SHA1 33f000c3b440b517e5a1d5c60e346e6af38874e6 SHA256 ff68cfbbd6f36428a7bfefa0d28e409bdf5492f2df1b309066e46f22543f7cd7
EBUILD xinit-1.0.8-r7.ebuild 2282 RMD160 af442abba5f78d4208aa5e99e630384354ea80f0 SHA1 ee904a6ccaa3680331aae2b2238d430022c815ec SHA256 be7289008950fd658a10e59df310c9ba47b6e0d144d2ee8724781c5f53446ee5
EBUILD xinit-1.0.8-r8.ebuild 2208 RMD160 2752c5835fb40fb057803143d17e5fa42cfe0f2e SHA1 af68672475cb02a52e060cc678be8d09cb298783 SHA256 00fd826e060ccf84a80c7c4f4496630e5759ca8aa27af0c86300ec489ad7669e
-MISC ChangeLog 24260 RMD160 bd8ce393f782e93700eea74fd4682f2e469029e6 SHA1 746797f4200fd0622aa8b138736a895e824472f6 SHA256 8af6d22375aafd0570f5dd35abd7a0c14b5506a83450d98f4af8020d6072fcb1
+EBUILD xinit-1.0.8-r9.ebuild 2220 RMD160 65c5e4a85b5bcbdb30f65f48cd144a0a368b9270 SHA1 7d3b75825be6e9e43f327a255a62ad2e22bc4bf5 SHA256 2872eef774a644b327666336b1ecaaca20d36ec0a02751b1a6fa59f6d8ca59eb
+MISC ChangeLog 24523 RMD160 a60731ba70f26a4681ffcf182c442389deced714 SHA1 7594511627aec0ba3cb7fb91020074f25ad3280b SHA256 22be75f9c99a08061c3e211db814d44aa4be50c7501a79a5e2fbbc6f1ab59dc1
MISC metadata.xml 272 RMD160 d0b40c3604f1b076f4ea2ead421b7361de293dce SHA1 9105900f56ba880d256b70bce06dd1cb69b1d4e6 SHA256 0e394010bdee148e101784bb38e4b1cdb106da7e2e5a7fc4fde946c65d0e4f7d
diff --git a/x11-apps/xinit/files/xdm-setup.initd-1 b/x11-apps/xinit/files/xdm-setup.initd-1
index 79797a4f791a..1a4074e671fb 100644
--- a/x11-apps/xinit/files/xdm-setup.initd-1
+++ b/x11-apps/xinit/files/xdm-setup.initd-1
@@ -1,7 +1,7 @@
#!/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/xdm-setup.initd-1,v 1.5 2009/09/24 17:07:56 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm-setup.initd-1,v 1.6 2009/10/06 16:44:38 williamh Exp $
depend() {
need localmount
@@ -9,6 +9,6 @@ depend() {
start() {
if get_bootparam "nox" ; then
- touch /tmp/.noxdm
+ touch /etc/.noxdm
fi
}
diff --git a/x11-apps/xinit/files/xdm.initd-3 b/x11-apps/xinit/files/xdm.initd-3
index be0337d39358..aa4f1878fade 100755
--- a/x11-apps/xinit/files/xdm.initd-3
+++ b/x11-apps/xinit/files/xdm.initd-3
@@ -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-3,v 1.5 2009/09/24 17:07:56 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-3,v 1.6 2009/10/06 16:44:38 williamh Exp $
# This is here to serve as a note to myself, and future developers.
#
@@ -127,9 +127,9 @@ start() {
local EXE= NAME= PIDFILE=
setup_dm
- if [ -f /etc/init.d/.noxdm -o -f /tmp/.noxdm ] ; then
- einfo "Skipping ${EXE}, /etc/init.d/.noxdm or /tmp/.noxdm found"
- rm /etc/init.d/.noxdm /tmp/.noxdm
+ if [ -f /etc/init.d/.noxdm -o -f /tmp/.noxdm -o -f /etc/.noxdm ]; then
+ einfo "Skipping ${EXE}, .noxdm found in /tmp, /etc/init.d or /etc"
+ rm /etc/.noxdm /etc/init.d/.noxdm /tmp/.noxdm
return 0
fi
diff --git a/x11-apps/xinit/xinit-1.0.8-r9.ebuild b/x11-apps/xinit/xinit-1.0.8-r9.ebuild
new file mode 100644
index 000000000000..024625c2dd4a
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.0.8-r9.ebuild
@@ -0,0 +1,77 @@
+# 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-r9.ebuild,v 1.1 2009/10/06 16:44:39 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="consolekit minimal pam"
+
+RDEPEND="
+ x11-apps/xauth
+ x11-libs/libX11
+ consolekit? (
+ sys-auth/consolekit
+ sys-apps/dbus[X]
+ )
+"
+DEPEND="${RDEPEND}"
+PDEPEND="!minimal? (
+ x11-apps/xclock
+ x11-apps/xrdb
+ x11-apps/xsm
+ x11-terms/xterm
+ x11-wm/twm
+ )
+"
+
+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 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}"/xdm-setup.initd-1 xdm-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"
+}