Make pam a conditional subdirectory; bug #469512

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x39E7AB2E

4 files changed, 144 insertions, 17 deletions

diff --git a/lxde-base/lxdm/ChangeLog b/lxde-base/lxdm/ChangeLog
index 965ae3463132..b1784ecb5aaf 100644
--- a/lxde-base/lxdm/ChangeLog
+++ b/lxde-base/lxdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for lxde-base/lxdm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/ChangeLog,v 1.31 2013/12/22 13:03:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/ChangeLog,v 1.32 2013/12/23 07:43:58 nullishzero Exp $
+
+*lxdm-0.4.1-r9 (23 Dec 2013)
+
+  23 Dec 2013; Pavel Kazakov <nullishzero@gentoo.org>
+  +files/lxdm-0.4.1-fix-optional-pam.patch, +lxdm-0.4.1-r9.ebuild:
+  Make pam a conditional subdirectory; bug #469512
 
   22 Dec 2013; Markos Chandras <hwoarang@gentoo.org>
   files/lxdm-0.4.1-optional-consolekit.patch:
diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index 1e32328c303d..394a398b11e6 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 SHA256 0e9dbcf422b8db8e559015fb7d50
 AUX lxdm-0.3.0-properly-load-session-settings-using-dmrc-entry-as-pointer-for-xsessions-dir-file.patch 932 SHA256 d3ad21a7643b86706d5d7f4ec4cf09dbe9805e3eea95c4c035abbf5049ff0c10 SHA512 5302ae11603d61ee0c4d91792118f54b7a2dd4a5e62241b6edc383e9b8adf5eec86994cc15c74e1243fc570a014f56bdc510233eaadbae769f74c525d0f92f0f WHIRLPOOL 6dad4edcacee2faa9a616659882892c2be3ab2945be6f3147e8ba1696520661d7d31095c0ba3d5358d36bbf0330b310ac8cf3eb9903d67e23641f79d901b2eec
 AUX lxdm-0.4.1-configure-add-pam.patch 1410 SHA256 22d9a569755acd1ffadc23939b6b2d0845f0956efafda31b3a91dbd5580a5815 SHA512 4a5f2f4a282739e74e63d583036e0cc84f3613983d3fac2795827d9065ade3e2cfc353472345be1948444ac4c2f037f5bc97c62a79a9b170e8fd6e0fc23ab6dd WHIRLPOOL d8ac31e16fce57b037cef36f88461ccb1e3669e5cef947aea2ed9ff32604aaee1ec959010e9a0e4099eebc86f34986cb774d2e6ddcc571afdc6b1104825dfb6d
 AUX lxdm-0.4.1-event-check.patch 704 SHA256 f5e2e29c7ea307959c4fb3e34433bb63de3efef5e14be11e4c6dfeedb1cdacb1 SHA512 459dc8106a836f6b6cdb6eb64a4d818a5af17318e800f5d6194a6ec7fcc9ce1bc2957516670dc191d5ae8bb325144997958dc2e7062f59cb38b98abf6ec60cd1 WHIRLPOOL 6208e31029cc29bfd840312f77fdc99a20881a8476dd31a41b8ec8742f1eebbdcb964062f313c5967a1919dff554f871098764b0f3990438a0c74da0c98cb4f6
