revision bump, fix pam module as per bug #422495. This makes pam_systemd.so back working

4 files changed, 104 insertions, 2 deletions

diff --git a/lxde-base/lxdm/ChangeLog b/lxde-base/lxdm/ChangeLog
index b4788175f3ed..2bf48dff1ca5 100644
--- a/lxde-base/lxdm/ChangeLog
+++ b/lxde-base/lxdm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for lxde-base/lxdm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/ChangeLog,v 1.20 2012/08/14 17:39:47 vostorga Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/ChangeLog,v 1.21 2013/05/03 21:02:01 lxnay Exp $
+
+*lxdm-0.4.1-r6 (03 May 2013)
+
+  03 May 2013; Fabio Erculiani <lxnay@gentoo.org> +lxdm-0.4.1-r6.ebuild,
+  +files/lxdm-0.4.1-pam-use-system-local-login.patch:
+  revision bump, fix pam module as per bug #422495. This makes pam_systemd.so
+  back working
 
   14 Aug 2012; Víctor Ostorga <vostorga@gentoo.org> lxdm-0.4.1-r5.ebuild,
   +files/lxdm-0.4.1-selinux-support.patch:
diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index 64f48c8f1610..46d098c6330c 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -5,9 +5,11 @@ AUX lxdm-0.4.1-configure-add-pam.patch 1410 SHA256 22d9a569755acd1ffadc23939b6b2
 AUX lxdm-0.4.1-event-check.patch 704 SHA256 f5e2e29c7ea307959c4fb3e34433bb63de3efef5e14be11e4c6dfeedb1cdacb1 SHA512 459dc8106a836f6b6cdb6eb64a4d818a5af17318e800f5d6194a6ec7fcc9ce1bc2957516670dc191d5ae8bb325144997958dc2e7062f59cb38b98abf6ec60cd1 WHIRLPOOL 6208e31029cc29bfd840312f77fdc99a20881a8476dd31a41b8ec8742f1eebbdcb964062f313c5967a1919dff554f871098764b0f3990438a0c74da0c98cb4f6
 AUX lxdm-0.4.1-git-fix-null-pointer-deref.patch 1560 SHA256 a33e3226c463bc445d7d27b11e34de8b09c7c1fdf44be8628d54334fd41b7ea3 SHA512 204124b2558280183e71799c2e006c9efb97b17bc5ef5f9cbf68afd0a4da2568d6e3d7a8d7dc3e12283b8d2febea541793fd72861ca7d692f1595be209d47f62 WHIRLPOOL 9f253d5b674c4a156e9fc99389c62c6271ca674beb109293992ba040520751310d229b270834a172c98275b2a5db6090679c41c663003a970c2bc60ddf631545
 AUX lxdm-0.4.1-missing-pam-defines.patch 583 SHA256 b9aa62fc73ce8f52f354388bcec0a03c228b40ba1a86e2aba1071501ecc1a5d8 SHA512 e7ebb98cae18874152ed5ae528db452428db5f0311cf92eeec93dc9bffaefb101fb587466e9f7c015199cf25c1fbc45ac1c20e3f41d7dd087622ac2e53b812e9 WHIRLPOOL ea2e3b6db573642ea79573e5a473a1ac00d6216fa1a848bb0b10b690a0f39a643fa43ff9f3f58467f6a4ad5083df8ee553f6315ed290e6d76d306ad023889707
+AUX lxdm-0.4.1-pam-use-system-local-login.patch 513 SHA256 4200ca07cae26479d449de2cc0e0f4acf83b621f7dfcf314e8f91dd0e7a1e02d SHA512 82c21faf6fdc07bae6ea9af7b186d3ce2cae84879e1f6e1675d232d5d26883ba0f0eae66b8fbfa9da67fede2b017c867195c23ff68d80818d44452f5c06d34cd WHIRLPOOL c74c57560e557ff4d8a4719b485975b054397a8dc88e85a68cc5acdead318d611f1a597c58a3f2097609967c28fed506a3f82a0c88656f6a2bc1088853ea90fb
 AUX lxdm-0.4.1-pam_console-disable.patch 344 SHA256 51d1a0f0b5749e451e313df3bd3d08b3f5181f00eb01993973393c1b4dcd8ad2 SHA512 15ebae762ca266da2986c6dc29b866068e7120457da253cc0513fb285c386869f35c074c2cd1cc1ff05045f533e565400cf39ae2f484eafb29fb2faeb2d260e4 WHIRLPOOL 42255d3a834333a0c830b1a8a045e526dd3ef93271a943eea542932cf04533de7e43ba3eea459c0c758e4851f3736b3a50f158c49a5a770fafce6dfefee173f5
 AUX lxdm-0.4.1-selinux-support.patch 281 SHA256 e260022bcf9954d4b404b4a3ea5c1679165e2b7e33a1a327b61fd1ef796cb962 SHA512 8875c92a2159b0390c00a1460c294c8ebdfa8920c38d7edeaf0108813cfc59eb6aebacb28e7d5d8012177809f29962035afe6c4a9ea439f6bcdb630fd31b626c WHIRLPOOL a08ceaaefda33045eb76450c8d22906f8cac95337dccf921bc4c7bb91c83e33e7f3d55814e8738276ff0218bda4234617e0640cd5c5048412fef1f276c9f812a
 DIST lxdm-0.4.1.tar.gz 296714 SHA256 9e0d0a5672fcf31a18de8178ce73eab1723d6ae7097dfe41e9fe2c46e180cf08 SHA512 8ed4a955a910def4db66958d1cb24976db178b8763199a024b6c2119894745e3646566c42d01472dffbbcbb7fd21784b01e74dc88038e01caebaa3b6d720ff27 WHIRLPOOL 1bbb55bf955f46aaac54ca3372c09308baa496297e56026456e464217f115d6b26994e8be6b6b228b663bb2e14cf9d5ace6930f75024f6426825dd4fefc5349f
 EBUILD lxdm-0.4.1-r5.ebuild 1781 SHA256 1c5d6dbc34265d959014fcbb96b8295ad77ec82e7617953fb7e226876af9911f SHA512 de0a624da1a5e84484cd7b5a51525666a4a1af3789ec97c278628fb86c331198f83e4aba38a63c88be680ca17811b269011110fbd76a1df837c70dca6299c26d WHIRLPOOL 416cdb931dab3c2257e0be7187c3fcc827a8024e4b54df13b617ce42ec50e945d4cffa2657e29310d9c3318e10a793aa020841d223b2127f71c960f80de85d02
