revision bump to fix bug 252280 by Ian Stakenvicius

Package-Manager: portage-2.1.10.11/cvs/Linux i686

5 files changed, 227 insertions, 2 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 9f642b917ff7..79067b14770f 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,13 @@
 # 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.69 2011/08/19 19:55:10 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.70 2011/09/07 17:38:56 darkside Exp $
+
+*slim-1.3.2-r6 (07 Sep 2011)
+
+  07 Sep 2011; Jeremy Olexa <darkside@gentoo.org>
+  +files/252280-fix-default_user-focus_passwd.patch, +slim-1.3.2-r6.ebuild,
+  +files/slim-1.3.2-r3-config.diff:
+  revision bump to fix bug 252280 by Ian Stakenvicius
 
 *slim-1.3.2-r5 (19 Aug 2011)
 
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 006faedba90c..fe329d00dc7a 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -1,5 +1,6 @@
 AUX 14509-fix-keyboard-in-tty-from-which-slim-is-lauched.patch 754 RMD160 079984153eb6ca97dafc94b065aeff6c57cf19ee SHA1 25fc499e10133c5325823453202aefdf828c3c21 SHA256 72995a16600174994864b9af959659d321c1fc6aa093650ed0b95b6760d91a13
 AUX 15287-fix-pam-authentication-with-pam_unix2.patch 3017 RMD160 ae6a20b9eb313bd6b9f93726d5519309a2bafc85 SHA1 e17c582fe0cc1d2a07e51d410db2d61c11aba4c6 SHA256 ced3b92f48ba09cd61287b72737ea58e499a7eedd4f61e25ee1b148d0b6cfbb3
+AUX 252280-fix-default_user-focus_passwd.patch 328 RMD160 ca60567fc2f03403bbd60fcec3b4b9f67395b758 SHA1 6d92330ea136c1dcdbbd0144f19b30a18038e2da SHA256 daf91f437df93eb6fea03de20d6659d43d58b76aba126a87d17dd9ac0bf22999
 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
@@ -8,9 +9,11 @@ AUX Xsession-r2 4262 RMD160 4346445ae8c0fb6857d098988863e9d9a368e326 SHA1 579876
 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-1.3.2-r3-config.diff 2736 RMD160 c570cf88acac9ac15bfb1caba025358564b4d13b SHA1 a79319663573c92b224d1d83b11747ca4d5a5a2f SHA256 cb5b95ae0102dc3625ec7b0f82103ababfd3ba97eeec107d9b034838a9ebc328
 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-r5.ebuild 4393 RMD160 e7bd5e11e3cfd7dc45f996bc346794927ecdd536 SHA1 792540c74c00fbfd8fb8f044213b8f9e45cc5899 SHA256 7f2f28f8c7c37cfb5c3eae98b9eacaf1c4f691280b94bcae3eba9d83bdcab26d
-MISC ChangeLog 11230 RMD160 cb2650c971b77fce854edf06c0b69fa085e9cf7a SHA1 cff9607d44f789a79f02e0d32b4f6d942658993b SHA256 1b54504a5aef81a3b93b898302a803729cc3388e68abfa68d0a4460fc5d04ba9
+EBUILD slim-1.3.2-r6.ebuild 4479 RMD160 478b1e99780458fc96543bf2469914fab7569da5 SHA1 caa79557d6688595ff5f3df2c27dc191d1dd8ce3 SHA256 768537dda16b80be339a9571bfc51f3c3b3d019db43376ee6e018ea92f7fb369
+MISC ChangeLog 11477 RMD160 5d6eababbea9c9efbf05fc6a25b8f0f5544e5427 SHA1 b8de1d07e3418a088db86eb47d9721aab8dc2be1 SHA256 abdb20fdd2ffb0a13f593e819a4c6b726f0fbbd24b05e4f09823ec690afbb986
 MISC metadata.xml 377 RMD160 6320bad8fc67d0814f8d74a83480ba2fb4ed5d2f SHA1 0e938430a8782f832c96a778c2a287f1787cce06 SHA256 4c607a49c6e35158356c67f5b1111626d66b7d72f4fc85f2303eb9b0e7600a8f
