Drop xinitrc. Add pam support. Bug #393681 and Bug #393675. Thanks to Mitch Harder <mmharder@gmail.com>

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

5 files changed, 142 insertions, 69 deletions

diff --git a/lxde-base/lxdm/ChangeLog b/lxde-base/lxdm/ChangeLog
index 313b3fbf1f2f..0559184915cb 100644
--- a/lxde-base/lxdm/ChangeLog
+++ b/lxde-base/lxdm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for lxde-base/lxdm
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/ChangeLog,v 1.11 2011/09/27 12:38:52 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/ChangeLog,v 1.12 2012/02/04 10:43:33 hwoarang Exp $
+
+*lxdm-0.4.1-r3 (04 Feb 2012)
+
+  04 Feb 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/lxdm-0.4.1-configure-add-pam.patch,
+  +files/lxdm-0.4.2-configure-add-pam.patch, +lxdm-0.4.1-r3.ebuild,
+  -files/xinitrc:
+  Drop xinitrc. Add pam support. Bug #393681 and Bug #393675. Thanks to Mitch
+  Harder <mmharder@gmail.com>
 
 *lxdm-0.4.1-r2 (27 Sep 2011)
 
diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index 344b0ea2257c..369a347ff183 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -4,31 +4,32 @@ Hash: SHA512
 AUX lxdm-0.3.0-consolekit-disable.patch 272 RMD160 2f0a98002f85ca47b529cc9ae530b6907100b85b SHA1 810371ac3319c3ebcc39e420a2b64d00ee27210b SHA256 b23a338405f6d01a9a93e7afaaf95a91cb8e5f36d2b864d955f0dcc452f8680a
 AUX lxdm-0.3.0-pam_console-disable.patch 260 RMD160 fa8fb4bd2d0d57235924bb241688b491988fccb3 SHA1 820ef218b6f379bc63c8f24cd43e58fc75769004 SHA256 0e9dbcf422b8db8e559015fb7d50fa0c73006c2f5550f6832b2ba36e38b3c0e0
 AUX lxdm-0.3.0-properly-load-session-settings-using-dmrc-entry-as-pointer-for-xsessions-dir-file.patch 932 RMD160 752138f9d851080e9a8a31838c6ca95b0a0bf97b SHA1 d4e9525483494ab87a61d852c42e8186d0aeaf7e SHA256 d3ad21a7643b86706d5d7f4ec4cf09dbe9805e3eea95c4c035abbf5049ff0c10
+AUX lxdm-0.4.1-configure-add-pam.patch 1410 RMD160 a753542f639ed85a679985edfb14ed47c075d3d3 SHA1 a8eff61c224ba6ff4d3cdb2736b720ac5e74fed6 SHA256 22d9a569755acd1ffadc23939b6b2d0845f0956efafda31b3a91dbd5580a5815
 AUX lxdm-0.4.1-git-fix-null-pointer-deref.patch 1560 RMD160 d08dcf5f05df205649418ee932a05dcc94500a82 SHA1 67596f26225d36af8d165f31ca027a87d7fec799 SHA256 a33e3226c463bc445d7d27b11e34de8b09c7c1fdf44be8628d54334fd41b7ea3
 AUX lxdm-0.4.1-pam_console-disable.patch 344 RMD160 faa1026b361b4e5bf0b002651cb1bcf45f5f8800 SHA1 8169882a4bcdeeba34586d0fd5bd0dc3048556bc SHA256 51d1a0f0b5749e451e313df3bd3d08b3f5181f00eb01993973393c1b4dcd8ad2
