From: Jeremy Olexa Date: Fri, 19 Aug 2011 19:55:10 +0000 (+0000) Subject: revbump for consolekit fixes by Ian Stakenvicius X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c92f48d7333b434cd1dbbdc35396c08ec8c0e551;p=gentoo.git revbump for consolekit fixes by Ian Stakenvicius Package-Manager: portage-2.1.10.3/cvs/Linux i686 --- diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog index db5cdc2871c6..9f642b917ff7 100644 --- a/x11-misc/slim/ChangeLog +++ b/x11-misc/slim/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/slim # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.68 2011/08/16 02:18:37 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.69 2011/08/19 19:55:10 darkside Exp $ + +*slim-1.3.2-r5 (19 Aug 2011) + + 19 Aug 2011; Jeremy Olexa -slim-1.3.2-r4.ebuild, + +slim-1.3.2-r5.ebuild, files/Xsession-r2: + revbump for consolekit fixes by Ian Stakenvicius *slim-1.3.2-r4 (16 Aug 2011) diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest index b5f38fa9ce5e..006faedba90c 100644 --- a/x11-misc/slim/Manifest +++ b/x11-misc/slim/Manifest @@ -4,13 +4,13 @@ AUX 261359-fix-SIGTERM-freeze.patch 1284 RMD160 ba75eda8cc539138f68f26de18c76a5e AUX 261713-restart-xserver-if-killed.patch 3198 RMD160 97b6627b17f74a6fb88a967fee7364bdb3280710 SHA1 15d7bffb0588ac33ece488aa209c2418023d4739 SHA256 c4ff22a4930d6ef12ee6ff30f4782b64785c00d54f687ac620e5cbd5eee283f9 AUX 346037-stop_setting_host_for_pam_ck_connector_so.patch 328 RMD160 62012df3cccf607d8cba139b0754a7238bfb1dd3 SHA1 04f26bc3ad82dab47c8911f3ac069b756fe5a1a8 SHA256 51bee429be20f2538b19b84c311b136761acdf2b857661af11749e45cc73ad44 AUX Xsession 4215 RMD160 86ab057ea3f78a9604811a1bff7e5aad88c2f717 SHA1 46dc684b873b190b74df199eae39b38e0f5ffccc SHA256 55671397563aa32d89e66658e6594f17d4ddcddd1ad6aa2d7582ba56ceec7628 -AUX Xsession-r2 4045 RMD160 538a23b1f0812fe2243d678276bced4ea03256a3 SHA1 b4deabb6795738cedca66f171e2fc504dc0cc96d SHA256 5eaa3c03278443f27a8477397dd0bcaa5f95e7d0cf99448f028bf0165ce089af +AUX Xsession-r2 4262 RMD160 4346445ae8c0fb6857d098988863e9d9a368e326 SHA1 5798765fb36d260492e5aa58c7e73bb31674018c SHA256 13904325f2c6f905227059c7eb7cf162b233bdb5721ec95ef5e3f35e679a43a3 AUX slim-1.3.2-bsd-install.patch 1315 RMD160 290a7c31b077bce33b120ab55b9bdd3c6262d2be SHA1 a50d2e3e2810af82ab9bef058a72286734afd338 SHA256 bfb5a506b3baec6d24e6f0cfba34f045768bbccccc652af11199f30a7c45d843 AUX slim-1.3.2-libpng15.patch 247 RMD160 b28d9a376f4c01baa8b1aec0c5e0e76294997255 SHA1 3cd674e548f4e0aadbbd32a67b4efd1ed263afef SHA256 f84e3e4c069ec103a5f4ec2a60698bf9d035346b604dee59b6efc883c7f14042 AUX slim-1.3.2-r2-config.diff 2572 RMD160 217c3d64b77e0af496670cee82849a0500516d0d SHA1 7dbc1b0df45a49688b52bfc701acc3dc15019394 SHA256 7ea06809e15f40c5113d8c05df2b6ca4eb4ba9ebc1e9fc1747b080337997384d AUX slim.logrotate 102 RMD160 ccf614eca8c0b8fc1fbc2dfb8bf71b02485a743b SHA1 d2bc9202862f0d33bb902eba3aa8fefe0797d7a3 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a DIST slim-1.3.2.tar.gz 220592 RMD160 1ca6504c07ea2d420fde86b6db0f4cfbbd6680fc SHA1 e421d5487732c8317f8f591906661e014b036358 SHA256 f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72dbd482b8 EBUILD slim-1.3.2-r3.ebuild 3845 RMD160 c05d3a83231ff745710f184913797e54fa65d847 SHA1 a215c9cb6e4f01b59bccad3096c2efd9a0d021f2 SHA256 52b09e2d2a8b78c35b82001d5c71eb177494e15652c6a6ce34eeafc111858bc0 -EBUILD slim-1.3.2-r4.ebuild 3852 RMD160 47807963f7314fc2db281523cca61e007e9af52d SHA1 4a5df6f0fc144da7310613ca9a4d2bb43fb34b2d SHA256 191c34791e1e84370b7e3164a9ebd734d67b8ef016a582953c009ff841870dcf -MISC ChangeLog 11031 RMD160 fe7b0b46f1cce032c30d3601ad026028b79d68d7 SHA1 6285db744d93d65c170c6baa7dabc5b5618fce32 SHA256 98356ae71ffcdbc4e45e16698876e77eab0a84f443f3b9915006f653889a6086 +EBUILD slim-1.3.2-r5.ebuild 4393 RMD160 e7bd5e11e3cfd7dc45f996bc346794927ecdd536 SHA1 792540c74c00fbfd8fb8f044213b8f9e45cc5899 SHA256 7f2f28f8c7c37cfb5c3eae98b9eacaf1c4f691280b94bcae3eba9d83bdcab26d +MISC ChangeLog 11230 RMD160 cb2650c971b77fce854edf06c0b69fa085e9cf7a SHA1 cff9607d44f789a79f02e0d32b4f6d942658993b SHA256 1b54504a5aef81a3b93b898302a803729cc3388e68abfa68d0a4460fc5d04ba9 MISC metadata.xml 377 RMD160 6320bad8fc67d0814f8d74a83480ba2fb4ed5d2f SHA1 0e938430a8782f832c96a778c2a287f1787cce06 SHA256 4c607a49c6e35158356c67f5b1111626d66b7d72f4fc85f2303eb9b0e7600a8f diff --git a/x11-misc/slim/files/Xsession-r2 b/x11-misc/slim/files/Xsession-r2 index 237fb3630661..2712610f5b11 100644 --- a/x11-misc/slim/files/Xsession-r2 +++ b/x11-misc/slim/files/Xsession-r2 @@ -142,6 +142,9 @@ if [ -z "${command}" ]; then exec xterm -geometry 80x24+0+0 fi +# temporarily unset XDG_SESSION_COOKIE so consolekit launches a new session +realxdgcookie="$XDG_SESSION_COOKIE" +XDG_SESSION_COOKIE= # run all system xinitrc shell scripts which will update command if [ -d /etc/X11/xinit/xinitrc.d ]; then for i in /etc/X11/xinit/xinitrc.d/* ; do @@ -151,6 +154,9 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then done unset i fi +# restore XDG_SESSION_COOKIE +XDG_SESSION_COOKIE="$realxdgcookie" +unset realxdgcookie echo "$0: Setup done, will execute: $command" exec $command diff --git a/x11-misc/slim/slim-1.3.2-r4.ebuild b/x11-misc/slim/slim-1.3.2-r5.ebuild similarity index 85% rename from x11-misc/slim/slim-1.3.2-r4.ebuild rename to x11-misc/slim/slim-1.3.2-r5.ebuild index 296efc9a9368..6b54291f1ca7 100644 --- a/x11-misc/slim/slim-1.3.2-r4.ebuild +++ b/x11-misc/slim/slim-1.3.2-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.2-r4.ebuild,v 1.1 2011/08/16 02:18:37 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.2-r5.ebuild,v 1.1 2011/08/19 19:55:10 darkside Exp $ EAPI=2 @@ -110,9 +110,20 @@ pkg_postinst() { elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf" elog "accordingly." elog + ewarn "Please note that the slim session start script now supports consolekit" + ewarn "directly, via xinitrc.d scripts. Please remove any existing work-arounds to" + ewarn "avoid multiple calls to ck-launch-session." + if has_version "<=sys-auth/pambase-20101024[consolekit]" ; then + ewarn + ewarn "You should also remove the 'nox11' flag from the pam_ck_connector.so module " + ewarn "in /etc/pam.d/system-login if you have not already done so." + ewarn "(this is safe, it will be default in the next version of pambase)" + fi + elog if ! use pam; then elog "You have merged ${PN} without USE=pam, this will cause ${PN} to fall back to" elog "the console when restarting your window manager. If this is not" elog "desired, then please remerge ${PN} with USE=pam" + elog fi }