Date: Monday, May 25, 2020 @ 13:59:37 Author: felixonmars Revision: 634361
archrelease: copy trunk to community-x86_64 Added: lxdm/repos/community-x86_64/PKGBUILD (from rev 634359, lxdm/trunk/PKGBUILD) lxdm/repos/community-x86_64/Xsession (from rev 634359, lxdm/trunk/Xsession) lxdm/repos/community-x86_64/default-config.patch (from rev 634359, lxdm/trunk/default-config.patch) lxdm/repos/community-x86_64/git-fixes.patch (from rev 634359, lxdm/trunk/git-fixes.patch) lxdm/repos/community-x86_64/lxdm.pam (from rev 634359, lxdm/trunk/lxdm.pam) lxdm/repos/community-x86_64/set-path.patch (from rev 634359, lxdm/trunk/set-path.patch) Deleted: lxdm/repos/community-x86_64/PKGBUILD lxdm/repos/community-x86_64/Xsession lxdm/repos/community-x86_64/default-config.patch lxdm/repos/community-x86_64/git-fixes.patch lxdm/repos/community-x86_64/lxdm.pam lxdm/repos/community-x86_64/set-path.patch ----------------------+ PKGBUILD | 199 ++++++++++++++++++++++++------------------------- Xsession | 142 +++++++++++++++++----------------- default-config.patch | 50 ++++++------ git-fixes.patch | 186 ++++++++++++++++++++++----------------------- lxdm.pam | 14 +-- set-path.patch | 24 ++--- 6 files changed, 307 insertions(+), 308 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-05-25 13:59:25 UTC (rev 634360) +++ PKGBUILD 2020-05-25 13:59:37 UTC (rev 634361) @@ -1,100 +0,0 @@ -# $Id$ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: AndyRTR <andy...@archlinux.org> -# Contributor: kiefer <jorgelmad...@gmail.com> - -pkgbase=lxdm -pkgname=(lxdm lxdm-gtk3) -pkgver=0.5.3 -pkgrel=6 -pkgdesc='Lightweight X11 Display Manager' -arch=('x86_64') -url="https://lxde.org/" -license=('GPL') -depends=('gtk2' 'gtk3' 'xorg-server') -makedepends=('intltool' 'iso-codes') -optdepends=('iso-codes: show language names in language chooser') -backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' - 'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin' - 'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown') -source=(https://downloads.sourceforge.net/lxde/$pkgbase-$pkgver.tar.xz - set-path.patch - git-fixes.patch - default-config.patch - lxdm.pam - Xsession) -sha256sums=('4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f' - '328f766c4d2ee899fc37a26f6e8666d40ebeaa3bd4c7d5a474ebb5415351a440' - 'ca3b225fb85a4e87ebb48e2b1a20f4bab86bf619a9ad927f08fdc819bc435bb4' - 'ea5fbe021b98ec58de8f2ba9a3575f748024bad2a9b911179a44bf94577f869b' - 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0' - 'a02f547e1c36f1c7dd2a1f942b620fe76445d561f7835e7fef434aa4c12c6967') - -prepare(){ - cd $pkgbase-$pkgver - - # Don't overwrite PATH if already defined - # https://sourceforge.net/p/lxde/bugs/907/ - patch -Np0 -i ../set-path.patch - - # Apply fixes from git - patch -Np1 -i ../git-fixes.patch - - # Adjust Arch-specific settings - patch -Np1 -i ../default-config.patch - - # Use our custom pam and Xsession files - cp ../lxdm.pam pam/lxdm - cp ../Xsession data/Xsession - - autoreconf -fi -} - -build() { - # GTK+ 2 version - [ -d gtk2 ] || cp -r $pkgbase-$pkgver gtk2 - cd gtk2 - ./configure --prefix=/usr --sbindir=/usr/bin --libexecdir=/usr/lib/lxdm \ - --sysconfdir=/etc --localstatedir=/var - make - - cd "$srcdir" - # GTK+ 3 version - [ -d gtk3 ] || cp -r $pkgbase-$pkgver gtk3 - cd gtk3 - ./configure --prefix=/usr --sbindir=/usr/bin --libexecdir=/usr/lib/lxdm \ - --sysconfdir=/etc --localstatedir=/var --enable-gtk3 - make -} - -package_lxdm() { - groups=('lxde') - depends=('gtk2' 'xorg-server') - optdepends+=('gnome-themes-standard: default GTK+ theme') - - cd gtk2 - make DESTDIR="$pkgdir" install - chmod 644 "$pkgdir/etc/lxdm/lxdm.conf" - - # Setup system user and group - install -dm755 "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d - echo 'u lxdm - "Lightweight X11 Display Manager" /var/lib/lxdm' > "$pkgdir/usr/lib/sysusers.d/$pkgbase.conf" - echo 'd /var/lib/lxdm 0700 lxdm lxdm - -' > "$pkgdir/usr/lib/tmpfiles.d/$pkgbase.conf" -} - -package_lxdm-gtk3() { - groups=('lxde-gtk3') - pkgdesc+=' (GTK+ 3 version)' - depends=('gtk3' 'xorg-server') - conflicts=('lxdm') - - cd gtk3 - make DESTDIR="$pkgdir" install - chmod 644 "$pkgdir/etc/lxdm/lxdm.conf" - - # Setup system user and group - install -dm755 "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d - echo 'u lxdm - "Lightweight X11 Display Manager" /var/lib/lxdm' > "$pkgdir/usr/lib/sysusers.d/$pkgbase.conf" - echo 'd /var/lib/lxdm 0700 lxdm lxdm - -' > "$pkgdir/usr/lib/tmpfiles.d/$pkgbase.conf" -} Copied: lxdm/repos/community-x86_64/PKGBUILD (from rev 634359, lxdm/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-05-25 13:59:37 UTC (rev 634361) @@ -0,0 +1,99 @@ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: AndyRTR <andy...@archlinux.org> +# Contributor: kiefer <jorgelmad...@gmail.com> + +pkgbase=lxdm +pkgname=(lxdm lxdm-gtk3) +pkgver=0.5.3 +pkgrel=7 +pkgdesc='Lightweight X11 Display Manager' +arch=('x86_64') +url="https://lxde.org/" +license=('GPL') +depends=('gtk2' 'gtk3' 'xorg-server') +makedepends=('intltool' 'iso-codes') +optdepends=('iso-codes: show language names in language chooser') +backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' + 'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin' + 'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown') +source=(https://downloads.sourceforge.net/lxde/$pkgbase-$pkgver.tar.xz + set-path.patch + git-fixes.patch + default-config.patch + lxdm.pam + Xsession) +sha256sums=('4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f' + '328f766c4d2ee899fc37a26f6e8666d40ebeaa3bd4c7d5a474ebb5415351a440' + 'ca3b225fb85a4e87ebb48e2b1a20f4bab86bf619a9ad927f08fdc819bc435bb4' + 'ea5fbe021b98ec58de8f2ba9a3575f748024bad2a9b911179a44bf94577f869b' + 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0' + 'a02f547e1c36f1c7dd2a1f942b620fe76445d561f7835e7fef434aa4c12c6967') + +prepare(){ + cd $pkgbase-$pkgver + + # Don't overwrite PATH if already defined + # https://sourceforge.net/p/lxde/bugs/907/ + patch -Np0 -i ../set-path.patch + + # Apply fixes from git + patch -Np1 -i ../git-fixes.patch + + # Adjust Arch-specific settings + patch -Np1 -i ../default-config.patch + + # Use our custom pam and Xsession files + cp ../lxdm.pam pam/lxdm + cp ../Xsession data/Xsession + + autoreconf -fi +} + +build() { + # GTK+ 2 version + [ -d gtk2 ] || cp -r $pkgbase-$pkgver gtk2 + cd gtk2 + ./configure --prefix=/usr --sbindir=/usr/bin --libexecdir=/usr/lib/lxdm \ + --sysconfdir=/etc --localstatedir=/var + make + + cd "$srcdir" + # GTK+ 3 version + [ -d gtk3 ] || cp -r $pkgbase-$pkgver gtk3 + cd gtk3 + ./configure --prefix=/usr --sbindir=/usr/bin --libexecdir=/usr/lib/lxdm \ + --sysconfdir=/etc --localstatedir=/var --enable-gtk3 + make +} + +package_lxdm() { + groups=('lxde') + depends=('gtk2' 'xorg-server') + optdepends+=('gnome-themes-standard: default GTK+ theme') + + cd gtk2 + make DESTDIR="$pkgdir" install + chmod 644 "$pkgdir/etc/lxdm/lxdm.conf" + + # Setup system user and group + install -dm755 "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d + echo 'u lxdm - "Lightweight X11 Display Manager" /var/lib/lxdm' > "$pkgdir/usr/lib/sysusers.d/$pkgbase.conf" + echo 'd /var/lib/lxdm 0700 lxdm lxdm - -' > "$pkgdir/usr/lib/tmpfiles.d/$pkgbase.conf" +} + +package_lxdm-gtk3() { + groups=('lxde-gtk3') + pkgdesc+=' (GTK+ 3 version)' + depends=('gtk3' 'xorg-server') + conflicts=('lxdm') + + cd gtk3 + make DESTDIR="$pkgdir" install + chmod 644 "$pkgdir/etc/lxdm/lxdm.conf" + + # Setup system user and group + install -dm755 "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d + echo 'u lxdm - "Lightweight X11 Display Manager" /var/lib/lxdm' > "$pkgdir/usr/lib/sysusers.d/$pkgbase.conf" + echo 'd /var/lib/lxdm 0700 lxdm lxdm - -' > "$pkgdir/usr/lib/tmpfiles.d/$pkgbase.conf" +} Deleted: Xsession =================================================================== --- Xsession 2020-05-25 13:59:25 UTC (rev 634360) +++ Xsession 2020-05-25 13:59:37 UTC (rev 634361) @@ -1,71 +0,0 @@ -#!/bin/sh -# -# LXDM wrapper to run around X sessions. - -echo "Running X session wrapper" - -if [ $# -eq 1 -a -n "$1" ]; then - LXSESSION=$1 -else -# default session - LXSESSION=/usr/bin/startlxde -fi - -# 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 -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 - -# 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 - -# Run user xsession shell script -script="$HOME/.xsession" -if [ -x "$script" -a ! -d "$script" ]; then - echo "Loading xsession script $script" - . "$script" -fi - -echo "X session wrapper complete, running session $LXSESSION" - -exec $LXSESSION Copied: lxdm/repos/community-x86_64/Xsession (from rev 634359, lxdm/trunk/Xsession) =================================================================== --- Xsession (rev 0) +++ Xsession 2020-05-25 13:59:37 UTC (rev 634361) @@ -0,0 +1,71 @@ +#!/bin/sh +# +# LXDM wrapper to run around X sessions. + +echo "Running X session wrapper" + +if [ $# -eq 1 -a -n "$1" ]; then + LXSESSION=$1 +else +# default session + LXSESSION=/usr/bin/startlxde +fi + +# 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 -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 + +# 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 + +# Run user xsession shell script +script="$HOME/.xsession" +if [ -x "$script" -a ! -d "$script" ]; then + echo "Loading xsession script $script" + . "$script" +fi + +echo "X session wrapper complete, running session $LXSESSION" + +exec $LXSESSION Deleted: default-config.patch =================================================================== --- default-config.patch 2020-05-25 13:59:25 UTC (rev 634360) +++ default-config.patch 2020-05-25 13:59:37 UTC (rev 634361) @@ -1,25 +0,0 @@ -diff -Naur lxdm.orig/data/lxdm.conf.in lxdm/data/lxdm.conf.in ---- lxdm.orig/data/lxdm.conf.in 2013-08-30 17:56:16.097006000 +0200 -+++ lxdm/data/lxdm.conf.in 2013-09-04 01:54:12.942117085 +0200 -@@ -23,7 +23,7 @@ - - [server] - ## arg used to start xserver, not fully function --# arg=/usr/bin/X -background vt1 -+arg=/usr/bin/X -background vt1 - # uncomment this if you really want xserver listen to tcp - # tcp_listen=1 - # uncoment this if you want reset the xserver after logou -@@ -31,10 +31,10 @@ - - [display] - ## gtk theme used by greeter --gtk_theme=Clearlooks -+gtk_theme=Adwaita - - ## background of the greeter --bg=/usr/share/backgrounds/default.png -+# bg=/usr/share/backgrounds/default.png - - ## if show bottom pane - bottom_pane=1 Copied: lxdm/repos/community-x86_64/default-config.patch (from rev 634359, lxdm/trunk/default-config.patch) =================================================================== --- default-config.patch (rev 0) +++ default-config.patch 2020-05-25 13:59:37 UTC (rev 634361) @@ -0,0 +1,25 @@ +diff -Naur lxdm.orig/data/lxdm.conf.in lxdm/data/lxdm.conf.in +--- lxdm.orig/data/lxdm.conf.in 2013-08-30 17:56:16.097006000 +0200 ++++ lxdm/data/lxdm.conf.in 2013-09-04 01:54:12.942117085 +0200 +@@ -23,7 +23,7 @@ + + [server] + ## arg used to start xserver, not fully function +-# arg=/usr/bin/X -background vt1 ++arg=/usr/bin/X -background vt1 + # uncomment this if you really want xserver listen to tcp + # tcp_listen=1 + # uncoment this if you want reset the xserver after logou +@@ -31,10 +31,10 @@ + + [display] + ## gtk theme used by greeter +-gtk_theme=Clearlooks ++gtk_theme=Adwaita + + ## background of the greeter +-bg=/usr/share/backgrounds/default.png ++# bg=/usr/share/backgrounds/default.png + + ## if show bottom pane + bottom_pane=1 Deleted: git-fixes.patch =================================================================== --- git-fixes.patch 2020-05-25 13:59:25 UTC (rev 634360) +++ git-fixes.patch 2020-05-25 13:59:37 UTC (rev 634361) @@ -1,93 +0,0 @@ -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: #000000; - } - -+#bottom_pane label, - #bottom_pane GtkLabel { - font: Sans 12; - color: #9E9D9B; -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 <gtk/gtk.h> - #include <gdk/gdk.h> - #include <gdk/gdkx.h> - #include <gdk/gdkkeysyms.h> -@@ -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); -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 -diff --git a/src/lxdm.c b/src/lxdm.c -index a37f051..722936f 100644 ---- a/src/lxdm.c -+++ b/src/lxdm.c -@@ -488,6 +490,9 @@ static char *lxsession_xserver_command(LXSession *s) - { - arg[arc++] = g_strdup("-nolisten"); - arg[arc++] = g_strdup("tcp"); -+ } else { -+ arg[arc++] = g_strdup("-listen"); -+ arg[arc++] = g_strdup("tcp"); - } - if(!novtswitch) - { -@@ -750,7 +755,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); - } -@@ -956,6 +967,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); - } Copied: lxdm/repos/community-x86_64/git-fixes.patch (from rev 634359, lxdm/trunk/git-fixes.patch) =================================================================== --- git-fixes.patch (rev 0) +++ git-fixes.patch 2020-05-25 13:59:37 UTC (rev 634361) @@ -0,0 +1,93 @@ +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: #000000; + } + ++#bottom_pane label, + #bottom_pane GtkLabel { + font: Sans 12; + color: #9E9D9B; +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 <gtk/gtk.h> + #include <gdk/gdk.h> + #include <gdk/gdkx.h> + #include <gdk/gdkkeysyms.h> +@@ -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); +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 +diff --git a/src/lxdm.c b/src/lxdm.c +index a37f051..722936f 100644 +--- a/src/lxdm.c ++++ b/src/lxdm.c +@@ -488,6 +490,9 @@ static char *lxsession_xserver_command(LXSession *s) + { + arg[arc++] = g_strdup("-nolisten"); + arg[arc++] = g_strdup("tcp"); ++ } else { ++ arg[arc++] = g_strdup("-listen"); ++ arg[arc++] = g_strdup("tcp"); + } + if(!novtswitch) + { +@@ -750,7 +755,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); + } +@@ -956,6 +967,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); + } Deleted: lxdm.pam =================================================================== --- lxdm.pam 2020-05-25 13:59:25 UTC (rev 634360) +++ lxdm.pam 2020-05-25 13:59:37 UTC (rev 634361) @@ -1,7 +0,0 @@ -#%PAM-1.0 -auth include system-login --auth optional pam_gnome_keyring.so -account include system-login -password include system-login -session include system-login --session optional pam_gnome_keyring.so auto_start Copied: lxdm/repos/community-x86_64/lxdm.pam (from rev 634359, lxdm/trunk/lxdm.pam) =================================================================== --- lxdm.pam (rev 0) +++ lxdm.pam 2020-05-25 13:59:37 UTC (rev 634361) @@ -0,0 +1,7 @@ +#%PAM-1.0 +auth include system-login +-auth optional pam_gnome_keyring.so +account include system-login +password include system-login +session include system-login +-session optional pam_gnome_keyring.so auto_start Deleted: set-path.patch =================================================================== --- set-path.patch 2020-05-25 13:59:25 UTC (rev 634360) +++ set-path.patch 2020-05-25 13:59:37 UTC (rev 634361) @@ -1,12 +0,0 @@ ---- src/lxdm.c -+++ src/lxdm.c -@@ -897,7 +897,7 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang) - path = g_key_file_get_string(config, "base", "path", 0); - if( G_UNLIKELY(path) && path[0] ) /* if PATH is specified in config file */ - env=g_environ_setenv(env, "PATH", path, TRUE); /* override current $PATH with config value */ -- else /* don't use the global env, they are bad for user */ -+ else if(!getenv("PATH")) /* if PATH is not set */ - env=g_environ_setenv(env, "PATH", "/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin", TRUE); /* set proper default */ - g_free(path); - /* optionally override $LANG, $LC_MESSAGES, and $LANGUAGE */ - Copied: lxdm/repos/community-x86_64/set-path.patch (from rev 634359, lxdm/trunk/set-path.patch) =================================================================== --- set-path.patch (rev 0) +++ set-path.patch 2020-05-25 13:59:37 UTC (rev 634361) @@ -0,0 +1,12 @@ +--- src/lxdm.c ++++ src/lxdm.c +@@ -897,7 +897,7 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang) + path = g_key_file_get_string(config, "base", "path", 0); + if( G_UNLIKELY(path) && path[0] ) /* if PATH is specified in config file */ + env=g_environ_setenv(env, "PATH", path, TRUE); /* override current $PATH with config value */ +- else /* don't use the global env, they are bad for user */ ++ else if(!getenv("PATH")) /* if PATH is not set */ + env=g_environ_setenv(env, "PATH", "/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin", TRUE); /* set proper default */ + g_free(path); + /* optionally override $LANG, $LC_MESSAGES, and $LANGUAGE */ +