+AUX lxdm-0.4.1-fix-optional-pam.patch 669 SHA256 0014c8a84e9d4cb16ec5ef29a3e734527caa677e868ef9f9dd21cc2da1721632 SHA512 817b96d59e73daadab1165df90ff6de76c06bb9fbfec57299dca4a590e2d7284e6ede4a5cffeb53d5d12a5eaaa7ad5a0f0d3d04bb35ea005a4be6f81d1b09dbf WHIRLPOOL a9ff132d0002579fea056a85417dcc6e35bc5dd7b4928734fcc5f6bda08d7bf05f634dfd127690d8de2bad91721ebc37f293f0b18d693290de4940bb0fa78245
 AUX lxdm-0.4.1-fix-pam-100-cpu.patch 444 SHA256 cf5aa1cd633c510be44cbb2d9dfa09fe6541c83c77297d000c010d5f0348ffde SHA512 2aef14d7dc9e2f10fda1d22b5837225f61af9a8fb46267ad98eb65149e72c165c6588c4816dc8c20ec90f49a2db5289b519f9b1c0b4b5b9ec430bea73fbac9a6 WHIRLPOOL 6039273a31292cc6903db4a84d89a2dc80fd0d776a9dc6f8dd438cf5d2d574e84b877a397e510267d4d7a690a0ed3520232c9225d8b590fc4b7e98c323d5e543
 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
@@ -18,24 +19,23 @@ DIST lxdm-0.4.1.tar.gz 296714 SHA256 9e0d0a5672fcf31a18de8178ce73eab1723d6ae7097
 EBUILD lxdm-0.4.1-r5.ebuild 1781 SHA256 1c5d6dbc34265d959014fcbb96b8295ad77ec82e7617953fb7e226876af9911f SHA512 de0a624da1a5e84484cd7b5a51525666a4a1af3789ec97c278628fb86c331198f83e4aba38a63c88be680ca17811b269011110fbd76a1df837c70dca6299c26d WHIRLPOOL 416cdb931dab3c2257e0be7187c3fcc827a8024e4b54df13b617ce42ec50e945d4cffa2657e29310d9c3318e10a793aa020841d223b2127f71c960f80de85d02
 EBUILD lxdm-0.4.1-r7.ebuild 1963 SHA256 48b213b3e911c933e2297721795b13d3f99135a512712c5df17de1e52fd3fac5 SHA512 c6b238449c1ca9bed903e5173e7746b23637f29be3f9bcc40974362c39c4f589f9aacb9128ef9e3b14f5ba33279498f8d64698b912c154219e4ba633ba661bf5 WHIRLPOOL 3424ac153a59deca7b389e4fcefe1fe6be6dd9942c71b6c364ec70e1b81ff35a869c7e2ef5cb67b4e386b91933aab4280c1395f6c13237e3696d50a6633119ed
 EBUILD lxdm-0.4.1-r8.ebuild 2168 SHA256 278859c75eb041111b46d04bcd8d3484295cec5f188f0f6c44d379c88fb6b581 SHA512 153676b15ec317f1352c7fdd8a83a455324a53bf1e49ddceb2914119bde292beb9caa134c26c230cf903a1601e0eab6e35127e99fcec94e523eac886019ee8b3 WHIRLPOOL 65bc198e6077b7e43159691f18be38c53bb35a2b8298fca1cb94236070e4f4192daf0a2b61e7266934c6d13cab8def03332c59dc19b629e29b6407828190082e
