| 1 |
williamh 09/10/07 16:59:41 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: xinit-1.0.8-r10.ebuild |
| 5 |
Removed: xinit-1.0.8-r9.ebuild |
| 6 |
Log: |
| 7 |
only check for .noxdm in /etc. This is another update for #287913. |
| 8 |
(Portage version: 2.2_rc44/cvs/Linux i686) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.154 x11-apps/xinit/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/ChangeLog?rev=1.154&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/ChangeLog?rev=1.154&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/ChangeLog?r1=1.153&r2=1.154 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v |
| 20 |
retrieving revision 1.153 |
| 21 |
retrieving revision 1.154 |
| 22 |
diff -u -r1.153 -r1.154 |
| 23 |
--- ChangeLog 6 Oct 2009 20:42:58 -0000 1.153 |
| 24 |
+++ ChangeLog 7 Oct 2009 16:59:41 -0000 1.154 |
| 25 |
@@ -1,6 +1,13 @@ |
| 26 |
# ChangeLog for x11-apps/xinit |
| 27 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.153 2009/10/06 20:42:58 williamh Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.154 2009/10/07 16:59:41 williamh Exp $ |
| 30 |
+ |
| 31 |
+*xinit-1.0.8-r10 (07 Oct 2009) |
| 32 |
+ |
| 33 |
+ 07 Oct 2009; William Hubbs <williamh@g.o> -xinit-1.0.8-r9.ebuild, |
| 34 |
+ +xinit-1.0.8-r10.ebuild, files/xdm.initd-3: |
| 35 |
+ Another update for security bug #287913. |
| 36 |
+ Now we only check for .noxdm in /etc. |
| 37 |
|
| 38 |
06 Oct 2009; William Hubbs <williamh@g.o> xinit-1.0.8-r8.ebuild, |
| 39 |
xinit-1.0.8-r9.ebuild: |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 x11-apps/xinit/xinit-1.0.8-r10.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/xinit-1.0.8-r10.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/xinit-1.0.8-r10.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: xinit-1.0.8-r10.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2009 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $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 $ |
| 53 |
|
| 54 |
EAPI="2" |
| 55 |
|
| 56 |
# Must be before x-modular eclass is inherited |
| 57 |
# This is enabled due to modified Makefile.am from the patches |
| 58 |
SNAPSHOT="yes" |
| 59 |
|
| 60 |
inherit x-modular pam |
| 61 |
|
| 62 |
DESCRIPTION="X Window System initializer" |
| 63 |
|
| 64 |
LICENSE="${LICENSE} GPL-2" |
| 65 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
| 66 |
IUSE="consolekit minimal pam" |
| 67 |
|
| 68 |
RDEPEND=" |
| 69 |
x11-apps/xauth |
| 70 |
x11-libs/libX11 |
| 71 |
consolekit? ( |
| 72 |
sys-auth/consolekit |
| 73 |
sys-apps/dbus[X] |
| 74 |
) |
| 75 |
" |
| 76 |
DEPEND="${RDEPEND}" |
| 77 |
PDEPEND="!minimal? ( |
| 78 |
x11-apps/xclock |
| 79 |
x11-apps/xrdb |
| 80 |
x11-apps/xsm |
| 81 |
x11-terms/xterm |
| 82 |
x11-wm/twm |
| 83 |
) |
| 84 |
" |
| 85 |
|
| 86 |
PATCHES=( "${FILESDIR}"/nolisten-tcp-and-black-background.patch |
| 87 |
"${FILESDIR}"/gentoo-startx-customization-1.0.8.patch |
| 88 |
"${FILESDIR}"/xinit-1.0.4-console-kit.patch ) |
| 89 |
|
| 90 |
pkg_setup() { |
| 91 |
CONFIGURE_OPTIONS="$(use_with consolekit)" |
| 92 |
} |
| 93 |
|
| 94 |
src_prepare() { |
| 95 |
x-modular_patch_source |
| 96 |
|
| 97 |
sed -i -e "s:^XINITDIR.*:XINITDIR = \$(sysconfdir)/X11/xinit:g" "${S}/Makefile.am" |
| 98 |
|
| 99 |
x-modular_reconf_source |
| 100 |
} |
| 101 |
|
| 102 |
src_install() { |
| 103 |
x-modular_src_install |
| 104 |
exeinto /etc/X11 |
| 105 |
doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh || die |
| 106 |
exeinto /etc/X11/Sessions |
| 107 |
doexe "${FILESDIR}"/Xsession || die |
| 108 |
exeinto /etc/X11/xinit |
| 109 |
doexe "${FILESDIR}"/xinitrc || die |
| 110 |
newinitd "${FILESDIR}"/xdm.initd-3 xdm |
| 111 |
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
| 112 |
newconfd "${FILESDIR}"/xdm.confd-1 xdm |
| 113 |
newpamd "${FILESDIR}"/xserver.pamd xserver |
| 114 |
} |
| 115 |
|
| 116 |
pkg_postinst() { |
| 117 |
x-modular_pkg_postinst |
| 118 |
ewarn "If you use startx to start X instead of a login manager like gdm/kdm," |
| 119 |
ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or" |
| 120 |
ewarn "any executable. When you run startx, it will run this as the login session." |
| 121 |
ewarn "You can set this in a file in /etc/env.d/ for the entire system," |
| 122 |
ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)." |
| 123 |
ewarn "Here's an example of setting it for the whole system:" |
| 124 |
ewarn " echo XSESSION=\"Gnome\" > /etc/env.d/90xsession" |
| 125 |
ewarn " env-update && source /etc/profile" |
| 126 |
ewarn |
| 127 |
ewarn "If you use the nox boot option to prevent x from starting on boot," |
| 128 |
ewarn "you should now use gentoo=nox." |
| 129 |
} |
Archives