Fix pam support. Thanks to Simon Poirier for investigating this. Bug #403999

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

4 files changed, 66 insertions, 27 deletions

diff --git a/lxde-base/lxdm/ChangeLog b/lxde-base/lxdm/ChangeLog
index 0559184915cb..21b1f1b9ca09 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.12 2012/02/04 10:43:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/ChangeLog,v 1.13 2012/02/18 11:41:25 hwoarang Exp $
+
+*lxdm-0.4.1-r4 (18 Feb 2012)
+
+  18 Feb 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/lxdm-0.4.1-missing-pam-defines.patch, +lxdm-0.4.1-r4.ebuild,
+  -lxdm-0.4.1-r3.ebuild:
+  Fix pam support. Thanks to Simon Poirier for investigating this. Bug #403999
 
 *lxdm-0.4.1-r3 (04 Feb 2012)
 
diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index 369a347ff183..c205a2c19cf0 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -6,6 +6,7 @@ AUX lxdm-0.3.0-pam_console-disable.patch 260 RMD160 fa8fb4bd2d0d57235924bb241688
 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-missing-pam-defines.patch 583 RMD160 3ead0a4f403dfb7b575f6d805bdad9b523184faa SHA1 a16908a83766d88f02dc2db69dc69cf8d39d53f6 SHA256 b9aa62fc73ce8f52f354388bcec0a03c228b40ba1a86e2aba1071501ecc1a5d8
 AUX lxdm-0.4.1-pam_console-disable.patch 344 RMD160 faa1026b361b4e5bf0b002651cb1bcf45f5f8800 SHA1 8169882a4bcdeeba34586d0fd5bd0dc3048556bc SHA256 51d1a0f0b5749e451e313df3bd3d08b3f5181f00eb01993973393c1b4dcd8ad2
 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
@@ -13,23 +14,23 @@ EBUILD lxdm-0.3.0-r1.ebuild 1314 RMD160 2b64fcd1108d941c2beafbb4d447bc3117b3deda
 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
-EBUILD lxdm-0.4.1-r3.ebuild 1590 RMD160 50322a4fa0d6f6a3156bae53f347c9404c19cf56 SHA1 162e4fbcb46a9c6108ef8f6a3986ba32a8de7931 SHA256 4bac9a652c4b7bc2f2f7482a731431b7b39e45139e29e2b7c0fb5cc54e8ab0e4
-MISC ChangeLog 2702 RMD160 17abbe23997a2373b2798b81056d985488a341f7 SHA1 b4c01631ad69e4814874b86dcd6602e27c2f479a SHA256 a3ca75e8ac03aaa8cc6dd0d5afcdb23f3e9c4469a60609bdab81311f784a3416
+EBUILD lxdm-0.4.1-r4.ebuild 1647 RMD160 c1776b729b6bda0e705a9da7c0f0e715f827e99b SHA1 0cb3b9e1e59fdfd9b7804467f9f026db1f8ae920 SHA256 34bf419941b38e4dc716987b6d255bca8af37a085c131b98edb44c17e631f83d
+MISC ChangeLog 2960 RMD160 c396c7ffe66327e93c21382f031300ede3d4fd8b SHA1 d4f47644fd1b8b99eac83cd4eaf414cfc182a2af SHA256 b5e7bec53e23787fcdb603d8c8b2685b833e9bc66469736409ae8517356d5dff
 MISC metadata.xml 307 RMD160 780146af5f44d5a94235167d9f27fa430e374101 SHA1 c018aecad3148053495b66d84c45f17bf7c5d5c6 SHA256 854f7a5d79f761b1a129a5f227d74854cd4a5e62827fe6022cddd8dfc2a4b264
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-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
+iQIcBAEBCgAGBQJPP440AAoJEPqDWhW0r/LCf4UQAL251cAPx8CsTtNdL+5mnP75
+3NKQKVtErSExtsRNRbu5psWk2SguuPqRnYVYeyYRnBAxBFv9oBzixRDi9/yM5AOh
+MMQbU0hNkvaVaeUEmF/WI3mGHOOGBQ3Qyll+8JT2MHiiO16tk8EBq5K8TZA/TRH2
+ZcP4HDFwkXas3R7rOBEX69g7KD6n05BZzhIXrbyHc8W06vwP1lgECsLrvQ4w204D
+b9zQmmvxeGhwfFQtWW5YMWWK2PyipJLkyI1fBcaOXkPMBxSsVch4Y5xgKn5HMdFa
+AykrPrW9964+FKsnpOBkeX36sqEe3BWsU9Jjh8HZ9PYjEyKaECp+C11mks7Psgf9
+Pd97QEE12ODWA1/BVoF5XEnEeIupGKdVymIC+cercd2i2R8XPryy/5/ET9T4pJWE
+5zPJe1YjmHPMKtqE4SU5HPsSTIdA2h5hhmR6Rk4tI6f46WjI1wVB2gxOoOCXCxiH
+fANr0jjVNZ+fFHbD8sb0BReD2Gzhqxya4ho44bHeU7M8Y4le0FCDJsw/kPk2WZh6
+tkP0+wEutOwKmWhuxncwVKYB/bsltFTZhyfLj23lbiwqKP+mYs189Q0lQgL4NN97
+jBFj7vTZLDDc1972maFsQXkr28tWSowPnbpFeJ+tBPl++dYY/8A2V4MGvJAC5u0k
+9mXCfqHtKl3wiSBAaU4f
+=9UT1
 -----END PGP SIGNATURE-----
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch b/lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch
new file mode 100644
index 000000000000..a59273ccf40d
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch
@@ -0,0 +1,29 @@
+From 0f9e8e53a8d30f5c8ccfb03edc282148f58bfd30 Mon Sep 17 00:00:00 2001
+From: dgod <dgod.osa@gmail.com>
+Date: Sun, 1 Jan 2012 17:05:22 +0800
+Subject: [PATCH] fix bug introduced from pam detect
+
+---
+ src/lxdm.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/lxdm.c b/src/lxdm.c
+index b5a90be..07be1e0 100644
+--- a/src/lxdm.c
++++ b/src/lxdm.c
+@@ -25,8 +25,12 @@
+ #include <config.h>
+ #endif
+ #ifndef HAVE_LIBPAM
++#ifdef USE_PAM
++#define HAVE_LIBPAM 1
++#else
+ #define HAVE_LIBPAM 0
+ #endif
++#endif
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-- 
+1.7.4.1
+
diff --git a/lxde-base/lxdm/lxdm-0.4.1-r3.ebuild b/lxde-base/lxdm/lxdm-0.4.1-r4.ebuild
index b3a18c24c2ad..9318af850587 100644
--- a/lxde-base/lxdm/lxdm-0.4.1-r3.ebuild
+++ b/lxde-base/lxdm/lxdm-0.4.1-r4.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/lxdm-0.4.1-r4.ebuild,v 1.1 2012/02/18 11:41:25 hwoarang Exp $
 
 EAPI="2"
 
@@ -26,16 +26,6 @@ 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
@@ -47,6 +37,9 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${P}-configure-add-pam.patch
 
+	# 403999
+	epatch "${FILESDIR}"/${P}-missing-pam-defines.patch
+
 	# this replaces the bootstrap/autogen script in most packages
 	eautoreconf
 
@@ -57,6 +50,15 @@ src_prepare() {
 		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