diff options
| author |   William Hubbs <williamh@gentoo.org> | 2009-10-07 16:59:42 +0000 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2009-10-07 16:59:42 +0000 |
| commit | e77415254c702c2ffb4ec37b46d93eb0568faaab (patch) | |
| tree | d13f88a293a74c36e211e25ccf7e35bd33f32c8a /x11-apps/xinit | |
| parent | ppc stable #282423 (diff) | |
| download | gentoo-2-e77415254c702c2ffb4ec37b46d93eb0568faaab.tar.gz gentoo-2-e77415254c702c2ffb4ec37b46d93eb0568faaab.tar.bz2 gentoo-2-e77415254c702c2ffb4ec37b46d93eb0568faaab.zip | |
only check for .noxdm in /etc. This is another update for #287913.
(Portage version: 2.2_rc44/cvs/Linux i686)
Diffstat (limited to 'x11-apps/xinit')
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 9 | ||||
| -rwxr-xr-x | x11-apps/xinit/files/xdm.initd-3 | 8 | ||||
| -rw-r--r-- | x11-apps/xinit/xinit-1.0.8-r10.ebuild (renamed from x11-apps/xinit/xinit-1.0.8-r9.ebuild) | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index 5f50e15c49d3..5a3e8d4d86b5 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,13 @@ # 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.153 2009/10/06 20:42:58 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.154 2009/10/07 16:59:41 williamh Exp $ + +*xinit-1.0.8-r10 (07 Oct 2009) + + 07 Oct 2009; William Hubbs <williamh@gentoo.org> -xinit-1.0.8-r9.ebuild, + +xinit-1.0.8-r10.ebuild, files/xdm.initd-3: + Another update for security bug #287913. + Now we only check for .noxdm in /etc. 06 Oct 2009; William Hubbs <williamh@gentoo.org> xinit-1.0.8-r8.ebuild, xinit-1.0.8-r9.ebuild: diff --git a/x11-apps/xinit/files/xdm.initd-3 b/x11-apps/xinit/files/xdm.initd-3 index aa4f1878fade..f5335c09a250 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.6 2009/10/06 16:44:38 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-3,v 1.7 2009/10/07 16:59:42 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 -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 + if [ -f /etc/.noxdm ]; then + einfo "Skipping ${EXE}, /etc/.noxdm found" + rm /etc/.noxdm return 0 fi diff --git a/x11-apps/xinit/xinit-1.0.8-r9.ebuild b/x11-apps/xinit/xinit-1.0.8-r10.ebuild index 8ea4a3f86b94..fe7d19b7eb90 100644 --- a/x11-apps/xinit/xinit-1.0.8-r9.ebuild +++ b/x11-apps/xinit/xinit-1.0.8-r10.ebuild @@ -1,6 +1,6 @@ # 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.2 2009/10/06 20:42:58 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.8-r10.ebuild,v 1.1 2009/10/07 16:59:41 williamh Exp $ EAPI="2" |