[arch-commits] Commit in lxdm/trunk (4 files)
Date: Friday, July 31, 2015 @ 16:08:27
Author: bgyorgy
Revision: 137641
upgpkg: lxdm 0.5.1-3
Apply fixes from git
Added:
lxdm/trunk/git-fixes.patch
Modified:
lxdm/trunk/PKGBUILD
Deleted:
lxdm/trunk/lxdm.git-2abf1d971198d224c68b20c56862df2fe7c6a648.patch
lxdm/trunk/lxdm.git-4dfe7924a220643600be58861b01f186225fe251.patch
-+
PKGBUILD| 17 -
git-fixes.patch | 217 ++
lxdm.git-2abf1d971198d224c68b20c56862df2fe7c6a648.patch | 118 ---
lxdm.git-4dfe7924a220643600be58861b01f186225fe251.patch | 64
4 files changed, 224 insertions(+), 192 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-07-31 13:30:04 UTC (rev 137640)
+++ PKGBUILD2015-07-31 14:08:27 UTC (rev 137641)
@@ -6,7 +6,7 @@
pkgname=lxdm
pkgver=0.5.1
-pkgrel=2
+pkgrel=3
pkgdesc='Lightweight X11 Display Manager'
arch=('i686' 'x86_64')
url=https://sourceforge.net/projects/lxdm/;
@@ -22,24 +22,21 @@
'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin'
'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown')
source=(http://downloads.sourceforge.net/lxdm/$pkgname-$pkgver.tar.xz
+git-fixes.patch
default-config.patch
lxdm.pam
-Xsession
-lxdm.git-2abf1d971198d224c68b20c56862df2fe7c6a648.patch
-lxdm.git-4dfe7924a220643600be58861b01f186225fe251.patch)
+Xsession)
md5sums=('9e03ce5f6d303bc9b689732401934dc6'
+ '8f514a4ba8fe204c8f0db293246dba3d'
'f0ae6c072f151104c53a030fd7757821'
'c941ef896248bc7c03901b513490425c'
- '6ff73570368501a06ee7badc8e415d0a'
- '54c3de1d6108f8d68dea31622dd976e1'
- '2522db72aeddffc22e349bfea24ae48e')
+ '6ff73570368501a06ee7badc8e415d0a')
prepare(){
cd $srcdir/$pkgname-$pkgver
- # Kill user processes on logout (fix second login with systemd = 222)
- patch -Np1 -i ../lxdm.git-2abf1d971198d224c68b20c56862df2fe7c6a648.patch
- patch -Np1 -i ../lxdm.git-4dfe7924a220643600be58861b01f186225fe251.patch
+ # Apply fixes from git
+ patch -Np1 -i ../git-fixes.patch
# Adjust Arch-specific settings
patch -Np1 -i ../default-config.patch
Added: git-fixes.patch
===
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2015-07-31 14:08:27 UTC (rev 137641)
@@ -0,0 +1,217 @@
+diff --git a/data/themes/Industrial/gtk.css b/data/themes/Industrial/gtk.css
+index 7621345..179f0d6 100644
+--- a/data/themes/Industrial/gtk.css
b/data/themes/Industrial/gtk.css
+@@ -1,6 +1,6 @@
+ #lxdm {
+ background-image: url(wave.svg);
+- background-size: 100%;
++ background-repeat: round;
+ }
+
+ #bottom_pane {
+@@ -12,10 +12,12 @@
+ color: #ff;
+ }
+
+-#user_list, #login_entry {
+- background-image: none;
++#prompt {
++ font: Sans 14;
++ color: #00;
+ }
+
+-#prompt, #bottom_pane GtkLabel {
+- color: #ff;
++#bottom_pane GtkLabel {
++ font: Sans 12;
++ color: #9E9D9B;
+ }
+diff --git a/src/lxdm.c b/src/lxdm.c
+index 507189d..842f4b8 100644
+--- a/src/lxdm.c
b/src/lxdm.c
+@@ -1269,6 +1269,9 @@ void lxdm_do_login(struct passwd *pw, char *session,
char *lang, char *option)
+ {
+ if(s) lxsession_free(s);
+ lxsession_set_active(prev);
++ g_free(session_name);
++ g_free(session_exec);
++ g_free(session_desktop_names);
+ return;
+ }
+ if(!s) s=lxsession_find_idle();
+@@ -1514,7 +1517,7 @@ static void lxdm_signal_handler(void *data,int sig)
+ switch(sig){
+ case SIGTERM:
+ case SIGINT:
+- g_critical(QUIT BY SIGNAL\n);
++ g_critical(QUIT BY SIGNAL %d\n,sig);
+ lxdm_quit_self(0);
+ break;
+ default:
+@@ -1650,6 +1653,7 @@ static GString *lxdm_user_cmd(void *data,int user,int
arc,char **arg)
+ if(p)
+ {
+ res=g_string_new_len(p,len);
++ g_free(p);
+ }
+ g_key_file_free(kf);
+ }
+diff --git a/src/pam.c b/src/pam.c
+index 43bd687..a377157 100644
+--- a/src/pam.c
b/src/pam.c
+@@ -42,6 +42,7 @@
+ #include errno.h
+ #include poll.h
+ #include sys/stat.h
++#include sys/wait.h
+
+ #include pwd.h
+ #include grp.h
+@@ -300,12 +301,72 @@ int lxdm_auth_session_begin(LXDM_AUTH *a,const char
*name,int tty,int display,ch
+ }
+ err = pam_open_session(a-handle, 0); /* FIXME pam session failed */
+ if( err != PAM_SUCCESS )
++ {
+ g_warning( pam open session error \%s\\n,
pam_strerror(a-handle, err));
++ }
+ else
++ {
+ a-in_session=1;
++ }
+ return
[arch-commits] Commit in lxdm/trunk (4 files)
Date: Wednesday, July 29, 2015 @ 18:15:33
Author: bgyorgy
Revision: 137597
upgpkg: lxdm 0.5.1-2
Kill user processes on logout (fix second login with systemd = 222); update
Xsession file with changes from LightDM
Added:
lxdm/trunk/lxdm.git-2abf1d971198d224c68b20c56862df2fe7c6a648.patch
lxdm/trunk/lxdm.git-4dfe7924a220643600be58861b01f186225fe251.patch
Modified:
lxdm/trunk/PKGBUILD
lxdm/trunk/Xsession
-+
PKGBUILD| 14 +
Xsession| 11 +
lxdm.git-2abf1d971198d224c68b20c56862df2fe7c6a648.patch | 118 ++
lxdm.git-4dfe7924a220643600be58861b01f186225fe251.patch | 64 +++
4 files changed, 202 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-07-29 08:59:12 UTC (rev 137596)
+++ PKGBUILD2015-07-29 16:15:33 UTC (rev 137597)
@@ -6,7 +6,7 @@
pkgname=lxdm
pkgver=0.5.1
-pkgrel=1
+pkgrel=2
pkgdesc='Lightweight X11 Display Manager'
arch=('i686' 'x86_64')
url=https://sourceforge.net/projects/lxdm/;
@@ -24,15 +24,23 @@
source=(http://downloads.sourceforge.net/lxdm/$pkgname-$pkgver.tar.xz
default-config.patch
lxdm.pam
-Xsession)
+Xsession
+lxdm.git-2abf1d971198d224c68b20c56862df2fe7c6a648.patch
+lxdm.git-4dfe7924a220643600be58861b01f186225fe251.patch)
md5sums=('9e03ce5f6d303bc9b689732401934dc6'
'f0ae6c072f151104c53a030fd7757821'
'c941ef896248bc7c03901b513490425c'
- 'd9c8f8c9e6de52dbc389696454c8f572')
+ '6ff73570368501a06ee7badc8e415d0a'
+ '54c3de1d6108f8d68dea31622dd976e1'
+ '2522db72aeddffc22e349bfea24ae48e')
prepare(){
cd $srcdir/$pkgname-$pkgver
+ # Kill user processes on logout (fix second login with systemd = 222)
+ patch -Np1 -i ../lxdm.git-2abf1d971198d224c68b20c56862df2fe7c6a648.patch
+ patch -Np1 -i ../lxdm.git-4dfe7924a220643600be58861b01f186225fe251.patch
+
# Adjust Arch-specific settings
patch -Np1 -i ../default-config.patch
Modified: Xsession
===
--- Xsession2015-07-29 08:59:12 UTC (rev 137596)
+++ Xsession2015-07-29 16:15:33 UTC (rev 137597)
@@ -23,7 +23,7 @@
for file in /etc/X11/Xresources $HOME/.Xresources; do
if [ -f $file ]; then
echo Loading resource: $file
-xrdb -nocpp -merge $file
+xrdb -merge $file
fi
done
@@ -48,7 +48,7 @@
unset XKB_IN_USE
-# Run all system xinitrc shell scripts.
+# Run all system xinitrc shell scripts
xinitdir=/etc/X11/xinit/xinitrc.d
if [ -d $xinitdir ]; then
for script in $xinitdir/*; do
@@ -59,6 +59,13 @@
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
Added: lxdm.git-2abf1d971198d224c68b20c56862df2fe7c6a648.patch
===
--- lxdm.git-2abf1d971198d224c68b20c56862df2fe7c6a648.patch
(rev 0)
+++ lxdm.git-2abf1d971198d224c68b20c56862df2fe7c6a648.patch 2015-07-29
16:15:33 UTC (rev 137597)
@@ -0,0 +1,118 @@
+From 2abf1d971198d224c68b20c56862df2fe7c6a648 Mon Sep 17 00:00:00 2001
+From: dgod dgod@gmail.com
+Date: Fri, 24 Jul 2015 20:25:05 +0800
+Subject: [PATCH] try kill left process when session end, by check the
+ XDG_SESSION_ID
+
+---
+ src/pam.c | 72 +++
+ 1 file changed, 72 insertions(+)
+
+diff --git a/src/pam.c b/src/pam.c
+index 43bd687..940fdd2 100644
+--- a/src/pam.c
b/src/pam.c
+@@ -42,6 +42,7 @@
+ #include errno.h
+ #include poll.h
+ #include sys/stat.h
++#include sys/wait.h
+
+ #include pwd.h
+ #include grp.h
+@@ -300,12 +301,72 @@ int lxdm_auth_session_begin(LXDM_AUTH *a,const char
*name,int tty,int display,ch
+ }
+ err = pam_open_session(a-handle, 0); /* FIXME pam session failed */
+ if( err != PAM_SUCCESS )
++ {
+ g_warning( pam open session error \%s\\n,
pam_strerror(a-handle, err));
++ }
+ else
++ {
+ a-in_session=1;
++ }
+ return 0;
+ }
+
++static int proc_filter(const struct dirent *d)
++{
++int c=d-d_name[0];
++return c='1' c='9';
++}
++
++static int check_process_sid(int pid,const char *sid)
++{
++ char path[128];
++ FILE *fp;
++ gchar *env_data,*p;
++ gsize env_len;
++ int res=0;
++
++ sprintf(path,/proc/%d/environ,pid);
++ if(!g_file_get_contents(path,env_data,env_len,NULL))
++ {
++ return 0;
++ }
++ for(p=env_data;p!=NULL p-env_dataenv_len;)
++ {
++ if(!strncmp(p,XDG_SESSION_ID=,15))
++
[arch-commits] Commit in lxdm/trunk (4 files)
Date: Friday, September 6, 2013 @ 07:41:43 Author: bgyorgy Revision: 96823 upgpkg: lxdm 0.4.1-24 General cleanup, apply all upstream fixes Added: lxdm/trunk/default-config.patch lxdm/trunk/git-fixes.patch Modified: lxdm/trunk/PKGBUILD lxdm/trunk/lxdm.install --+ PKGBUILD | 87 -- default-config.patch | 80 + git-fixes.patch | 2038 + lxdm.install | 24 4 files changed, 2162 insertions(+), 67 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 96822:96823 to see the changes.
