summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Erculiani <lxnay@gentoo.org>2013-05-05 20:14:22 +0000
committerFabio Erculiani <lxnay@gentoo.org>2013-05-05 20:14:22 +0000
commitcc98fb20fc6fa7291d0144802f16594861d889b8 (patch)
treef11ee345fd5c96f632c69ffa15c04120450f6a13 /lxde-base/lxdm
parentclean up (diff)
downloadgentoo-2-cc98fb20fc6fa7291d0144802f16594861d889b8.tar.gz
gentoo-2-cc98fb20fc6fa7291d0144802f16594861d889b8.tar.bz2
gentoo-2-cc98fb20fc6fa7291d0144802f16594861d889b8.zip
the new pam config needs a patch to avoid 100% cpu usage by lxdm-binary. See: https://bugs.launchpad.net/ubuntu/+source/lxdm/+bug/922363
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key ADC916E5)
Diffstat (limited to 'lxde-base/lxdm')
-rw-r--r--lxde-base/lxdm/ChangeLog9
-rw-r--r--lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch16
-rw-r--r--lxde-base/lxdm/lxdm-0.4.1-r7.ebuild (renamed from lxde-base/lxdm/lxdm-0.4.1-r6.ebuild)5
3 files changed, 28 insertions, 2 deletions
diff --git a/lxde-base/lxdm/ChangeLog b/lxde-base/lxdm/ChangeLog
index 2bf48dff1ca5..5f81d3040b00 100644
--- a/lxde-base/lxdm/ChangeLog
+++ b/lxde-base/lxdm/ChangeLog
@@ -1,6 +1,13 @@
# 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.21 2013/05/03 21:02:01 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/ChangeLog,v 1.22 2013/05/05 20:14:22 lxnay Exp $
+
+*lxdm-0.4.1-r7 (05 May 2013)
+
+ 05 May 2013; Fabio Erculiani <lxnay@gentoo.org> -lxdm-0.4.1-r6.ebuild,
+ +lxdm-0.4.1-r7.ebuild, +files/lxdm-0.4.1-fix-pam-100-cpu.patch:
+ the new pam config needs a patch to avoid 100% cpu usage by lxdm-binary. See:
+ https://bugs.launchpad.net/ubuntu/+source/lxdm/+bug/922363
*lxdm-0.4.1-r6 (03 May 2013)
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch b/lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch
new file mode 100644
index 000000000000..103268efec40
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch
@@ -0,0 +1,16 @@
+--- lxdm-0.4.1.orig/src/lxdm.c
++++ lxdm-0.4.1/src/lxdm.c
+@@ -1458,8 +1458,12 @@ void lxdm_do_login(struct passwd *pw, ch
+ setenv("XDG_SESSION_COOKIE", ck_connector_get_cookie(s->ckc), 1);
+ }
+ #endif
++ int i;
++ for(i=2;i<256;i++)
++ g_source_remove(i);
++
+ char** env, *path;
+- int n_env,i;
++ int n_env;
+ n_env = g_strv_length(environ);
+ /* copy all environment variables and override some of them */
+ env = g_new(char*, n_env + 1 + 13);
diff --git a/lxde-base/lxdm/lxdm-0.4.1-r6.ebuild b/lxde-base/lxdm/lxdm-0.4.1-r7.ebuild
index 83c541b01672..ef382dccdd6d 100644
--- a/lxde-base/lxdm/lxdm-0.4.1-r6.ebuild
+++ b/lxde-base/lxdm/lxdm-0.4.1-r7.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/lxdm-0.4.1-r7.ebuild,v 1.1 2013/05/05 20:14:22 lxnay Exp $
EAPI="2"
@@ -46,6 +46,9 @@ src_prepare() {
# 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"
+
# this replaces the bootstrap/autogen script in most packages
eautoreconf