Don't set host to avoid bad interaction with pam_ck_connector.so from sys-auth/consolekit and use "system-local-login" wrt #346037 by Matthias Gehre.

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

4 files changed, 135 insertions, 2 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 9f33006323cd..13fa6f624124 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/slim
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.60 2010/11/07 21:20:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.61 2010/12/02 17:32:48 ssuominen Exp $
+
+*slim-1.3.2-r3 (02 Dec 2010)
+
+  02 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +files/346037-stop_setting_host_for_pam_ck_connector_so.patch,
+  +slim-1.3.2-r3.ebuild:
+  Don't set host to avoid bad interaction with pam_ck_connector.so from
+  sys-auth/consolekit and use "system-local-login" wrt #346037 by Matthias
+  Gehre.
 
   07 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> slim-1.3.2-r1.ebuild,
   slim-1.3.2-r2.ebuild:
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 6b27a476751d..d1bb6e5b4aae 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -2,6 +2,7 @@ AUX 14509-fix-keyboard-in-tty-from-which-slim-is-lauched.patch 754 RMD160 079984
 AUX 15287-fix-pam-authentication-with-pam_unix2.patch 3017 RMD160 ae6a20b9eb313bd6b9f93726d5519309a2bafc85 SHA1 e17c582fe0cc1d2a07e51d410db2d61c11aba4c6 SHA256 ced3b92f48ba09cd61287b72737ea58e499a7eedd4f61e25ee1b148d0b6cfbb3
 AUX 261359-fix-SIGTERM-freeze.patch 1284 RMD160 ba75eda8cc539138f68f26de18c76a5e290f4d93 SHA1 dd8b782438bbdb86c44a4e1cb64bd8c3e3afefe6 SHA256 bd3221c9b94cc64ba6f4d786ec57a5d085f247b283cd64117034be15fedc5201
 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 slim-1.3.2-r1-config.diff 2367 RMD160 ac53bf33f1e369a2e545e38b6029b8daaf5aba15 SHA1 f3731b6f4dcd9bf125b3f76057901eca1cc8c0e8 SHA256 e5bd697a68c08b70e02c2bc8fd3be85828a7a3f1019dfcb4f4609ed60039d53c
 AUX slim-1.3.2-r2-config.diff 2572 RMD160 217c3d64b77e0af496670cee82849a0500516d0d SHA1 7dbc1b0df45a49688b52bfc701acc3dc15019394 SHA256 7ea06809e15f40c5113d8c05df2b6ca4eb4ba9ebc1e9fc1747b080337997384d
@@ -9,5 +10,6 @@ AUX slim.logrotate 102 RMD160 ccf614eca8c0b8fc1fbc2dfb8bf71b02485a743b SHA1 d2bc
 DIST slim-1.3.2.tar.gz 220592 RMD160 1ca6504c07ea2d420fde86b6db0f4cfbbd6680fc SHA1 e421d5487732c8317f8f591906661e014b036358 SHA256 f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72dbd482b8
 EBUILD slim-1.3.2-r1.ebuild 3120 RMD160 2bc4013cb1bec42e7ad215f1ff42c9ce5ac81f18 SHA1 f4bc720a41bb7b98a0ff39a828ff5df11d34ad27 SHA256 b5b2a236f9fab5fa9dd775bc8ca7ed50b802910643c6754c758dc4edbab3ad36
 EBUILD slim-1.3.2-r2.ebuild 3482 RMD160 d4de8a124ecc94c893767ffeac46388d5c3b8623 SHA1 055462ecbd4c8647a76c8eab86d762351ea0c645 SHA256 0a042ba8f581d3365448943bec78602a1ae114759ff0be5679462df231b5bcbd
-MISC ChangeLog 9752 RMD160 da4c6bf7a68ffe334d307ce330ae4b6488003400 SHA1 bf4dfb77888e57e471f4e4b2b4d5154877cafba8 SHA256 0a04247e540b522e4f3fc653255918e2fad5a12a9a4afae94bf79039fb36ced7
+EBUILD slim-1.3.2-r3.ebuild 3583 RMD160 b4a16246d0624480393f21b6eaaa84719d5531a7 SHA1 315660b6b9e5fee4e2a0a186f3da402827489d21 SHA256 19c29e138d3807001c72331f62317dbd74e3ee7c04ac590bf48d18494a2673cb
+MISC ChangeLog 10083 RMD160 f83c3182b33d25bed842261aed400f3571706112 SHA1 ee5bb82756f5c2eb776cd6651a91e3152a88aa68 SHA256 a6868b2a1fef0aa1594d97394cdd2d9a55f58c233c6282e72a8c38c3053bcb95
 MISC metadata.xml 377 RMD160 6320bad8fc67d0814f8d74a83480ba2fb4ed5d2f SHA1 0e938430a8782f832c96a778c2a287f1787cce06 SHA256 4c607a49c6e35158356c67f5b1111626d66b7d72f4fc85f2303eb9b0e7600a8f