-AUX xinitrc 1549 RMD160 f75ead6179a30f718019cc062c14f06dffc88369 SHA1 bdb6ae9f3bdcbc7c1fc893615fbdd3bbb1190d92 SHA256 59b2f69c3a5eba060b2eaae43fc871d9b014419e3b51c84af95cee10f429880c
 DIST lxdm-0.3.0.tar.gz 271373 RMD160 989868e611df4aafe817eaca399ca54155e3dc16 SHA1 a8bcf9e8dcda4203b846c09ee9d9d8c7e2374746 SHA256 19d167898299937c3b2787a0583f308e99e732fa1647fec60083edf812efa638
 DIST lxdm-0.4.1.tar.gz 296714 RMD160 cacb103b8ac90b3afa450e9dee3ec01ed0c69a12 SHA1 652886ac27ac01b24e7d13c3be3b1e582e2159cc SHA256 9e0d0a5672fcf31a18de8178ce73eab1723d6ae7097dfe41e9fe2c46e180cf08
 EBUILD lxdm-0.3.0-r1.ebuild 1314 RMD160 2b64fcd1108d941c2beafbb4d447bc3117b3deda SHA1 e533d98abd0ade2df7cf1dcbaacbf2d4caea6832 SHA256 82b63bcb28671761b43ab72869956e93b532c0d8726d3eb1d370f725f1f2877a
 EBUILD lxdm-0.3.0-r3.ebuild 1504 RMD160 d16106d0379a81f4558a2dc0524df83ede24710c SHA1 53176d1965d8480df11382f5cc2c7bf112658f50 SHA256 f12a450fa8009699e271b340033ec4f30b490990cf26040548670b0f9c568657
 EBUILD lxdm-0.4.1-r1.ebuild 1593 RMD160 ac8e9959c3acbcf5593aafaec7a26b4ad6f209e4 SHA1 c236891a0962920f2be88bf2b1859baf091867a4 SHA256 66be29bea86e4183c37d102cb543f49e588b332872a3bd329e87389900a0a951
 EBUILD lxdm-0.4.1-r2.ebuild 1581 RMD160 265b98e4f4484aea96c4fbf29bafd438973b8021 SHA1 baf96643435e23dbdedd9a503dd5401fcd1be85c SHA256 7d6c933cc82632d5194ba456d11b7b1de5c1b2809364bbbe2d3e78832ec637b1