+EBUILD lxdm-0.4.1-r6.ebuild 1783 SHA256 c808cd3ad61edd67614687e91f6475281888a0fe5826d34de610f0e8cc45bee1 SHA512 a14da80606e18a28ae77fc36c41b1fde8bdbe820dcc42fe09c5958f9e9c1fe03b860102dfab1c66237a9ac419395e53cdf2d338f93719a17d000299b9b8be31e WHIRLPOOL d23a5c36ae81f53ec9360d5b6bca148c727bb8938f6c5782c8c44dcfc2f81b5a98fb1bdfae2a644c44c9b90dda365c5c99660799fd7b387b0152d2817353fc00
 MISC ChangeLog 4203 SHA256 53cc59656ece9f14a0731b65fa7011ed86966016efcc8aceebf0f145f6d3ceef SHA512 6dfb6b0bafa133953d51f281babc0a2fa3b4c44f07b643fcd695b62ba98a3b6e68e898dd3e5251fce303bc870a372b021acf2733c104bc15b9e9bbf7fda76b35 WHIRLPOOL 8f841d2c5f5a8f19de7908099fb10c03b5e67f0c2f1b849580c6e9e100dfbc23371b0fa04c4da2f062facfd8fed7fa7a5be02ee250210f3d780a869008abfc4f
 MISC metadata.xml 223 SHA256 e15ef2fc5873f28166f85528ac107cbd4e075170081abac2dc82683809160336 SHA512 485cf94a986683862c2f0b9242da995997c3eb8315534849dc8202cb7c728ce4323193745f9c50ac739f1f0e8777a921909749644fcee8b5a220750b747c1e20 WHIRLPOOL bea35ad8b5a589b0d839025d715bb762c330dfdcef44339d9f46db6a6cb96de9ca0fecd523c80ba9145c83e1213c71f60df28b9ab52dae30e9d8ac0717eab74c
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-pam-use-system-local-login.patch b/lxde-base/lxdm/files/lxdm-0.4.1-pam-use-system-local-login.patch
new file mode 100644
index 000000000000..9f723a2f2bed
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.4.1-pam-use-system-local-login.patch
@@ -0,0 +1,15 @@
+--- lxdm-0.4.1.orig/pam/lxdm
++++ lxdm-0.4.1/pam/lxdm
+@@ -1,9 +1,9 @@
+ #%PAM-1.0
+-auth       substack	system-auth
++auth       substack	system-local-login
+ auth       optional	pam_gnome_keyring.so
+-account    include	system-auth
++account    include	system-local-login
+ session    optional	pam_keyinit.so force revoke
+-session    include	system-auth
++session    include	system-local-login
+ session    required	pam_loginuid.so
+ #session    optional	pam_console.so
+ session    optional	pam_gnome_keyring.so auto_start
diff --git a/lxde-base/lxdm/lxdm-0.4.1-r6.ebuild b/lxde-base/lxdm/lxdm-0.4.1-r6.ebuild
new file mode 100644
index 000000000000..83c541b01672
--- /dev/null
+++ b/lxde-base/lxdm/lxdm-0.4.1-r6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2013 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-r6.ebuild,v 1.1 2013/05/03 21:02:01 lxnay 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 ~arm ~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
+	virtual/pkgconfig"
+
+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
+
+	# 403999
+	epatch "${FILESDIR}"/${P}-missing-pam-defines.patch
+
+	# 412025
+	epatch "${FILESDIR}"/${P}-event-check.patch
+
+	# 393329 Selinux support
+	epatch "${FILESDIR}"/${P}-selinux-support.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_configure() {
+	econf	--enable-password \
+		--with-x \
+		--with-xconn=xcb \
+		$(use_enable gtk3) \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		$(use_with pam)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README TODO || die
+}
+
+pkg_postinst() {
+	echo
+	elog "LXDM in the early stages of development!"
+	echo
+}