-MISC ChangeLog 6091 SHA256 c0b7e0d5f01de5b9dfc9066e687501987f5d80f94a9e5090cde5c667c4dd1dc1 SHA512 09ef9fe9e847ef8f0b38c864672580ce4e5c4a6c39635cf8c456f707916705b99a5433b305b9cf2b5d229d3b810862b5cfee9546166c2b3ef5f4efdb88fcede8 WHIRLPOOL 6f727ab18c7221062da4af528af8c93f356a1b1cd56414c3c662b5f375975f9c4c1470a85baa52248d03a8182b4063fb55729c42c2c95ceb4dac7cf2785aa03b
+EBUILD lxdm-0.4.1-r9.ebuild 2235 SHA256 9cce5510865f0414687c6bb326144f4551b8cd96d534b3d96436cbcd4907eea6 SHA512 07ee45e90887ce087d268e313dea50a85bd1dd1ff4481322a9d0dd71ce1d0788f708e4200be686abf3e38c5921724b18127c54e3cbbdbf05dfed7f40c42dab5a WHIRLPOOL 60db4af53a5a7051b9c3b77c7e36692c2ff5d83ce6999bed8b66ab34027374dee17ab3b6e5377c29f63941d2010914dffebc3a74f3e4f60a9eede1271b762658
+MISC ChangeLog 6297 SHA256 c3f1bc259ce4ca43e0afbec536f137b52813af0b4f3515565e73d56affc0a8ff SHA512 97cf74688f0001325f20cd986c3399f3193acc17227f691f8c087581a8a2fb40bf392edd0d58ea4388d339a3cd98f1f71e3b7e5855c4849d03a96b9f47484703 WHIRLPOOL 94a7f0fae21681d8cf741ec0bb4ffb03d20cf0247a58ce4a9c4d5d3b070c2a67972120109559903b2bf407d82146be22f192baee90fdcb6e602e9928f11b8bdf
 MISC metadata.xml 307 SHA256 854f7a5d79f761b1a129a5f227d74854cd4a5e62827fe6022cddd8dfc2a4b264 SHA512 178e75fe4fa48767e12467d8685344a37e0f709d2b3c50e4fa6f37305070273e7c4ac831e911d5f338393f55109733c0c4ac8f9635fa07e0527909497f7cd544 WHIRLPOOL 607e3ca4b801ca141af8e0b7422d7111dca47c5436bf8e641da21ed8add5cb871435e74f43643c133d9e958c9a2e737006b79bb7234c961fecb4ea547cbd3993
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJStuL5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88HFoQAJi667RRFSKbmicFcFP9FzAO
-z9XT7NKeCy8uZeOJbVeaDCPgLu3nrwe3CsuYIgWODt6sBthG/fVSXqSS/uXCsBpf
-f9Zwzk5I81qxtZAP3a0NJWgUqbe+Wtpz+yi4/IlcEaa1xe73aQG9enSMwl2Atz8i
-FEDB83j2Lcyyq0bql3ANQ3yHmUT7i/YYxZqp8Qyz+PxWb1RBbBfhjsBX5ZNo6lsv
-L9njbR2WGGIk/+XdEQLGz1o3u3KTIwkU1CwN81DgyOQ0LXlPlz7axHI0/kT83q5T
-E/olxVOzy6bZEjDxRUJRjJzpfOjG9v7Fpolkw0utezliHnihTjncNA8f49C/ED7u
-r0eQEsDlSQBZiGTaWRCqYfPGCpLZXw0MmMg/9jpgzN9IrfRfVS5/weWjLTlnBS2c
-wep+GXpDu7CFOy6U8wguZ2RUew6iEsKX+jayLDDQh/0u3QohTf37dCHip8OvERZT
-HRWC8eKsTndoJ5DWMTttyKhaH+rI+MzFRIB9ZXGRGE/Z+mDCj9n5r4gI9HUBsmfT
-lWaZmffMJU9bBtDia5SFOGs1pp1Jzy9MKn1rsihdA5cVDxGUJRNDtV1pkePCUR85
-cwP+6l2Db5EV3FfdfIizV+AvEY12GBh2C4qcZAHIpTYQQIRtvQKBZe6eXYCShYNg
-59LGUn7p4uj5LmIpJ0r7
-=JVrp
+iQIcBAEBCAAGBQJSt+nJAAoJENb1ecI556subvYQAM3biY5P7s48k6BmQUvvu/Bd
+X47lCzx3wmgbNMpo6QhkNdBgsA57sYvrDS6mNzTQh+lC9pHeoDL4RQbAOD7+GUKu
+Lr86LT1dN4Gm/aAqZBw893Fxz1MQZx+ozGDdY4rWA6NKnq55siAB5urCB8YRPMyn
+eIW01a4GaNWsLC8UROZsuk9c4nHzeGhRHYlUx3ux/MMqwncrYZNp8mI1H+pFBjt1
+I4V+CE/M5C7/O8Xm01DXG5/9RmR0juZz8jPEL1p2qjDND1sGa+lz7Ttn0rD5/LuR
+SPF94eE0gSesYW4uxHm1x/fzcmP7G48ljKY8Sc586pVYrkLZJhO62hlzm2+W9jj3
+PGh+7N8rXxCtpI82ZkIg1dx9WklrGb26Y9GPJLcNyICCHKD5I7X2QMXe0rZ4wzyY
+PdgBaHKeXJA2kGpU3TlthREtLVeOz7mg1q+qcDVolB6d8EyOz7et8wvadblWKos1
+bFsTQTLozao9Xj5NGKkDGg5zTM06ff6Pn4Al0E6DUCiqc4m9SgkRKe+I2XxG7vTg
+JkrzLIlQZjzk2zIFwkimzY9Ykp2nVEhFPrYj0drsszFtsBmFeaEcbnQjcV+uUsRQ
+vLaTKQJ9d8c8c+8j7NnjDshscveVHi73Exu4Un6UJEx+WuVqZY6w/pJu8zH9L7fj
+ixGw5+rt/zQx8ufzrm4j
+=6WZ/
 -----END PGP SIGNATURE-----
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch b/lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch
new file mode 100644
index 000000000000..0aecc08593dc
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch
@@ -0,0 +1,31 @@
+diff --git a/Makefile.am b/Makefile.am
+index bfac56b..40710fc 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,10 +2,13 @@ NULL =
+ SUBDIRS= \
+ 	src \
+ 	po \
+-	pam \
+ 	data \
+ 	$(NULL)
+ 
++if HAVE_PAM
++SUBDIRS += pam
++endif
++
+ rpm: dist @PACKAGE_NAME@.spec
+ 	rpmbuild -bb \
+ 	--define "_sourcedir `pwd`" \
+diff --git a/configure.ac b/configure.ac
+index ae5177f..aaa1bad 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,6 +27,7 @@ if test "x$USE_PAM" != "xno" ; then
+ 			AC_MSG_ERROR(["PAM support requested, but pam_open_session not found."])
+ 		 fi])
+ fi
++AM_CONDITIONAL(HAVE_PAM, [test -n "$USE_PAM" -a "x$USE_PAM" != xno ])
+ 
+ # Checks for header files.
+ AC_PATH_X
diff --git a/lxde-base/lxdm/lxdm-0.4.1-r9.ebuild b/lxde-base/lxdm/lxdm-0.4.1-r9.ebuild
new file mode 100644
index 000000000000..61400bbb2a85
--- /dev/null
+++ b/lxde-base/lxdm/lxdm-0.4.1-r9.ebuild
@@ -0,0 +1,90 @@
+# 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-r9.ebuild,v 1.1 2013/12/23 07:43:58 nullishzero Exp $
+
+EAPI="2"
+
+WANT_AUTOMAKE="1.12" #493996
+inherit eutils autotools systemd
+
+DESCRIPTION="LXDE Display Manager"
+HOMEPAGE="http://lxde.org"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+IUSE="consolekit debug gtk3 nls pam"
+
+RDEPEND="consolekit? ( 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
+
+	# See https://bugs.launchpad.net/ubuntu/+source/lxdm/+bug/922363
+	epatch "${FILESDIR}/${P}-fix-pam-100-cpu.patch"
+
+	# Optional Consolekit support. bug #443666
+	epatch "${FILESDIR}"/${P}-optional-consolekit.patch
+
+	# 469512
+	epatch "${FILESDIR}"/${P}-fix-optional-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_configure() {
+	econf	--enable-password \
+		--with-x \
+		--with-xconn=xcb \
+		$(use_enable consolekit) \
+		$(use_enable gtk3) \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		$(use_with pam)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README TODO || die
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	echo
+	elog "Take into consideration that LXDM is in the early stages of development!"
+	echo
+}