-MISC ChangeLog 2379 RMD160 95017894af9d84f275efd623e74e025f655fa920 SHA1 02a00ce72f91257a88dbe60b8118d96b6526a350 SHA256 32d1550837d8d53533cb0f7064d70d6aafdc7a7d70fd0d119ece7ecd4398d2a5
+EBUILD lxdm-0.4.1-r3.ebuild 1590 RMD160 50322a4fa0d6f6a3156bae53f347c9404c19cf56 SHA1 162e4fbcb46a9c6108ef8f6a3986ba32a8de7931 SHA256 4bac9a652c4b7bc2f2f7482a731431b7b39e45139e29e2b7c0fb5cc54e8ab0e4
+MISC ChangeLog 2702 RMD160 17abbe23997a2373b2798b81056d985488a341f7 SHA1 b4c01631ad69e4814874b86dcd6602e27c2f479a SHA256 a3ca75e8ac03aaa8cc6dd0d5afcdb23f3e9c4469a60609bdab81311f784a3416
 MISC metadata.xml 307 RMD160 780146af5f44d5a94235167d9f27fa430e374101 SHA1 c018aecad3148053495b66d84c45f17bf7c5d5c6 SHA256 854f7a5d79f761b1a129a5f227d74854cd4a5e62827fe6022cddd8dfc2a4b264
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOgcOvAAoJEPqDWhW0r/LCvjMQAKHPQMN1saZYGSRjLsUwCJGu
-tjVigAC9oB2PaIc4tStTj74ztLKcnug2u+WgP17M1ScYbIJ/R7XhZzi3ctDRreni
-ASD1q7uFzs9YlJowkkVbr3RmYWZVxsvtUvN/TuxI9n8wxxWpf+T8yvNBlFD1rh8h
-WRT/Aj6shp5uXTO/3gPk/0pOUQ07TBwg6lI4z4R45DZdk6qiwuA1s/cmU6dc63dT
-9gxGbBdMiUmdc9JHUEiDO14Hpi3CPM6oeyWJ/0NTxHfzijlKfTMfwYa55D5qZVco
-TyhoPIugfJZm1KbrcqBT0uYTVgZ8j/MsX+weMZyUeVqMqioXkUq4iMisSH02w2M/
-Ji0kgygBsTa6Ayje4Bm8biLcMJJJxTdggSixk6X/lQE1x/Rzp4KDumqzmfZ0rJxk
-oyww0qiqqlYnZLZYyCShvEC1qORd7FjAvOx/To11ETg4B4RhumnxDhjwV5uPvedf
-rUrzC7pQL5z8IwnTptGOF2M6yrOrz/frnHmDFQR2MIYjPuamdJNTYQBnkF43qcjq
-Q5UPQWiMEqdPqT0DVEihiZz1EEmo9cllfBQIldnOH8si/aVAUb28g9r75WlBvqd3
-qdDckPtn21/yrFOjm6z9hy3mFNtcNDzH7tqFkfuMY3d+TKeBoNvuttyFP2qK6azw
-iyjjzaYBxOMkPqSO8Icl
-=xebO
+iQIcBAEBCgAGBQJPLQvUAAoJEPqDWhW0r/LCbBIP/0qih2zBySA+0K1lUwYIf2E6
+05bh2DuDzbqP5qqSVcphI+wIG3R/+wQVLmHVuVWmBQrn7nQ/qbOWx9lNxOlvPa8Q
+spv2PGKn4DTXNYdm9W6i7c9uWk92hYvRDfanXBef9GpxHBQpIiWZgQm1zBLD6WsP
+bEtErPe6ftqelvalrOnkiZQoTdTlzBewsr8R0TvR4bnRuM0W4MD3sbGfEQkPoRIh
+qbyzXYvCGFS8V2gErr/rSqThysNl+70/ZqkqYeskF5FWqoRaVjwuJShLZYwqI12/
+OSPMDzt7asCDOFhDWowEI6SWM/3/JY9mDizdADhuxauyt9B7/SgxNsNRL4A2B6xe
+KDF8GnucZJUGzMoM5MKBJZ9qXD2U5lsCABhWkKOej/7Jh/EVdhY2+0b0Crg6UhG3
+k9Ntn3MCY/RcTEpCElZim+BEROpzscPk5wN93VYumnYC9amNG88552prOwA+1UiB
+mexzUGHC1Uzm/1jokPl/Kw1oZjnvNachXxjDcu4eDYXTAd6+1H7yOW6DA1HhvqXc
+gmnf2DAj4+Lpxm8P8rqLRnnbWlhHwKaAxBv5LcQxoJWBFl/YhdKWAiCpbrX96oId
+6tzD991hlxrV7QSWLUxwIV9i6EXJNS6FwKKXeKkfy08DI7Ifqc8GaEPaUB5gfjKp
+ufPA86YSZYngRq2sD/6y
+=fw34
 -----END PGP SIGNATURE-----
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch b/lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch
new file mode 100644
index 000000000000..d91bf75a67bd
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch
@@ -0,0 +1,45 @@
+From 949ee91acb55baeb4b8761957eabd2e5a345d2ae Mon Sep 17 00:00:00 2001
+From: Mitch Harder <mitch.harder@sabayonlinux.org>
+Date: Thu, 8 Dec 2011 11:02:28 -0600
+Subject: Fix configure.ac test for pam libs.
+
+A bug report on Gentoo noted that the configure test for pam
+wasn't working correctly.
+https://bugs.gentoo.org/show_bug.cgi?id=384615
+
+This corrections borrows the configure.ac pam testing method used in xdm.
+---
+ configure.ac |   13 +++++++++++--
+ 1 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e952473..eaa883a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,12 +14,21 @@ AC_PROG_INSTALL
+ AM_PROG_CC_C_O
+ 
+ # Checks for libraries.
+ AC_CHECK_LIB([crypt], [crypt])
+ 
+-AC_ARG_WITH(pam,AC_HELP_STRING([--without-pam],[build without pam]),
+-[],[AC_CHECK_LIB([pam], [pam_open_session])])
++# Check for PAM support
++AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam],[Use PAM for authentication]),
++	[USE_PAM=$withval], [USE_PAM=$use_pam_default])
++if test "x$USE_PAM" != "xno" ; then
++	AC_SEARCH_LIBS(pam_open_session,[pam])
++	AC_CHECK_FUNC(pam_open_session, 
++		[AC_DEFINE(USE_PAM,1,[Use PAM for authentication])],
++		[if test "x$USE_PAM" != "xtry" ; then
++			AC_MSG_ERROR(["PAM support requested, but pam_open_session not found."])
++		 fi])
++fi
+ 
+ AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
+ 
+ # Checks for header files.
+ AC_PATH_X
+-- 
+1.7.3.4
+
diff --git a/lxde-base/lxdm/files/xinitrc b/lxde-base/lxdm/files/xinitrc
deleted file mode 100644
index 013b8164dcf8..000000000000
--- a/lxde-base/lxdm/files/xinitrc
+++ /dev/null
@@ -1,52 +0,0 @@
-# Source for this script borrowed from portions of kdm's Xsession.
-
-case $SHELL in
-  */bash)
-    [ -z "$BASH" ] && exec $SHELL $0 "$@"
-    set +o posix
-    [ -f /etc/profile ] && . /etc/profile
-    if [ -f $HOME/.bash_profile ]; then
-      . $HOME/.bash_profile
-    elif [ -f $HOME/.bash_login ]; then
-      . $HOME/.bash_login
-    elif [ -f $HOME/.profile ]; then
-      . $HOME/.profile
-    fi
-    ;;
-  */zsh)
-    [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@"
-    emulate -R zsh
-    [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc
-    zhome=${ZDOTDIR:-$HOME}
-    # zshenv is always sourced automatically.
-    [ -f $zdir/zprofile ] && . $zdir/zprofile
-    [ -f $zhome/.zprofile ] && . $zhome/.zprofile
-    [ -f $zdir/zlogin ] && . $zdir/zlogin
-    [ -f $zhome/.zlogin ] && . $zhome/.zlogin
-    ;;
-  */csh|*/tcsh)
-    # [t]cshrc is always sourced automatically.
-    # Note that sourcing csh.login after .cshrc is non-standard.
-    xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
-    $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c export -p >! $xsess_tmp"
-    . $xsess_tmp
-    rm -f $xsess_tmp
-    ;;
-  *) # Plain sh, ksh, and anything we do not know.
-    [ -f /etc/profile ] && . /etc/profile
-    [ -f $HOME/.profile ] && . $HOME/.profile
-    ;;
-esac
-
-[ -f /etc/xprofile ] && . /etc/xprofile
-[ -f $HOME/.xprofile ] && . $HOME/.xprofile
-
-# run all system xinitrc shell scripts.
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-	for i in /etc/X11/xinit/xinitrc.d/* ; do
-		if [ -x "$i" ]; then
-			. "$i"
-		fi
-	done
-fi
-
diff --git a/lxde-base/lxdm/lxdm-0.4.1-r3.ebuild b/lxde-base/lxdm/lxdm-0.4.1-r3.ebuild
new file mode 100644
index 000000000000..b3a18c24c2ad
--- /dev/null
+++ b/lxde-base/lxdm/lxdm-0.4.1-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/lxdm-0.4.1-r3.ebuild,v 1.1 2012/02/04 10:43:33 hwoarang Exp $
+
+EAPI="2"
+
+inherit eutils autotools
+
+DESCRIPTION="LXDE Display Manager"
+HOMEPAGE="http://lxde.org"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug gtk3 nls pam"
+
+RDEPEND="sys-auth/consolekit
+	x11-libs/libxcb
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	nls? ( sys-devel/gettext )
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	dev-util/pkgconfig"
+
+src_configure() {
+	econf	--enable-password \
+		--with-x \
+		--with-xconn=xcb \
+		$(use_enable gtk3) \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		|| die "econf failed"
+}
+
+src_prepare() {
+	# Upstream bug, tarball contains pre-made lxdm.conf
+	rm "${S}"/data/lxdm.conf || die
+
+	# There is consolekit
+	epatch "${FILESDIR}/${P}-pam_console-disable.patch"
+	# Fix null pointer dereference, backported from git
+	epatch "${FILESDIR}/${P}-git-fix-null-pointer-deref.patch"
+
+	epatch "${FILESDIR}"/${P}-configure-add-pam.patch
+
+	# this replaces the bootstrap/autogen script in most packages
+	eautoreconf
+
+	# process LINGUAS
+	if use nls; then
+		einfo "Running intltoolize ..."
+		intltoolize --force --copy --automake || die
+		strip-linguas -i "${S}/po" || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README TODO || die
+}
+
+pkg_postinst() {
+	echo
+	elog "LXDM in the early stages of development!"
+	echo
+}