| 1 |
angelos 08/01/01 18:06:15 |
| 2 |
|
| 3 |
Modified: ChangeLog slim-1.3.0-r1.ebuild |
| 4 |
Log: |
| 5 |
Install a default pam.d file and honor XSESSION |
| 6 |
(Portage version: 2.1.4_rc14) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.10 x11-misc/slim/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/slim/ChangeLog?rev=1.10&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/slim/ChangeLog?rev=1.10&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/slim/ChangeLog?r1=1.9&r2=1.10 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v |
| 18 |
retrieving revision 1.9 |
| 19 |
retrieving revision 1.10 |
| 20 |
diff -u -r1.9 -r1.10 |
| 21 |
--- ChangeLog 27 Oct 2007 18:02:37 -0000 1.9 |
| 22 |
+++ ChangeLog 1 Jan 2008 18:06:15 -0000 1.10 |
| 23 |
@@ -1,6 +1,9 @@ |
| 24 |
# ChangeLog for x11-misc/slim |
| 25 |
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.9 2007/10/27 18:02:37 angelos Exp $ |
| 27 |
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.10 2008/01/01 18:06:15 angelos Exp $ |
| 29 |
+ |
| 30 |
+ 01 Jan 2008; Christoph Mende <angelos@g.o> slim-1.3.0-r1.ebuild: |
| 31 |
+ Install a default pam.d file and honor XSESSION |
| 32 |
|
| 33 |
*slim-1.3.0-r1 (27 Oct 2007) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 x11-misc/slim/slim-1.3.0-r1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/slim/slim-1.3.0-r1.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/slim/slim-1.3.0-r1.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/slim/slim-1.3.0-r1.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: slim-1.3.0-r1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.0-r1.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- slim-1.3.0-r1.ebuild 27 Oct 2007 18:02:37 -0000 1.1 |
| 51 |
+++ slim-1.3.0-r1.ebuild 1 Jan 2008 18:06:15 -0000 1.2 |
| 52 |
@@ -1,8 +1,8 @@ |
| 53 |
-# Copyright 1999-2007 Gentoo Foundation |
| 54 |
+# Copyright 1999-2008 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.0-r1.ebuild,v 1.1 2007/10/27 18:02:37 angelos Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.0-r1.ebuild,v 1.2 2008/01/01 18:06:15 angelos Exp $ |
| 58 |
|
| 59 |
-inherit toolchain-funcs |
| 60 |
+inherit toolchain-funcs pam |
| 61 |
|
| 62 |
DESCRIPTION="Simple Login Manager" |
| 63 |
HOMEPAGE="http://slim.berlios.de" |
| 64 |
@@ -41,9 +41,11 @@ |
| 65 |
# Set slim to daemon mode as default to stop xdm runscript from throwing errors on stop |
| 66 |
# Set the default logfile to /dev/null to avoid cluttering up the harddisk |
| 67 |
# as slim puts a lot of garbage in its logfile |
| 68 |
+ # Make slim honor XSESSION in /etc/rc.conf by default. |
| 69 |
sed -i -e 's#X11R6/##g' -e 's#/usr/bin:##' \ |
| 70 |
-e 's/# daemon/daemon/' \ |
| 71 |
-e 's#/var/log/slim.log#/dev/null#g' \ |
| 72 |
+ -e '/^login_cmd.*/s#exec /bin/bash.*#exec /bin/bash -login /etc/X11/xinit/xinitrc#' \ |
| 73 |
slim.conf || die "sed failed in slim.conf" |
| 74 |
} |
| 75 |
|
| 76 |
@@ -58,6 +60,7 @@ |
| 77 |
src_install() { |
| 78 |
if use pam ; then |
| 79 |
emake USE_PAM=1 DESTDIR="${D}" install || die "emake install failed." |
| 80 |
+ pamd_mimic_system slim auth account password session |
| 81 |
else |
| 82 |
emake DESTDIR="${D}" install || die "emake install failed." |
| 83 |
fi |
| 84 |
@@ -68,17 +71,13 @@ |
| 85 |
pkg_postinst() { |
| 86 |
elog |
| 87 |
elog "The configuration file is located at /etc/slim.conf." |
| 88 |
+ elog |
| 89 |
elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" " |
| 90 |
elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"." |
| 91 |
+ elog "By default, ${PN} will use default XSESSION value set in /etc/rc.conf." |
| 92 |
elog |
| 93 |
- elog "${PN} uses .xinitrc in the user's home directory and /etc/slim.conf" |
| 94 |
- elog "for session management. For further information, see README and" |
| 95 |
- elog "xinitrc.sample in /usr/share/doc/${PF}." |
| 96 |
+ elog "If you want to use .xinitrc in the user's home directory for session management" |
| 97 |
+ elog "instead, see README and xinitrc.sample in /usr/share/doc/${PF}." |
| 98 |
+ elog "and change your login_cmd in /etc/slim.conf accordingly." |
| 99 |
elog |
| 100 |
- if use pam ; then |
| 101 |
- elog "You need to create /etc/pam.d/slim for SLiM to work." |
| 102 |
- elog "A simple symlink to /etc/pam.d/system-auth is enough," |
| 103 |
- elog "if you don't need any extra configuration" |
| 104 |
- elog |
| 105 |
- fi |
| 106 |
} |
| 107 |
|
| 108 |
|
| 109 |
|
| 110 |
-- |
| 111 |
gentoo-commits@g.o mailing list |
Archives