Date: Sunday, May 12, 2013 @ 12:50:33 Author: dwallace Revision: 90429
archrelease: copy trunk to community-i686, community-x86_64 Deleted: lxdm/repos/community-i686/lxdm-0.4.1-Xsession-source-profile.patch lxdm/repos/community-i686/lxdm-0.4.1-conf.patch lxdm/repos/community-i686/lxdm-0.4.1-event-check-bug.patch lxdm/repos/community-i686/lxdm-0.4.1-industrial-greeter-ui.patch lxdm/repos/community-i686/lxdm-0.4.1-modern-systems.patch lxdm/repos/community-i686/lxdm-0.4.1-nolang-show-sessions.patch lxdm/repos/community-i686/lxdm-0.4.1-pam-env-vars.patch lxdm/repos/community-i686/lxdm.install lxdm/repos/community-i686/lxdm.pam lxdm/repos/community-x86_64/lxdm-0.4.1-Xsession-source-profile.patch lxdm/repos/community-x86_64/lxdm-0.4.1-conf.patch lxdm/repos/community-x86_64/lxdm-0.4.1-event-check-bug.patch lxdm/repos/community-x86_64/lxdm-0.4.1-industrial-greeter-ui.patch lxdm/repos/community-x86_64/lxdm-0.4.1-modern-systems.patch lxdm/repos/community-x86_64/lxdm-0.4.1-nolang-show-sessions.patch lxdm/repos/community-x86_64/lxdm-0.4.1-pam-env-vars.patch lxdm/repos/community-x86_64/lxdm.install lxdm/repos/community-x86_64/lxdm.pam -----------------------------------------------------------+ community-i686/lxdm-0.4.1-Xsession-source-profile.patch | 11 -- community-i686/lxdm-0.4.1-conf.patch | 11 -- community-i686/lxdm-0.4.1-event-check-bug.patch | 21 ----- community-i686/lxdm-0.4.1-industrial-greeter-ui.patch | 13 --- community-i686/lxdm-0.4.1-modern-systems.patch | 26 ------ community-i686/lxdm-0.4.1-nolang-show-sessions.patch | 13 --- community-i686/lxdm-0.4.1-pam-env-vars.patch | 50 ------------ community-i686/lxdm.install | 18 ---- community-i686/lxdm.pam | 10 -- community-x86_64/lxdm-0.4.1-Xsession-source-profile.patch | 11 -- community-x86_64/lxdm-0.4.1-conf.patch | 11 -- community-x86_64/lxdm-0.4.1-event-check-bug.patch | 21 ----- community-x86_64/lxdm-0.4.1-industrial-greeter-ui.patch | 13 --- community-x86_64/lxdm-0.4.1-modern-systems.patch | 26 ------ community-x86_64/lxdm-0.4.1-nolang-show-sessions.patch | 13 --- community-x86_64/lxdm-0.4.1-pam-env-vars.patch | 50 ------------ community-x86_64/lxdm.install | 18 ---- community-x86_64/lxdm.pam | 10 -- 18 files changed, 346 deletions(-) Deleted: community-i686/lxdm-0.4.1-Xsession-source-profile.patch =================================================================== --- community-i686/lxdm-0.4.1-Xsession-source-profile.patch 2013-05-12 10:49:11 UTC (rev 90428) +++ community-i686/lxdm-0.4.1-Xsession-source-profile.patch 2013-05-12 10:50:33 UTC (rev 90429) @@ -1,11 +0,0 @@ ---- data/Xsession.orig 2011-07-29 15:42:33.000000000 +0200 -+++ data/Xsession 2011-12-03 09:09:14.592876087 +0100 -@@ -9,6 +9,8 @@ - LXSESSION=/usr/bin/startlxde - fi - -+[ -f /etc/profile ] && . /etc/profile -+[ -f ~/.profile ] && . ~/.profile - [ -f /etc/xprofile ] && . /etc/xprofile - [ -f ~/.xprofile ] && . ~/.xprofile - Deleted: community-i686/lxdm-0.4.1-conf.patch =================================================================== --- community-i686/lxdm-0.4.1-conf.patch 2013-05-12 10:49:11 UTC (rev 90428) +++ community-i686/lxdm-0.4.1-conf.patch 2013-05-12 10:50:33 UTC (rev 90429) @@ -1,11 +0,0 @@ ---- data/lxdm.conf.orig 2011-11-01 17:57:59.208757577 +0100 -+++ data/lxdm.conf 2011-11-01 18:03:55.608741945 +0100 -@@ -27,7 +27,7 @@ - gtk_theme=Clearlooks - - ## background of the greeter --bg=/usr/share/backgrounds/default.png -+# bg=/usr/share/backgrounds/default.png - - ## if show bottom pane - bottom_pane=1 Deleted: community-i686/lxdm-0.4.1-event-check-bug.patch =================================================================== --- community-i686/lxdm-0.4.1-event-check-bug.patch 2013-05-12 10:49:11 UTC (rev 90428) +++ community-i686/lxdm-0.4.1-event-check-bug.patch 2013-05-12 10:50:33 UTC (rev 90429) @@ -1,21 +0,0 @@ -From: dgod <dgod....@gmail.com> -Date: Sun, 25 Dec 2011 07:23:19 +0000 (+0800) -Subject: fix event check bug caused cpu 100% -X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxdm;a=commitdiff_plain;h=d4e41ecb;hp=f0951bdf736026b041001e846d2cb93f7f2852e1 - -fix event check bug caused cpu 100% ---- - -diff --git a/src/lxcom.c b/src/lxcom.c -index 02763eb..18ee12e 100644 ---- a/src/lxcom.c -+++ b/src/lxcom.c -@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout) - - static gboolean lxcom_check(GSource *source) - { -- return TRUE; -+ return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE; - } - - static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data) Deleted: community-i686/lxdm-0.4.1-industrial-greeter-ui.patch =================================================================== --- community-i686/lxdm-0.4.1-industrial-greeter-ui.patch 2013-05-12 10:49:11 UTC (rev 90428) +++ community-i686/lxdm-0.4.1-industrial-greeter-ui.patch 2013-05-12 10:50:33 UTC (rev 90429) @@ -1,13 +0,0 @@ ---- data/themes/Industrial/greeter.ui.orig 2012-05-09 23:54:03.743980613 -0300 -+++ data/themes/Industrial/greeter.ui 2012-05-10 00:26:20.340687396 -0300 -@@ -201,7 +201,9 @@ - </packing> - </child> - <child> -- <object class="GtkComboBoxEntry" id="keyboard"/> -+ <object class="GtkComboBoxEntry" id="keyboard"> -+ <property name="text_column">0</property> -+ </object> - <packing> - <property name="expand">False</property> - <property name="position">3</property> Deleted: community-i686/lxdm-0.4.1-modern-systems.patch =================================================================== --- community-i686/lxdm-0.4.1-modern-systems.patch 2013-05-12 10:49:11 UTC (rev 90428) +++ community-i686/lxdm-0.4.1-modern-systems.patch 2013-05-12 10:50:33 UTC (rev 90429) @@ -1,26 +0,0 @@ ---- data/lxdm.orig 2010-01-24 16:58:42.262866825 -0200 -+++ data/lxdm 2010-01-19 11:56:34.308668692 -0200 -@@ -1,21 +1,13 @@ - #!/bin/sh - --[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n -- --if [ -z "$LANG" -a -e /etc/sysconfig/language ]; then -- . /etc/sysconfig/language -- if [ -n "$RC_LANG"]; then -- LANG=$RC_LANG -- fi -+if [ -r /etc/profile.d/locale.sh ]; then -+ . /etc/profile.d/locale.sh - fi - - if [ -n "$LANG" ]; then - export LANG - fi - --[ -f /etc/sysconfig/desktop ] && . /etc/sysconfig/desktop --[ -f /etc/sysconfig/windowmanager ] && . /etc/sysconfig/windowmanager -- - if [ -n "$DEFAULT_WM" ]; then - PREFERRED=$DEFAULT_WM - fi Deleted: community-i686/lxdm-0.4.1-nolang-show-sessions.patch =================================================================== --- community-i686/lxdm-0.4.1-nolang-show-sessions.patch 2013-05-12 10:49:11 UTC (rev 90428) +++ community-i686/lxdm-0.4.1-nolang-show-sessions.patch 2013-05-12 10:50:33 UTC (rev 90429) @@ -1,13 +0,0 @@ -diff --git a/src/greeter.c b/src/greeter.c -index c0c150d..1f6b88e 100644 ---- a/src/greeter.c -+++ b/src/greeter.c -@@ -114,7 +114,7 @@ static char *get_session_exec(void) - GtkTreeModel* model; - GtkTreeIter it; - gchar *res; -- if(!lang) -+ if(!sessions) - return g_strdup(""); - - if(!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(sessions), &it)) Deleted: community-i686/lxdm-0.4.1-pam-env-vars.patch =================================================================== --- community-i686/lxdm-0.4.1-pam-env-vars.patch 2013-05-12 10:49:11 UTC (rev 90428) +++ community-i686/lxdm-0.4.1-pam-env-vars.patch 2013-05-12 10:50:33 UTC (rev 90429) @@ -1,50 +0,0 @@ -diff --git a/src/lxdm.c b/src/lxdm.c -index 369aedf..cd1d486 100644 ---- a/src/lxdm.c -+++ b/src/lxdm.c -@@ -935,16 +935,23 @@ void setup_pam_session(LXSession *s,struct passwd *pw,char *session_name) - g_warning( "pam open session error \"%s\"\n", pam_strerror(s->pamh, err)); - } - --void append_pam_environ(pam_handle_t *pamh,char **env) -+static char **append_pam_environ(pam_handle_t *pamh,char **env) - { -- int i,j,n; -+ int i,j,n,a; - char **penv; -- if(!pamh) return; -+ if(!pamh) return env; - penv=pam_getenvlist(pamh); -- if(!penv) return; -+ if(!penv) return env; -+ a=g_strv_length(penv); -+ if(a==0) -+ { -+ free(penv); -+ return env; -+ } -+ env=g_renew(char *,env,g_strv_length(env)+1+a+10); - for(i=0;penv[i]!=NULL;i++) - { -- //printf("PAM %s\n",penv[i]); -+ fprintf(stderr,"PAM %s\n",penv[i]); - n=strcspn(penv[i],"=")+1; - for(j=0;env[j]!=NULL;j++) - { -@@ -960,6 +967,7 @@ void append_pam_environ(pam_handle_t *pamh,char **env) - free(penv[i]); - } - free(penv); -+ return env; - } - - #endif -@@ -1540,7 +1548,7 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) - if(s->child==0) - { - #if HAVE_LIBPAM -- append_pam_environ(s->pamh,env); -+ env=append_pam_environ(s->pamh,env); - pam_end(s->pamh,0); - #endif - switch_user(pw, session_exec, env); Deleted: community-i686/lxdm.install =================================================================== --- community-i686/lxdm.install 2013-05-12 10:49:11 UTC (rev 90428) +++ community-i686/lxdm.install 2013-05-12 10:50:33 UTC (rev 90429) @@ -1,18 +0,0 @@ -post_install() { - if ! getent group lxdm > /dev/null ; then - groupadd --system lxdm - chgrp -R lxdm /var/lib/lxdm - chgrp lxdm /etc/lxdm/lxdm.conf - chmod +r /etc/lxdm/lxdm.conf - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - if ! getent group lxdm > /dev/null ; then - groupdel lxdm - fi -} Deleted: community-i686/lxdm.pam =================================================================== --- community-i686/lxdm.pam 2013-05-12 10:49:11 UTC (rev 90428) +++ community-i686/lxdm.pam 2013-05-12 10:50:33 UTC (rev 90429) @@ -1,10 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_unix.so -account required pam_unix.so -session required pam_limits.so -session required pam_unix.so -password required pam_unix.so --session optional pam_loginuid.so --session optional pam_systemd.so Deleted: community-x86_64/lxdm-0.4.1-Xsession-source-profile.patch =================================================================== --- community-x86_64/lxdm-0.4.1-Xsession-source-profile.patch 2013-05-12 10:49:11 UTC (rev 90428) +++ community-x86_64/lxdm-0.4.1-Xsession-source-profile.patch 2013-05-12 10:50:33 UTC (rev 90429) @@ -1,11 +0,0 @@ ---- data/Xsession.orig 2011-07-29 15:42:33.000000000 +0200 -+++ data/Xsession 2011-12-03 09:09:14.592876087 +0100 -@@ -9,6 +9,8 @@ - LXSESSION=/usr/bin/startlxde - fi - -+[ -f /etc/profile ] && . /etc/profile -+[ -f ~/.profile ] && . ~/.profile - [ -f /etc/xprofile ] && . /etc/xprofile - [ -f ~/.xprofile ] && . ~/.xprofile - Deleted: community-x86_64/lxdm-0.4.1-conf.patch =================================================================== --- community-x86_64/lxdm-0.4.1-conf.patch 2013-05-12 10:49:11 UTC (rev 90428) +++ community-x86_64/lxdm-0.4.1-conf.patch 2013-05-12 10:50:33 UTC (rev 90429) @@ -1,11 +0,0 @@ ---- data/lxdm.conf.orig 2011-11-01 17:57:59.208757577 +0100 -+++ data/lxdm.conf 2011-11-01 18:03:55.608741945 +0100 -@@ -27,7 +27,7 @@ - gtk_theme=Clearlooks - - ## background of the greeter --bg=/usr/share/backgrounds/default.png -+# bg=/usr/share/backgrounds/default.png - - ## if show bottom pane - bottom_pane=1 Deleted: community-x86_64/lxdm-0.4.1-event-check-bug.patch =================================================================== --- community-x86_64/lxdm-0.4.1-event-check-bug.patch 2013-05-12 10:49:11 UTC (rev 90428) +++ community-x86_64/lxdm-0.4.1-event-check-bug.patch 2013-05-12 10:50:33 UTC (rev 90429) @@ -1,21 +0,0 @@ -From: dgod <dgod....@gmail.com> -Date: Sun, 25 Dec 2011 07:23:19 +0000 (+0800) -Subject: fix event check bug caused cpu 100% -X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxdm;a=commitdiff_plain;h=d4e41ecb;hp=f0951bdf736026b041001e846d2cb93f7f2852e1 - -fix event check bug caused cpu 100% ---- - -diff --git a/src/lxcom.c b/src/lxcom.c -index 02763eb..18ee12e 100644 ---- a/src/lxcom.c -+++ b/src/lxcom.c -@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout) - - static gboolean lxcom_check(GSource *source) - { -- return TRUE; -+ return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE; - } - - static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data) Deleted: community-x86_64/lxdm-0.4.1-industrial-greeter-ui.patch =================================================================== --- community-x86_64/lxdm-0.4.1-industrial-greeter-ui.patch 2013-05-12 10:49:11 UTC (rev 90428) +++ community-x86_64/lxdm-0.4.1-industrial-greeter-ui.patch 2013-05-12 10:50:33 UTC (rev 90429) @@ -1,13 +0,0 @@ ---- data/themes/Industrial/greeter.ui.orig 2012-05-09 23:54:03.743980613 -0300 -+++ data/themes/Industrial/greeter.ui 2012-05-10 00:26:20.340687396 -0300 -@@ -201,7 +201,9 @@ - </packing> - </child> - <child> -- <object class="GtkComboBoxEntry" id="keyboard"/> -+ <object class="GtkComboBoxEntry" id="keyboard"> -+ <property name="text_column">0</property> -+ </object> - <packing> - <property name="expand">False</property> - <property name="position">3</property> Deleted: community-x86_64/lxdm-0.4.1-modern-systems.patch =================================================================== --- community-x86_64/lxdm-0.4.1-modern-systems.patch 2013-05-12 10:49:11 UTC (rev 90428) +++ community-x86_64/lxdm-0.4.1-modern-systems.patch 2013-05-12 10:50:33 UTC (rev 90429) @@ -1,26 +0,0 @@ ---- data/lxdm.orig 2010-01-24 16:58:42.262866825 -0200 -+++ data/lxdm 2010-01-19 11:56:34.308668692 -0200 -@@ -1,21 +1,13 @@ - #!/bin/sh - --[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n -- --if [ -z "$LANG" -a -e /etc/sysconfig/language ]; then -- . /etc/sysconfig/language -- if [ -n "$RC_LANG"]; then -- LANG=$RC_LANG -- fi -+if [ -r /etc/profile.d/locale.sh ]; then -+ . /etc/profile.d/locale.sh - fi - - if [ -n "$LANG" ]; then - export LANG - fi - --[ -f /etc/sysconfig/desktop ] && . /etc/sysconfig/desktop --[ -f /etc/sysconfig/windowmanager ] && . /etc/sysconfig/windowmanager -- - if [ -n "$DEFAULT_WM" ]; then - PREFERRED=$DEFAULT_WM - fi Deleted: community-x86_64/lxdm-0.4.1-nolang-show-sessions.patch =================================================================== --- community-x86_64/lxdm-0.4.1-nolang-show-sessions.patch 2013-05-12 10:49:11 UTC (rev 90428) +++ community-x86_64/lxdm-0.4.1-nolang-show-sessions.patch 2013-05-12 10:50:33 UTC (rev 90429) @@ -1,13 +0,0 @@ -diff --git a/src/greeter.c b/src/greeter.c -index c0c150d..1f6b88e 100644 ---- a/src/greeter.c -+++ b/src/greeter.c -@@ -114,7 +114,7 @@ static char *get_session_exec(void) - GtkTreeModel* model; - GtkTreeIter it; - gchar *res; -- if(!lang) -+ if(!sessions) - return g_strdup(""); - - if(!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(sessions), &it)) Deleted: community-x86_64/lxdm-0.4.1-pam-env-vars.patch =================================================================== --- community-x86_64/lxdm-0.4.1-pam-env-vars.patch 2013-05-12 10:49:11 UTC (rev 90428) +++ community-x86_64/lxdm-0.4.1-pam-env-vars.patch 2013-05-12 10:50:33 UTC (rev 90429) @@ -1,50 +0,0 @@ -diff --git a/src/lxdm.c b/src/lxdm.c -index 369aedf..cd1d486 100644 ---- a/src/lxdm.c -+++ b/src/lxdm.c -@@ -935,16 +935,23 @@ void setup_pam_session(LXSession *s,struct passwd *pw,char *session_name) - g_warning( "pam open session error \"%s\"\n", pam_strerror(s->pamh, err)); - } - --void append_pam_environ(pam_handle_t *pamh,char **env) -+static char **append_pam_environ(pam_handle_t *pamh,char **env) - { -- int i,j,n; -+ int i,j,n,a; - char **penv; -- if(!pamh) return; -+ if(!pamh) return env; - penv=pam_getenvlist(pamh); -- if(!penv) return; -+ if(!penv) return env; -+ a=g_strv_length(penv); -+ if(a==0) -+ { -+ free(penv); -+ return env; -+ } -+ env=g_renew(char *,env,g_strv_length(env)+1+a+10); - for(i=0;penv[i]!=NULL;i++) - { -- //printf("PAM %s\n",penv[i]); -+ fprintf(stderr,"PAM %s\n",penv[i]); - n=strcspn(penv[i],"=")+1; - for(j=0;env[j]!=NULL;j++) - { -@@ -960,6 +967,7 @@ void append_pam_environ(pam_handle_t *pamh,char **env) - free(penv[i]); - } - free(penv); -+ return env; - } - - #endif -@@ -1540,7 +1548,7 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) - if(s->child==0) - { - #if HAVE_LIBPAM -- append_pam_environ(s->pamh,env); -+ env=append_pam_environ(s->pamh,env); - pam_end(s->pamh,0); - #endif - switch_user(pw, session_exec, env); Deleted: community-x86_64/lxdm.install =================================================================== --- community-x86_64/lxdm.install 2013-05-12 10:49:11 UTC (rev 90428) +++ community-x86_64/lxdm.install 2013-05-12 10:50:33 UTC (rev 90429) @@ -1,18 +0,0 @@ -post_install() { - if ! getent group lxdm > /dev/null ; then - groupadd --system lxdm - chgrp -R lxdm /var/lib/lxdm - chgrp lxdm /etc/lxdm/lxdm.conf - chmod +r /etc/lxdm/lxdm.conf - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - if ! getent group lxdm > /dev/null ; then - groupdel lxdm - fi -} Deleted: community-x86_64/lxdm.pam =================================================================== --- community-x86_64/lxdm.pam 2013-05-12 10:49:11 UTC (rev 90428) +++ community-x86_64/lxdm.pam 2013-05-12 10:50:33 UTC (rev 90429) @@ -1,10 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_unix.so -account required pam_unix.so -session required pam_limits.so -session required pam_unix.so -password required pam_unix.so --session optional pam_loginuid.so --session optional pam_systemd.so
