summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2013-08-22 18:32:10 +0000
committerIan Stakenvicius <axs@gentoo.org>2013-08-22 18:32:10 +0000
commitc5dcb6d82bcac1024804b433ea917c6b9eafef68 (patch)
tree934317dcda16ef2b663eae9695682d8903661b72 /x11-misc/slim
parentmasked new slim revision until it can be tested (diff)
downloadhistorical-c5dcb6d82bcac1024804b433ea917c6b9eafef68.tar.gz
historical-c5dcb6d82bcac1024804b433ea917c6b9eafef68.tar.bz2
historical-c5dcb6d82bcac1024804b433ea917c6b9eafef68.zip
if slim is started from its systemd service file then don't let it try to set up a consolekit session
Package-Manager: portage-2.1.12.2/cvs/Linux x86_64 Manifest-Sign-Key: 0x2B6559ED
Diffstat (limited to 'x11-misc/slim')
-rw-r--r--x11-misc/slim/ChangeLog9
-rw-r--r--x11-misc/slim/Manifest22
-rw-r--r--x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch122
-rw-r--r--x11-misc/slim/slim-1.3.5-r3.ebuild112
4 files changed, 249 insertions, 16 deletions
diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 8720fd03ef8a..47e1931d2b3d 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for x11-misc/slim
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.111 2013/08/03 06:54:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.112 2013/08/22 18:31:59 axs Exp $
+
+*slim-1.3.5-r3 (22 Aug 2013)
+
+ 22 Aug 2013; Ian Stakenvicius <axs@gentoo.org>
+ +files/slim-1.3.5-disable-ck-for-systemd.patch, +slim-1.3.5-r3.ebuild:
+ if slim is started from its systemd service file then don't let it try to set
+ up a consolekit session
03 Aug 2013; Agostino Sarubbo <ago@gentoo.org> slim-1.3.5-r2.ebuild:
Stable for sparc, wrt bug #475192
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index b0cc1ed82fff..b5c7b9b994cb 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -1,31 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
AUX Xsession-r3 4045 SHA256 5eaa3c03278443f27a8477397dd0bcaa5f95e7d0cf99448f028bf0165ce089af SHA512 6c0bfba4c3f00b75d6b5fb0e0e8a492fa262b2d0f3c6382861d7f3a8c657e803151a2060e181439952649fd2acf6fa71b75811565f1156018027ec14a761f7d0 WHIRLPOOL 4808e5a3303bf4e8aff965cf1e77e4ca45413468f54dfa163ced9e848a53d19f705b203054002729f05d2efcc303b8456fd76644de8c1fb28613a43599c815cb
AUX slim-1.3.4-config.diff 2757 SHA256 03a8091b01f97f388c986ddbd5fba4d8634d4c97805678919de6304e89b6dbab SHA512 f1001fe897a33e22440edc83a9bc3ff77dc4854224d232812352ccaf622c3563957d9ed838071e8438c756878197eeaa98656a23218b9fe2970d54dbd24314b0 WHIRLPOOL 0cd9f83239cb9d7e70e53be439c67f39a024f3e8e4a7676098e611061d75a7b69a3a63072d6ca8c2ab33df536f51c020769886138c343118109793a5463e2da7
AUX slim-1.3.5-arm.patch 289 SHA256 95c7be21f8a176ce649e2dd804b8c2fa019e5e206a2532233f8b76bdbf201fba SHA512 1d3a3a387433c8bfc9bff6ac3779e70e0e0ca5f65e6120dd83fb51d59dfa47facc6d31c6e955b737e41ebf760416015f7f12dc749e710957cbef274aa5d1d308 WHIRLPOOL 54cb1cff534d30c157460a729a054cb4089b39dbf950b7d78462f6cc8f1dcc1770b6943fe0e24198ad0313cd2c359e0684d35e99155e3945fc19e14638986437
+AUX slim-1.3.5-disable-ck-for-systemd.patch 3303 SHA256 e309716a177bcff758f2e5b807a99380d503ae08a819048cacd01f1010a40791 SHA512 64205963f8f56f012dd16c2aea18e2e4f4e155093d44222a512b242061b334b7faa9c3abdd1acc011213f0fed9007cf232da8c61e6cedc30c710b149fa841f04 WHIRLPOOL cc3e45fe35e5b178213f261f22e3f54e4175e501a6bd7b3a042206d14713d9f038238f531d1dd872abe15a8d118d5ccd0edec83028e49ad8df3ba1d77c55812c
AUX slim-1.3.5-honour-cflags.patch 445 SHA256 fdac5dfd24d853af0dc0dc49857890455fdb682097db60f9826ccb8584522e13 SHA512 82e16d6ffa7291b00b6078e960b35352658deff7833bb05d00c80202588856b06678e5d7a09e1166152920dd2dfb3eefb4ea5f084976bc346bbf09489832acbd WHIRLPOOL 84b773c1b0b41d1d6b55f55669b8db4d6f40c4886d99ca6983f28845c2b8db80c807c54929f79da1d4139126bb1c95a159f98189fdb5332a9f0750571ad15dd3
AUX slim-1.3.5-systemd-service.patch 430 SHA256 3dceb91b4d5f6cc086116530e4c261b6984d73e39dfdf132f4201b1ab0c68a98 SHA512 0a83cdf71c9aa521598ffdfda79deb7750e71585d9b7f54f956ec4219039ceb249de2a4f1a7af312a0e3535a24829cf24edddbd1340b30f02d23d817ffb2a223 WHIRLPOOL c19683aa5aedb2758ce406b5ba561ee69f7b4a8565733399ece6169dedd19991d071e6912a4d006dbc9dc07976185fedd82dd6340c112c1238407dc83e335497
AUX slim.logrotate 102 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2 WHIRLPOOL 9e940bd1d88613e46ac4a333afa0f02cd16c583a1b34f509c4409321f7d5c5e14ec86e38e9743a6176187a72e403683127fbaf293abbef678e23873c428613c1
DIST slim-1.3.5.tar.gz 226413 SHA256 818d209f51e2fa8d5b94ef75ce90a7415be48b45e796d66f8083a9532b655629 SHA512 09757dc115488efd883eeced70ddb7d13afca0738e9cc531b2a66065e55eef52a3f67f5352365f7b9762b75132be4eb18bcbb12d47b3f79bb9ec0e0e2f62d85e WHIRLPOOL 61742167f8c732719411c58d8358a065800db828dae4fe94aad3690ba3f70bd9c57476ea21d09298a96c6236cd5308e83398ba36b43f46aa729363eccb4367c3
EBUILD slim-1.3.5-r1.ebuild 3275 SHA256 0bb7af87f2a288c4c52a8fa6519b81c01c3e5a54fbcaf6e737ec9f875ad441bb SHA512 81e29b19ace0dba145c4ef10feb4466c3aca15f777c7ae709abc155484d79f032181d4c2e6585968e0246c7e477a329dc3b58824e5c572380506d60f15d74fe7 WHIRLPOOL 788719233fb6e7ca4630c3c2a812b6c403501a251c55eb3c18a545731e17d3e3c870364af52ffe90585f77ec4ba4098c1e6b77656727d205b4daf4e047d369bd
EBUILD slim-1.3.5-r2.ebuild 3322 SHA256 43e81db9d02fa480e42a8f9c8a4d1c318b8402200b448e06e9f49ce76468d560 SHA512 74f5f5d5f7e37ef85dfd53baf9f23a28024a58ba89985b0d5c841a8329bcb66453b03c0ae1f7f767304bd56d98f3b471735ac837f51d18fd38eeee532b5ebfd6 WHIRLPOOL 1428cfba3bfa62ce70461b45ce470d96ca8dbc1e9980c84e285553e54c987fd31aa5af0d007ffc283ccfb9032392d92ccc52efea88bbff785dd23a5adcbd72dc
-MISC ChangeLog 18008 SHA256 f73097b8c9376caab6e66e656c7a4a402ebbb8905a58d525d3394938101bd018 SHA512 046ef42bc7aa3d71c524a77ef1698bb5d8f8c9749b872871a2bb9fc6969e01878691b81897f1941ceb4ed1be6a138a314f8596781e0c6f7245e2ffe84cc40da2 WHIRLPOOL a8de32f82d5edc018382f1e0ecabf1caec52fc503c23cb3d2363c27a02691777084f9f8462d265badb600d8e2ae59956f8ffb57b0706cff4b8f16594e7696a9a
+EBUILD slim-1.3.5-r3.ebuild 3384 SHA256 ff40980bcd4087dcf5afdd984578311c74191d6ddb61d7977b65e11d9c168f93 SHA512 e06b1c0b2a5396e8b24f6e90b9cc13e6d66196d84ae59d43c0f74a529536bbec0325cb6f374612899b29837bd4a992cc21e282aa9a64e4785d34713fb1096918 WHIRLPOOL ed7a8fe806ad2a608d16f07e35dae2bd1300ebdbf360d89578fb0a419fd692d783e4de184834ddc76c5aa8b96b1626a04f5b1d59baad38629ef3c02a5c00a1c7
+MISC ChangeLog 18267 SHA256 ba43c9cbb649d9a2b56a5dec8688979c44c1f43357b8b90f9344400cab199085 SHA512 36212cfe8fd6f428d830f49a68f2026ee851154a02df74bf347714ed99754d7ddda65927c684bd175386910c4bbe68f1304aec689abd2a8f270432af86713e1c WHIRLPOOL 4b950adb2898374a79954e09246fc5f55f14d40c5089662d7dec5a27ba35e8c030f21c4b6a057d42ee03bcec063d53eb9b1c4f69e69c15cddef147a47c146f11
MISC metadata.xml 317 SHA256 5b7154fd1fce1e40461b40b06533854dc7605d8b5eb19f68eeb9d84527c579c4 SHA512 6b5a9244c1b0fc0abec27900a10673fc431a0559d8cddd917d4117965e4ae569c153bc47ba3342ca4d8b114b949bcf10205a3d07645eb2a2834f300152028687 WHIRLPOOL 886788720a8dd6ca0fefa991e6e5f1640fa5913594be0acb6abcf92bb8e2d684a793721bdbb60a243f39cee097704b00620ae77c75a1f7d55672e875a34dedfc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQIcBAEBCgAGBQJR/KhQAAoJELp701BxlEWfRBgP/1o/C8csF1/Du9qPA7enokvw
-sKfN6B6kfuMtyz2Z/sw0+DmzYQqx8Dfxm3xuHJYpNXQq/0rrNIuNoOni62sV61WY
-vcswoDQmWi/QSCmsQjB1GOrrsjxgeqiVxF0rx0vLNJlrOAwZsJNd3LdGXpPcGxOp
-m2aWe/tDWuLByjGedbvtCv4tHgJsDrmUMPTXM8WoGNZUGigWc7N7Ye1+Eunk83nj
-qcpRJG+P0x5mkqDaipmryqqhe4D3TK+u2VEPZTPQn5k2uvlPCc201VInBpFsUmoP
-fZ9lTVKKk0TBu3GoQk76Xle+iAsoUyzyp782weJdUc+/H5sFqp2Jlc+sI2iXeiKJ
-WDBWJ4aW4f4Fv01PQ3zrXvDOsowDg7ZK0wdLcj7KsxP7bXQ7ZDYpLNfDkiFv7zqM
-pJccQCPY8JffVCHCna18DlfJuQTRtUHf1irGX5oWQcO2hz7JFFKjAPDFBCZl3wui
-XQFORBp5tKWehmJwZ6hNS7JAr52T7Yc1dt6i0Hzhfd84XEXxMGB4+GRKpDeedKPQ
-hamznQRIavbHDZYLSOxSuCanZENnHXMSrn1/YORvPpEX2YRdEERzefcQD4Ck+dam
-u9Nvxxy8sguisBde8HSYwxgiVHsoh5IMWT1dQNJM2/6eG0kZUNzoe77O6HyNpLKK
-KSpPXrDDvhEKhLLd0bnp
-=/3Mt
+iF4EAREIAAYFAlIWWTYACgkQ2ugaI38ACPBgcQD9G2kYze3BeQCVr0oLDcAkSwVY
+83oL86oeZjIBVYvDe2gA/2tpSemxP1w9D5HMCKtbBBv178U0XnQod5i7KftPgCiM
+=0jxB
-----END PGP SIGNATURE-----
diff --git a/x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch b/x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch
new file mode 100644
index 000000000000..f7e361767615
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch
@@ -0,0 +1,122 @@
+diff -Naur slim-1.3.5/app.cpp slim-1.3.5.new/app.cpp
+--- slim-1.3.5/app.cpp 2012-12-31 08:03:42.000000000 -0500
++++ slim-1.3.5.new/app.cpp 2013-08-22 14:16:37.994854259 -0400
+@@ -138,11 +138,14 @@
+ daemonmode = false;
+ force_nodaemon = false;
+ firstlogin = true;
++#ifdef USE_CONSOLEKIT
++ consolekit_support_enabled = true;
++#endif
+ Dpy = NULL;
+
+ /* Parse command line
+ Note: we force a option for nodaemon switch to handle "-nodaemon" */
+- while((tmp = getopt(argc, argv, "vhp:n:d?")) != EOF) {
++ while((tmp = getopt(argc, argv, "vhsp:n:d?")) != EOF) {
+ switch (tmp) {
+ case 'p': /* Test theme */
+ testtheme = optarg;
+@@ -163,6 +166,11 @@
+ std::cout << APPNAME << " version " << VERSION << endl;
+ exit(OK_EXIT);
+ break;
++#ifdef USE_CONSOLEKIT
++ case 's': /* Disable consolekit support */
++ consolekit_support_enabled = false;
++ break;
++#endif
+ case '?': /* Illegal */
+ logStream << endl;
+ case 'h': /* Help */
+@@ -171,6 +179,9 @@
+ << " -d: daemon mode" << endl
+ << " -nodaemon: no-daemon mode" << endl
+ << " -v: show version" << endl
++#ifdef USE_CONSOLEKIT
++ << " -s: start for systemd, disable consolekit support" << endl
++#endif
+ << " -p /path/to/theme/dir: preview theme" << endl;
+ exit(OK_EXIT);
+ break;
+@@ -559,6 +570,7 @@
+ #endif
+
+ #ifdef USE_CONSOLEKIT
++ if (consolekit_support_enabled) {
+ /* Setup the ConsoleKit session */
+ try {
+ ck.open_session(DisplayName, pw->pw_uid);
+@@ -567,6 +579,7 @@
+ logStream << APPNAME << ": " << e << endl;
+ exit(ERR_EXIT);
+ }
++ }
+ #endif
+
+ /* Create new process */
+@@ -578,6 +591,7 @@
+ char** child_env = pam.getenvlist();
+
+ # ifdef USE_CONSOLEKIT
++ if (consolekit_support_enabled) {
+ char** old_env = child_env;
+
+ /* Grow the copy of the environment for the session cookie */
+@@ -590,6 +604,7 @@
+ memcpy(child_env, old_env, sizeof(char*)*n+1);
+ child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
+ child_env[n] = NULL;
++ }
+ # endif /* USE_CONSOLEKIT */
+ #else
+
+@@ -611,6 +626,7 @@
+ child_env[n++]=StrConcat("MAIL=", maildir.c_str());
+ child_env[n++]=StrConcat("XAUTHORITY=", xauthority.c_str());
+ # ifdef USE_CONSOLEKIT
++ if (consolekit_support_enabled)
+ child_env[n++]=StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
+ # endif /* USE_CONSOLEKIT */
+ child_env[n++]=0;
+@@ -656,12 +672,14 @@
+ }
+
+ #ifdef USE_CONSOLEKIT
++ if (consolekit_support_enabled) {
+ try {
+ ck.close_session();
+ }
+ catch(Ck::Exception &e) {
+ logStream << APPNAME << ": " << e << endl;
+ };
++ }
+ #endif
+
+ #ifdef USE_PAM
+diff -Naur slim-1.3.5/app.h slim-1.3.5.new/app.h
+--- slim-1.3.5/app.h 2012-12-31 08:03:42.000000000 -0500
++++ slim-1.3.5.new/app.h 2013-08-22 14:12:45.536850016 -0400
+@@ -108,6 +108,10 @@
+ char *testtheme;
+ bool testing;
+
++#ifdef USE_CONSOLEKIT
++ bool consolekit_support_enabled;
++#endif
++
+ std::string themeName;
+ std::string mcookie;
+
+diff -Naur slim-1.3.5/slim.service slim-1.3.5.new/slim.service
+--- slim-1.3.5/slim.service 2012-12-31 08:03:42.000000000 -0500
++++ slim-1.3.5.new/slim.service 2013-08-22 14:15:39.186853186 -0400
+@@ -3,7 +3,7 @@
+ After=systemd-user-sessions.service
+
+ [Service]
+-ExecStart=/usr/bin/slim -nodaemon
++ExecStart=/usr/bin/slim -nodaemon -s
+
+ [Install]
+ Alias=display-manager.service
diff --git a/x11-misc/slim/slim-1.3.5-r3.ebuild b/x11-misc/slim/slim-1.3.5-r3.ebuild
new file mode 100644
index 000000000000..b4a62ea92db8
--- /dev/null
+++ b/x11-misc/slim/slim-1.3.5-r3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.5-r3.ebuild,v 1.1 2013/08/22 18:31:59 axs Exp $
+
+EAPI=5
+
+CMAKE_MIN_VERSION="2.8.8"
+inherit cmake-utils pam eutils systemd versionator
+
+DESCRIPTION="Simple Login Manager"
+HOMEPAGE="http://slim.berlios.de"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="branding pam consolekit"
+REQUIRED_USE="consolekit? ( pam )"
+
+RDEPEND="x11-libs/libXmu
+ x11-libs/libX11
+ x11-libs/libXpm
+ x11-libs/libXft
+ media-libs/libpng:0=
+ virtual/jpeg
+ x11-apps/sessreg
+ consolekit? ( sys-auth/consolekit
+ sys-apps/dbus )
+ pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ x11-proto/xproto"
+PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
+
+src_prepare() {
+ # Our Gentoo-specific config changes
+ epatch "${FILESDIR}"/${PN}-1.3.4-config.diff
+ epatch "${FILESDIR}"/${P}-arm.patch
+ epatch "${FILESDIR}"/${P}-systemd-service.patch
+ epatch "${FILESDIR}"/${P}-honour-cflags.patch
+ epatch "${FILESDIR}"/${P}-disable-ck-for-systemd.patch
+
+ if use elibc_FreeBSD; then
+ sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
+ || die
+ fi
+
+ if use branding; then
+ sed -i -e 's/ default/ slim-gentoo-simple/' slim.conf || die
+ fi
+}
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use pam USE_PAM)
+ $(cmake-utils_use consolekit USE_CONSOLEKIT)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use pam ; then
+ pamd_mimic system-local-login slim auth account session
+ fi
+
+ insinto /usr/share/slim
+ newins "${FILESDIR}/Xsession-r3" Xsession
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/slim.logrotate" slim
+
+ dodoc xinitrc.sample ChangeLog README TODO THEMES
+}
+
+pkg_postinst() {
+ # note, $REPLACING_VERSIONS will always contain 0 or 1 PV's for slim
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog
+ elog "The configuration file is located at /etc/slim.conf."
+ elog
+ elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" "
+ elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"."
+ fi
+ if ! version_is_at_least "1.3.2-r7" "${REPLACING_VERSIONS:-1.0}" ; then
+ elog
+ elog "By default, ${PN} is set up to do proper X session selection, including ~/.xsession"
+ elog "support, as well as selection between sessions available in"
+ elog "/etc/X11/Sessions/ at login by pressing [F1]."
+ elog
+ elog "The XSESSION environment variable is still supported as a default"
+ elog "if no session has been specified by the user."
+ elog
+ elog "If you want to use .xinitrc in the user's home directory for session"
+ elog "management instead, see README and xinitrc.sample in"
+ elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
+ elog "accordingly."
+ elog
+ ewarn "Please note that slim supports consolekit directly. Please do not use any "
+ ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)"
+ ewarn "and enable USE=\"consolekit\" instead."
+ ewarn
+ fi
+ 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 desired, then"
+ elog "please remerge ${PN} with USE=\"pam\""
+ elog
+ fi
+}