[gentoo-commits] repo/gentoo:master commit in: lxde-base/lxdm/files/, lxde-base/lxdm/
commit: e90425e15e2cbb3aea2e982ba1bf3543a8757cec
Author: Brian Evans gentoo org>
AuthorDate: Sat Mar 23 23:17:55 2019 +
Commit: Brian Evans gentoo org>
CommitDate: Sat Mar 23 23:17:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90425e1
lxde-base/lxdm: Add basic systemd and elogind support
This relies on the PAM plugins of each to fire if they exist
No multiseat support included or promised at this time
Bug: https://bugs.gentoo.org/531226
Closes: https://bugs.gentoo.org/681332
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Brian Evans gentoo.org>
lxde-base/lxdm/files/lxdm-0.5.3-pam.patch | 12 +
lxde-base/lxdm/lxdm-0.5.3-r2.ebuild | 74 +++
2 files changed, 86 insertions(+)
diff --git a/lxde-base/lxdm/files/lxdm-0.5.3-pam.patch
b/lxde-base/lxdm/files/lxdm-0.5.3-pam.patch
new file mode 100644
index 000..c13f4e7f14b
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.5.3-pam.patch
@@ -0,0 +1,12 @@
+--- a/pam/lxdm
b/pam/lxdm
+@@ -5,6 +5,8 @@ accountinclude system-auth
+ auth optional pam_gnome_keyring.so
+ accountincludesystem-local-login
++-session optionalpam_systemd.so class=greeter
++-session optionalpam_elogind.so class=greeter
+ sessionoptional pam_keyinit.so force revoke
+ sessionincludesystem-auth
+-sessionoptional pam_console.so
++#session optional pam_console.so
+ sessionoptional pam_gnome_keyring.so auto_start
diff --git a/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
new file mode 100644
index 000..543eded4fd2
--- /dev/null
+++ b/lxde-base/lxdm/lxdm-0.5.3-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Using strip-linguas in eutils
+inherit eutils autotools systemd
+
+DESCRIPTION="LXDE Display Manager"
+HOMEPAGE="https://wiki.lxde.org/en/LXDM";
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+IUSE="consolekit debug elogind +gtk3 nls pam systemd"
+
+DEPEND="consolekit? ( sys-auth/consolekit )
+ x11-libs/libxcb
+ gtk3? ( x11-libs/gtk+:3 )
+ !gtk3? ( x11-libs/gtk+:2 )
+ nls? ( sys-devel/gettext )
+ pam? ( virtual/pam )"
+# We only use the pam modules and not actually link to the code
+RDEPEND="${DEPEND}
+ elogind? ( sys-auth/elogind[pam] )
+ systemd? ( sys-apps/systemd[pam] )
+"
+BDEPEND=">=dev-util/intltool-0.40
+ virtual/pkgconfig"
+DOCS=( AUTHORS README TODO )
+
+REQUIRED_USE="?? ( consolekit elogind systemd ) elogind? ( pam ) systemd? (
pam )"
+
+src_prepare() {
+ # Upstream bug, tarball contains pre-made lxdm.conf
+ rm "${S}"/data/lxdm.conf || die
+
+ # Fix consolekit and selinux
+ eapply "${FILESDIR}/${P}-pam.patch"
+ # Apply all upstream fixes in git until 2016-11-11
+ eapply "${FILESDIR}/lxdm-0.5.3-upstream-fixes.patch"
+ eapply_user
+
+ # 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 \
+ --with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
+ $(use_enable consolekit) \
+ $(use_enable gtk3) \
+ $(use_enable nls) \
+ $(use_enable debug) \
+ $(use_with pam)
+}
+
+src_install() {
+ default_src_install
+
+ #Use Gentoo specific Xsession startup file
+ exeinto /etc/${PN}
+ doexe "${FILESDIR}"/Xsession
+}
[gentoo-commits] repo/gentoo:master commit in: lxde-base/lxdm/files/, lxde-base/lxdm/
commit: a6685790be19246f04c9f874e2f3db748b52f25f
Author: Brian Evans gentoo org>
AuthorDate: Wed May 24 13:36:22 2017 +
Commit: Brian Evans gentoo org>
CommitDate: Wed May 24 13:36:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6685790
lxde-base/lxdm: Revision bump to include upstream patches wrt bug 597260
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../lxdm/files/lxdm-0.5.3-upstream-fixes.patch | 236 +
lxde-base/lxdm/lxdm-0.5.3-r1.ebuild| 68 ++
2 files changed, 304 insertions(+)
diff --git a/lxde-base/lxdm/files/lxdm-0.5.3-upstream-fixes.patch
b/lxde-base/lxdm/files/lxdm-0.5.3-upstream-fixes.patch
new file mode 100644
index 000..0360ebff8d0
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.5.3-upstream-fixes.patch
@@ -0,0 +1,236 @@
+From c6836939c6fd603f86f469bb7c6502b28b1ca583 Mon Sep 17 00:00:00 2001
+From: dgod
+Date: Sun, 3 Jan 2016 11:53:13 +0800
+Subject: [PATCH 01/07] create user specific directory under /var/run
+
+---
+ src/lxdm.c | 8 +++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/lxdm.c b/src/lxdm.c
+index a37f051..d81b587 100644
+--- a/src/lxdm.c
b/src/lxdm.c
+@@ -750,7 +750,13 @@ static char ** create_client_auth(struct passwd *pw,char
**env)
+ if(xauth_write_file(authfile,s->display,s->mcookie)==-1)
+ {
+ g_free(authfile);
+- authfile = g_strdup_printf("/var/run/lxdm/.Xauth%d",pw->pw_uid);
++
++ gchar *authdir = g_strdup_printf("/var/run/lxdm/%d",
pw->pw_uid);
++ g_mkdir_with_parents(authdir, S_IRWXU);
++ chown(authdir, pw->pw_uid, pw->pw_gid);
++
++ authfile = g_strdup_printf("%s/.Xauthority", authdir);
++ g_free(authdir);
+ remove(authfile);
+ xauth_write_file(authfile,s->display,s->mcookie);
+ }
+--
+2.1.4
+
+
+From 7258b57fd305182c6c031eb8c1ded96c5a06f6da Mon Sep 17 00:00:00 2001
+From: dgod
+Date: Sat, 20 Feb 2016 22:36:59 +0800
+Subject: [PATCH 02/07] fix build before gtk 2.22
+
+---
+ src/greeter-gdk.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/greeter-gdk.c b/src/greeter-gdk.c
+index 1abbefa..ad3267a 100644
+--- a/src/greeter-gdk.c
b/src/greeter-gdk.c
+@@ -22,6 +22,7 @@
+
+ #define XLIB_ILLEGAL_ACCESS
+
++#include
+ #include
+ #include
+ #include
+@@ -88,12 +89,14 @@ static void on_ui_expose(void)
+ }
+
+ cr=gdk_cairo_create(win);
++#if GTK_CHECK_VERSION(3,0,0)
+ cairo_pattern_t *pattern=gdk_window_get_background_pattern(win);
+ if(pattern)
+ {
+ cairo_set_source(cr,pattern);
+ cairo_paint(cr);
+ }
++#endif
+
+ gdk_cairo_set_source_color(cr, &bg);
+ cairo_rectangle(cr, rc.x, rc.y, rc.width, rc.height);
+--
+2.1.4
+
+
+From 5d36a53702f1e60bb316946f1edccb2dbc3c01bd Mon Sep 17 00:00:00 2001
+From: dgod
+Date: Sun, 21 Feb 2016 10:45:58 +0800
+Subject: [PATCH 03/07] fix with user_list only: problem when password check
+ fail
+
+---
+ src/greeter.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/greeter.c b/src/greeter.c
+index 10b7f3f..03503b6 100644
+--- a/src/greeter.c
b/src/greeter.c
+@@ -146,7 +146,7 @@ static void switch_to_input_user(void)
+ if(user_list_scrolled)
+ gtk_widget_show(user_list_scrolled);
+ else
+- gtk_widget_hide(user_list);
++ gtk_widget_show(user_list);
+ gtk_widget_grab_focus(user_list);
+ }
+ else
+--
+2.1.4
+
+
+From fe121ce70ad5e99bd3b3b896dfcbe439dd22716c Mon Sep 17 00:00:00 2001
+From: dgod
+Date: Sun, 21 Feb 2016 11:45:35 +0800
+Subject: [PATCH 04/07] fix not honor ctl+alt+backspacer for restarting
+
+---
+ src/lxdm.c | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/lxdm.c b/src/lxdm.c
+index d81b587..e00d219 100644
+--- a/src/lxdm.c
b/src/lxdm.c
+@@ -962,6 +962,11 @@ static void on_xserver_stop(void *data,int pid, int
status)
+ s->dpy=NULL;
+ ui_drop();
+ lxdm_startx(s);
++ #ifndef DISABLE_XAUTH
++ char temp[256];
++ sprintf(temp,"/var/run/lxdm/lxdm-:%d.auth",s->display);
++ setenv("XAUTHORITY",temp,1);
++ #endif
+ ui_prepare();
+ lxsession_set_active(s);
+ }
+--
+2.1.4
+
+
+From 72812894cfd9454d70e4b0753531e46580416771 Mon Sep 17 00:00:00 2001
+From: dgod
+Date: Mon, 21 Mar 2016 19:25:25 +0800
+Subject: [PATCH 05/07] fix css under gtk 3.20
+
+---
+ data/themes/Industrial/gtk.css | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/themes/Industrial/gtk.css b/data/themes/Industrial/gtk.css
+index 179f0d6..f8e6432 100644
+--- a/data/themes/Industrial/gtk.css
b/data/themes/Industrial/gtk.css
+@@ -17,6 +17,7 @@
+ color: #00;
+ }
[gentoo-commits] repo/gentoo:master commit in: lxde-base/lxdm/files/, lxde-base/lxdm/
commit: e793c45267a4028b487fe55a7a46d9fdeaa684f6
Author: Brian Evans gentoo org>
AuthorDate: Sun Aug 14 18:12:24 2016 +
Commit: Brian Evans gentoo org>
CommitDate: Sun Aug 14 18:13:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e793c452
lxde-base/lxdm: Version bump
Package-Manager: portage-2.3.0
lxde-base/lxdm/Manifest| 1 +
lxde-base/lxdm/files/Xsession | 79 ++
.../files/lxdm-0.5.3-pam_console-disable.patch | 8 +++
lxde-base/lxdm/lxdm-0.5.3.ebuild | 67 ++
4 files changed, 155 insertions(+)
diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index a9f2f86..9970171 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -1 +1,2 @@
DIST lxdm-0.4.1.tar.gz 296714 SHA256
9e0d0a5672fcf31a18de8178ce73eab1723d6ae7097dfe41e9fe2c46e180cf08 SHA512
8ed4a955a910def4db66958d1cb24976db178b8763199a024b6c2119894745e3646566c42d01472dffbbcbb7fd21784b01e74dc88038e01caebaa3b6d720ff27
WHIRLPOOL
1bbb55bf955f46aaac54ca3372c09308baa496297e56026456e464217f115d6b26994e8be6b6b228b663bb2e14cf9d5ace6930f75024f6426825dd4fefc5349f
+DIST lxdm-0.5.3.tar.xz 239132 SHA256
4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f SHA512
0e3539c595a71cb850c1756dd075b8d477a4e111a4167714057cac06650e9587f338f797f14122e7b2a2f4ad35b38cd7172b83e996758abeeaf0146d65bbc26f
WHIRLPOOL
f0b36b1da0ea558fcd04fe2dbf3b6e65afb1d9f19e4d7fdb1ededfc9e3b35c1135cdb24477ce3fce024029484174c3c7009e76a66fd84694220eee1dccf4802c
diff --git a/lxde-base/lxdm/files/Xsession b/lxde-base/lxdm/files/Xsession
new file mode 100644
index 000..d5df36f
--- /dev/null
+++ b/lxde-base/lxdm/files/Xsession
@@ -0,0 +1,79 @@
+#!/bin/sh
+#
+# LXDM wrapper to run around X sessions.
+# Copied form lightdm
+
+echo "Running X session wrapper"
+
+#Convert MATE to lower case util MATE scripts are fixed
+[ "$DESKTOP_SESSION" = "MATE" ] && DESKTOP_SESSION=mate
+export DESKTOP_SESSION
+
+# Load profile
+for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile";
do
+if [ -f "$file" ]; then
+echo "Loading profile from $file";
+. "$file"
+fi
+done
+
+# Load resources
+for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
+if [ -f "$file" ]; then
+echo "Loading resource: $file"
+xrdb -nocpp -merge "$file"
+fi
+done
+
+# Load keymaps
+for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
+if [ -f "$file" ]; then
+echo "Loading keymap: $file"
+setxkbmap `cat "$file"`
+XKB_IN_USE=yes
+fi
+done
+
+# Load xmodmap if not using XKB
+if [ -z "$XKB_IN_USE" ]; then
+for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
+if [ -f "$file" ]; then
+ echo "Loading modmap: $file"
+ xmodmap "$file"
+fi
+done
+fi
+
+unset XKB_IN_USE
+
+# /etc/X11/xinit/xinitrc.d/80-dbus expects $command to be
+# set to the Xsession arguments. So make it happy. See
+# https://bugs.gentoo.org/show_bug.cgi?id=533456
+command="$@"
+
+# Run all system xinitrc shell scripts.
+xinitdir="/etc/X11/xinit/xinitrc.d"
+if [ -d "$xinitdir" ]; then
+for script in $xinitdir/*; do
+echo "Loading xinit script $script"
+if [ -x "$script" -a ! -d "$script" ]; then
+. "$script"
+fi
+done
+fi
+
+# Load Xsession scripts
+xsessionddir="/etc/X11/Xsession.d"
+if [ -d "$xsessionddir" ]; then
+for i in `ls $xsessionddir`; do
+script="$xsessionddir/$i"
+echo "Loading X session script $script"
+if [ -r "$script" -a -f "$script" ] && expr "$i" :
'^[[:alnum:]_-]\+$' > /dev/null; then
+. "$script"
+fi
+done
+fi
+
+echo "X session wrapper complete, running session $@"
+
+exec $command
diff --git a/lxde-base/lxdm/files/lxdm-0.5.3-pam_console-disable.patch
b/lxde-base/lxdm/files/lxdm-0.5.3-pam_console-disable.patch
new file mode 100644
index 000..8fb8cb4
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.5.3-pam_console-disable.patch
@@ -0,0 +1,8 @@
+--- lxdm-0.4.0.orig/pam/lxdm
lxdm-0.4.0/pam/lxdm
+@@ -5,4 +5,4 @@ accountinclude system-auth
+ sessionoptional pam_keyinit.so force revoke
+ sessionincludesystem-auth
+-sessionoptional pam_console.so
++#sessionoptional pam_console.so
+ sessionoptional pam_gnome_keyring.so auto_start
diff --git a/lxde-base/lxdm/lxdm-0.5.3.ebuild b/lxde-base/lxdm/lxdm-0.5.3.ebuild
new file mode 100644
index 000..0665f7b
--- /dev/null
+++ b/lxde-base/lxdm/lxdm-0.5.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils autotools systemd
+
+DESCRIPTION="LXDE Display Manager"
+HOMEPAGE="http://lxde.org";
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+IUSE="consolekit deb