diff --git a/x11-misc/slim/files/252280-fix-default_user-focus_passwd.patch b/x11-misc/slim/files/252280-fix-default_user-focus_passwd.patch
new file mode 100644
index 000000000000..6ffbafe08057
--- /dev/null
+++ b/x11-misc/slim/files/252280-fix-default_user-focus_passwd.patch
@@ -0,0 +1,10 @@
+--- /var/tmp/portage/x11-misc/slim-1.3.2-r5/work/slim-1.3.2/panel.cpp	2011-09-07 12:36:06.000000000 -0400
++++ /tmp/panel.cpp	2011-09-07 12:35:19.000000000 -0400
+@@ -644,6 +644,7 @@
+ 
+ void Panel::SetName(const string& name){
+     NameBuffer=name;
++    action = Login;
+     return;
+ };
+ const string& Panel::GetName(void) const{
diff --git a/x11-misc/slim/files/slim-1.3.2-r3-config.diff b/x11-misc/slim/files/slim-1.3.2-r3-config.diff
new file mode 100644
index 000000000000..3cdcee3f1837
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.2-r3-config.diff
@@ -0,0 +1,74 @@
+--- slim.conf.orig	2010-08-25 11:52:23.000000000 -0400
++++ slim.conf	2010-08-25 11:58:58.000000000 -0400
+@@ -2,7 +2,7 @@
+ # Note: -xauth $authfile is automatically appended
+ default_path        /bin:/usr/bin:/usr/local/bin
+ default_xserver     /usr/bin/X
+-#xserver_arguments   -dpi 75
++xserver_arguments   -nolisten tcp -br -deferglyphs 16
+ 
+ # Commands for halt, login, etc.
+ halt_cmd            /sbin/shutdown -h now
+@@ -18,7 +18,7 @@
+ 
+ 
+ # Activate numlock when slim starts. Valid values: on|off
+-# numlock             on
++numlock             on
+ 
+ # Hide the mouse cursor (note: does not work with some WMs).
+ # Valid values: true|false
+@@ -33,7 +33,8 @@
+ # to adjust the command according to your preferred shell,
+ # i.e. for freebsd use:
+ # login_cmd           exec /bin/sh - ~/.xinitrc %session
+-login_cmd           exec /bin/bash -login ~/.xinitrc %session
++# login_cmd           exec /bin/bash -login ~/.xinitrc %session
++login_cmd           exec /bin/bash -login /usr/share/slim/Xsession %session
+ 
+ # Commands executed when starting and exiting a session.
+ # They can be used for registering a X11 session with
+@@ -41,20 +42,27 @@
+ #
+ # sessionstart_cmd	some command
+ # sessionstop_cmd	some command
++sessionstart_cmd	/usr/bin/sessreg -a -l :0.0 %user
++sessionstop_cmd     /usr/bin/sessreg -d -l :0.0 %user
+ 
+ # Start in daemon mode. Valid values: yes | no
+ # Note that this can be overriden by the command line
+ # options "-d" and "-nodaemon"
+-# daemon	yes
++daemon	yes
+ 
+-# Available sessions (first one is the default).
+-# The current chosen session name is replaced in the login_cmd
++# Available sessions:
++# The current chosen session name replaces %session in the login_cmd
+ # above, so your login command can handle different sessions.
++# If no session is chosen (via F1), %session will be an empty string.
+ # see the xinitrc.sample file shipped with slim sources
+-sessions            xfce4,icewm,wmaker,blackbox
++#sessions            xfce4,icewm,wmaker,blackbox
++# Alternatively, read available sessions from a directory:
++sessiondir           /etc/X11/Sessions
+ 
+-# Executed when pressing F11 (requires imagemagick)
++# Executed when pressing F11 (requires media-gfx/imagemagick for import)
++# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info.
+ screenshot_cmd      import -window root /slim.png
++#screenshot_cmd      scrot /root/slim.png
+ 
+ # welcome message. Available variables: %host, %domain
+ welcome_msg         Welcome to %host
+@@ -83,8 +88,8 @@
+ # randomly choose from
+ current_theme       default
+ 
+-# Lock file
+-lockfile            /var/run/slim.lock
++# Lock file, /etc/init.d/xdm expects slim.pid
++lockfile            /var/run/slim.pid
+ 
+ # Log file
+ logfile             /var/log/slim.log
diff --git a/x11-misc/slim/slim-1.3.2-r6.ebuild b/x11-misc/slim/slim-1.3.2-r6.ebuild
new file mode 100644
index 000000000000..e30738efb391
--- /dev/null
+++ b/x11-misc/slim/slim-1.3.2-r6.ebuild
@@ -0,0 +1,131 @@
+# 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-r6.ebuild,v 1.1 2011/09/07 17:38:56 darkside 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 ~x86-fbsd"
+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-r3-config.diff
+
+	if use elibc_FreeBSD; then
+		sed -i -e "s/CUSTOM=-DHAVE_SHADOW/CUSTOM=-DNEEDS_BASENAME/" Makefile \
+			|| die "sed failed in Makefile"
+		epatch "${FILESDIR}"/${PN}-1.3.2-bsd-install.patch
+	fi
+
+	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
+	# Gentoo bug 378505
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+	# Gentoo bug 252280
+	epatch "${FILESDIR}"/252280-fix-default_user-focus_passwd.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-r2" 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
+	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
+}