From 16c584b1d45b7e4cc05e97536d1bccf8b472a0d5 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Sat, 19 Nov 2011 20:27:34 +0000 Subject: [PATCH] Add pam file to allow autologins. Bug #390863 thanks to Ben Kohler Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64 --- x11-misc/lightdm/ChangeLog | 9 +- x11-misc/lightdm/Manifest | 30 +++--- x11-misc/lightdm/files/lightdm-autologin | 10 ++ x11-misc/lightdm/lightdm-1.0.6-r3.ebuild | 117 +++++++++++++++++++++++ 4 files changed, 151 insertions(+), 15 deletions(-) create mode 100644 x11-misc/lightdm/files/lightdm-autologin create mode 100644 x11-misc/lightdm/lightdm-1.0.6-r3.ebuild diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog index 3dbae7a51b6a..08a8ad617d8c 100644 --- a/x11-misc/lightdm/ChangeLog +++ b/x11-misc/lightdm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-misc/lightdm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.22 2011/11/05 23:51:20 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.23 2011/11/19 20:27:34 hwoarang Exp $ + +*lightdm-1.0.6-r3 (19 Nov 2011) + + 19 Nov 2011; Markos Chandras +lightdm-1.0.6-r3.ebuild, + +files/lightdm-autologin: + Add pam file to allow autologins. Bug #390863 thanks to Ben Kohler + *lightdm-1.0.6-r2 (05 Nov 2011) diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest index d7a0536c4394..281a3126e725 100644 --- a/x11-misc/lightdm/Manifest +++ b/x11-misc/lightdm/Manifest @@ -3,27 +3,29 @@ Hash: SHA512 AUX Xsession 1641 RMD160 fec5ca0ab491c2d23a631d7bab4bfa634788841d SHA1 7261a104c145025c63f8febfcecc189badfd3e86 SHA256 fb38b265420e55b2fd96f003ab00ad2a2d2cd1902984c84239c8ca84eb9b66a9 AUX lightdm 209 RMD160 376933fdcdbc9a3196a1eb741f152cac7447c7b3 SHA1 4903519bee34d24c89e42de9e6a4199ff8e8396e SHA256 ccbc64732dce394e0d238e4c095bdbcab23b4adfdbcf213a763e26d96476d208 +AUX lightdm-autologin 369 RMD160 2adb17241b378ad4ca10e6241cb21b5a679c0973 SHA1 8372a199f5e00fb0d9d2630d0ced060f190d2af2 SHA256 e964a100e72a8eccea4ed8e1558ae70cbe5b7cbea67415651d0c0bdcea2d06c8 AUX session-wrapper-lightdm.patch 419 RMD160 899fd1b62b77ff1d3dcd46c35092486391f8bc2b SHA1 a609ddf728296ed8c139e2750ad3557e2a8bfec0 SHA256 de5504221cd31c6d25ccbb21f4559780564ce908e2306238d92dd4ac481e687a DIST introspection-20110205.m4.tar.bz2 1220 RMD160 c520adf7edf0e56012138208b45bed9df2a3e62f SHA1 092adcee1acce39e89069db0f3e8b4cb7ad89dea SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2 DIST lightdm-1.0.6.tar.gz 648433 RMD160 798fc0a3277e07e50a7c22b961027972f03d695c SHA1 5e9ab2fd7353cf17f06e11b581fdd3f1c21586a7 SHA256 745f2ffe58f90ffb318527d20520e1e8f04a36dfa2ac9cc00140857ef57284ae DIST lightdm-gentoo-patch.tar.gz 101983 RMD160 6463f6d96b635922ac0f060fbffe450caaec6a74 SHA1 63348e477bffa27c82839c74fe56d3bc4565a3b1 SHA256 2e56d0ef3926428cea7870fbade77b20bd05a7664ae301aacc56504e07cf39ba EBUILD lightdm-1.0.6-r2.ebuild 3380 RMD160 7feaa3efc2a47e4126a51fa1bf58b45c8d988b77 SHA1 e2faca1aac49e90401a218b6e92ad5f2e54f6062 SHA256 e868ac6e176732a4afbcf8713b6c92e4e31832dfeeea7922ea9c0ce0ffc09167 -MISC ChangeLog 3181 RMD160 e8522db39c1b0c3b7b885e0660e08d16c148a756 SHA1 3269e23167721822feb0b2ada651daa73a22de57 SHA256 ac5c69661651acf19ccb5e9e80d0805ea9a1605d444696e5d97918d9f328e062 +EBUILD lightdm-1.0.6-r3.ebuild 3418 RMD160 1104d2c6695b835aee2adfe46339668901ed7560 SHA1 6459ef7d0b6a7d876c0ca988c94bf9bdf5d31fe7 SHA256 9f67139bf736a97fe66a198aa4b15bb379064dd51a147beb0b933e0c9ce7370e +MISC ChangeLog 3413 RMD160 9455122a617c5ea3d65bb0653b0b8e4c3cb73c3e SHA1 627b8e16ffe888ad4c97ee3dcdc428279383c727 SHA256 7de0d8f1f4c2a5158fcd7a029c0281e9faebf9dcba587b22a275016d827ac27f MISC metadata.xml 476 RMD160 ffe13acf80a13cf4793170da46aac1087ab9e753 SHA1 6de246984b16415d8e1fe8cab2478ce5b1da4c31 SHA256 a3a8bd4e87cb4735bcc99606498b27552517c024d0ac85b05a7aec35c6c2983d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCgAGBQJOtcv+AAoJEPqDWhW0r/LCWLEP/RpeVs5SDj0Pb4HUys51rGBY -AsEQM8R4yMf8NM8IlqCIvpkn5aXOVwr8Eo8xaTuVWFS7uEahbR+rPOtNqPAofjeA -qRsX6QFjl/Gx7YRVJy1jZbfKq+f+RVqb3KSYV7HRdkVPFM3I7NXT1srEUNl7srI+ -AubnbRXJmyr1ptUA7vLnhsYKIeXWzPtcJEGV3ZtbecZpRdYika1hC5pNAzqzdf8G -WnoSHQ6lMyRMuaq3ZomBTDByP25jgnOLKiihMoLnXEJ1/B3uSIq1CEG1xy5OB7Ol -xB1NxR878J2yP241iQ1BCWunKyBbrno/StCpLpBwXZ1Gt3CTTWbNYTTzDzwoQJki -v8c+KQLkDAO8ytiv327ORhpxroGMTAOvDAPKdC/ldzamoKYOyRXiUTaAtpMJhj12 -tozKrprncg0KAq2yZxzRKx2WcDO0oE/xDhjvK58psfxe3msiCaHKlwbo0AnreYnH -PTb7KtM5byN7wPwjNPm35pBnGEc4TY63CTCbqNzOhqD4cSz8nD0q33K1ZdYewDQu -ZAJvKnu7jPwIbTjKrqjtEI+YLNmSQso7F5ePTpCwIO11UbhZDDFBt5Tgs2xYYP2j -5j/8BgwFWvHArURXEzErxaZGGBoNUWMKpXQ/nhxISmAld8SneiR+NQDbh6V53Zc6 -OA9dCbmKXU1CYJ5B+Toq -=C1Gw +iQIcBAEBCgAGBQJOyBE5AAoJEPqDWhW0r/LC2EoQAL7ndo2CKW7bhDpS2KGnb5mN +fmE53Po77VPFJB9r/TiIP/87GETBBv1j75Rct5jV+joORYJKjeblcrlGILl9LmV0 +Omg046ik9nWJqwQGWsWvZ70epWLetJKhRC36k3w4/ruGJTS4UeZubHvTZl/2UvJF +7WzJ8iovXVxah0Rilq7ZY6AzLYOMslbYjiPedEqbvbNXLsJnhfTPrfTRLtn3xVWk +vXeLyZ12tpUqUf/uurovVNrBhVd9bDklBItQasmunILb8VkNxjXxUI7bZB4AncpM +azi1EGvrchVILxRd98y2NoQbz064cFmo+NdQ4Ui/3QVF8CSzDoS3IErISOq7I95H +AqbMamewA4SSSt5oiA3brEuxul9fNmIXy7L/APbM7JXcS69WWx8HsuFTR03/qSOW +CejFK3VjsNbrcZV5J+UguL+Tti1ufCKjW4UV609dngLYJxUMXruxQXqW/SQlA9cV +W9kVAvnoQ4VaJDZXq3cw0bJfy52gqz1pMBwwN0AN/tNxuS310NHDAUat5O0cCFru +XMSwlAJD/evbvvN+qolhD5HM1yYRsDyqfk4K5davyZAO8YCdcGJv8LyX5wIC7nd4 +37ggVdU72pDhxgMVzblAFWmm7v9gtWa8RWbHtWy2ZWdQgRNSYqOYNxMhJFSUuKup +fqy2jQu7N5Ra/IyBARXR +=XZyj -----END PGP SIGNATURE----- diff --git a/x11-misc/lightdm/files/lightdm-autologin b/x11-misc/lightdm/files/lightdm-autologin new file mode 100644 index 000000000000..9d165d6d9cc5 --- /dev/null +++ b/x11-misc/lightdm/files/lightdm-autologin @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth optional pam_env.so +auth required pam_nologin.so +auth required pam_permit.so +account include system-login +password include system-login +session include system-auth +# For the keyring to unlock with autologin, you need to set an empty +# password on the keyring. +#Keyring=session optional pam_gnome_keyring.so auto_start diff --git a/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild b/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild new file mode 100644 index 000000000000..b90f2ca76a59 --- /dev/null +++ b/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild,v 1.1 2011/11/19 20:27:34 hwoarang Exp $ + +EAPI=4 +inherit autotools eutils pam + +DESCRIPTION="A lightweight display manager" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM" +SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz + mirror://gentoo/introspection-20110205.m4.tar.bz2 + gtk? ( http://dev.gentoo.org/~hwoarang/distfiles/${PN}-gentoo-patch.tar.gz )" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="branding +gtk +introspection qt4" + +RDEPEND="dev-libs/glib:2 + virtual/pam + x11-libs/libxklavier + x11-libs/libX11 + dev-libs/libxml2 + gtk? ( x11-libs/gtk+:3 + x11-themes/gnome-themes-standard + x11-themes/gnome-icon-theme ) + introspection? ( dev-libs/gobject-introspection ) + qt4? ( x11-libs/qt-core:4 + x11-libs/qt-dbus:4 ) + sys-apps/accountsservice" +DEPEND="${RDEPEND} + dev-lang/vala:0.12 + dev-util/intltool + dev-util/pkgconfig + gnome-base/gnome-common + sys-devel/gettext" + +REQUIRED_USE="branding? ( gtk ) || ( gtk qt4 )" +DOCS=( NEWS ) + +src_prepare() { + sed -i -e "/minimum-uid/s:500:1000:" data/users.conf || die + sed -i -e "s:gtk+-3.0:gtk+-2.0:" configure.ac || die + epatch "${FILESDIR}"/session-wrapper-${PN}.patch + + if has_version dev-libs/gobject-introspection; then + eautoreconf + else + AT_M4DIR=${WORKDIR} eautoreconf + fi +} + +src_configure() { + # Maybe in the future, we can support some automatic session and user + # recognition. Until then, use default values + local default=gnome greeter= user=root + + # gtk has higher priority because Qt4 interface sucks :) + use qt4 && greeter=lightdm-qt-greeter + use gtk && greeter=lightdm-gtk-greeter + + # Let user know how lightdm is configured + einfo "Gentoo configuration" + einfo "Default greeter: ${greeter}" + einfo "Default session: ${default}" + einfo "Greeter user: ${user}" + + # do the actual configuration + econf --localstatedir=/var \ + --disable-static \ + $(use_enable introspection) \ + $(use_enable qt4 liblightdm-qt) \ + $(use_enable qt4 qt-greeter) \ + $(use_enable gtk gtk-greeter) \ + --with-user-session=${default} \ + --with-greeter-session=${greeter} \ + --with-greeter-user=${user} \ + --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html +} + +src_install() { + default + + # Install missing files + insinto /etc/${PN}/ + doins "${S}"/data/{users,keys}.conf + doins "${FILESDIR}"/Xsession + fperms +x /etc/${PN}/Xsession + # remove .la files + find "${ED}" -name "*.la" -exec rm -rf {} + + rm -Rf "${ED}"/etc/init || die + + if use gtk; then + insinto /etc/${PN}/ + doins "${WORKDIR}"/${PN}-gtk-greeter.conf + if use branding; then + insinto /usr/share/${PN}/backgrounds/ + doins "${WORKDIR}"/gentoo1024x768.png + sed -i -e "/background/s:=.*:=/usr/share/${PN}/backgrounds/gentoo1024x768.png:" \ + "${D}"/etc/${PN}/${PN}-gtk-greeter.conf || die + fi + fi + + dopamd "${FILESDIR}"/${PN} + dopamd "${FILESDIR}"/${PN}-autologin +} + +pkg_postinst() { + elog + elog "Even though the default /etc/${PN}/${PN}.conf will work for" + elog "most users, make sure you configure it to suit your needs" + elog "before using ${PN} for the first time." + elog "You can test the configuration file using the following" + elog "command: ${PN} --test-mode -c /etc/${PN}/${PN}.conf. This" + elog "requires xorg-server to be built with the 'kdrive' useflag." + elog +} -- 2.26.2