diff --git a/x11-misc/slim/files/346037-stop_setting_host_for_pam_ck_connector_so.patch b/x11-misc/slim/files/346037-stop_setting_host_for_pam_ck_connector_so.patch
new file mode 100644
index 000000000000..6d9c395f6bc4
--- /dev/null
+++ b/x11-misc/slim/files/346037-stop_setting_host_for_pam_ck_connector_so.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/346037
+
+--- app.cpp
++++ app.cpp
+@@ -236,7 +236,6 @@
+         pam.start("slim");
+         pam.set_item(PAM::Authenticator::TTY, DisplayName);
+         pam.set_item(PAM::Authenticator::Requestor, "root");
+-        pam.set_item(PAM::Authenticator::Host, "localhost");
+ 
+     }
+     catch(PAM::Exception& e){
diff --git a/x11-misc/slim/slim-1.3.2-r3.ebuild b/x11-misc/slim/slim-1.3.2-r3.ebuild
new file mode 100644
index 000000000000..ca813ec685ea
--- /dev/null
+++ b/x11-misc/slim/slim-1.3.2-r3.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2010 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-r3.ebuild,v 1.1 2010/12/02 17:32:49 ssuominen Exp $
+
+EAPI=2
+
+inherit toolchain-funcs pam eutils
+
+DESCRIPTION="Simple Login Manager"
+HOMEPAGE="http://slim.berlios.de"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="branding pam"
+
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXft
+	>=media-libs/libpng-1.4
+	virtual/jpeg
+	x11-apps/sessreg
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-proto/xproto"
+PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
+
+src_prepare() {
+	# respect C[XX]FLAGS, fix crosscompile,
+	# fix linking order for --as-needed"
+	sed -i -e "s:^CXX=.*:CXX=$(tc-getCXX) ${CXXFLAGS}:" \
+		-e "s:^CC=.*:CC=$(tc-getCC) ${CFLAGS}:" \
+		-e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \
+		-e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \
+		-e "s:-I/usr/include/libpng12:$(pkg-config --cflags-only-I libpng):" \
+		-e "s:-lpng12:$(pkg-config --libs-only-l libpng):" \
+		-r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \
+		Makefile || die "sed failed in Makefile"
+	# Our Gentoo-specific config changes
+	epatch "${FILESDIR}/${PN}-1.3.2-r2-config.diff"
+
+	if use branding; then
+		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
+	fi
+
+	# Gentoo bug 297655
+	epatch "${FILESDIR}/14509-fix-keyboard-in-tty-from-which-${PN}-is-lauched.patch"
+	# Upstream bug #15287
+	epatch "${FILESDIR}/15287-fix-pam-authentication-with-pam_unix2.patch"
+	# Gentoo Bug 261713
+	epatch "${FILESDIR}/261713-restart-xserver-if-killed.patch"
+	# Gentoo bug 261359, upstream 15326
+	epatch "${FILESDIR}/261359-fix-SIGTERM-freeze.patch"
+	# Gentoo bug 346037
+	epatch "${FILESDIR}/346037-stop_setting_host_for_pam_ck_connector_so.patch"
+}
+
+src_compile() {
+	if use pam ; then
+		emake USE_PAM=1 || die "emake failed."
+	else
+		emake || die "emake failed."
+	fi
+}
+
+src_install() {
+	if use pam ; then
+		emake USE_PAM=1 DESTDIR="${D}" install || die "emake install failed."
+		pamd_mimic system-local-login slim auth account session
+	else
+		emake DESTDIR="${D}" install || die "emake install failed."
+	fi
+
+	insinto /usr/share/slim
+	newins "${FILESDIR}/Xsession" Xsession || die "newins failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/slim.logrotate" slim || die "newins failed"
+
+	dodoc xinitrc.sample ChangeLog README TODO THEMES
+}
+
+pkg_postinst() {
+	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\"."
+	elog
+	elog "By default, ${PN} now does 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
+	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"
+	fi
+}