diff options
Diffstat (limited to 'community-staging/lxdm')
| -rw-r--r-- | community-staging/lxdm/PKGBUILD | 64 | ||||
| -rw-r--r-- | community-staging/lxdm/Xsession.patch | 11 | ||||
| -rw-r--r-- | community-staging/lxdm/glib2-2.32.0.patch | 21 | ||||
| -rw-r--r-- | community-staging/lxdm/greeter-session.patch | 13 | ||||
| -rw-r--r-- | community-staging/lxdm/lxdm-pam | 10 | ||||
| -rw-r--r-- | community-staging/lxdm/lxdm.conf.patch | 11 | ||||
| -rw-r--r-- | community-staging/lxdm/lxdm.install | 18 | ||||
| -rw-r--r-- | community-staging/lxdm/lxdm.patch | 26 | ||||
| -rw-r--r-- | community-staging/lxdm/pam-env-vars.patch | 50 | ||||
| -rw-r--r-- | community-staging/lxdm/rc.d | 36 | ||||
| -rw-r--r-- | community-staging/lxdm/service | 9 |
11 files changed, 0 insertions, 269 deletions
diff --git a/community-staging/lxdm/PKGBUILD b/community-staging/lxdm/PKGBUILD deleted file mode 100644 index 1430d5160..000000000 --- a/community-staging/lxdm/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 77741 2012-10-14 07:48:01Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: AndyRTR <andyrtr@archlinux.org> -# Contributor: kiefer <jorgelmadrid@gmail.com> - -pkgname=lxdm -pkgver=0.4.1 -pkgrel=16 -pkgdesc='Lightweight X11 Display Manager' -arch=('i686' 'x86_64') -url="http://sourceforge.net/projects/lxdm/" -license=('GPL') -groups=('lxde') -depends=('gtk2' 'xorg-server') -makedepends=('intltool') -install=${pkgname}.install -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=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz - glib2-2.32.0.patch lxdm.patch lxdm.conf.patch Xsession.patch - greeter-session.patch pam-env-vars.patch rc.d lxdm-pam service) -md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' - 'a1e3c46a8bef691bc544028f5b6cfe22' - 'baed9055e8825a5511712bc095197519' - 'c50dd01b715b0a236407d48066191601' - 'd2e4a4a22ee2aa1a986be154c647b6c6' - '28475239d0c8b4fd778ec49f5ec72962' - '4c1d43e81e9a256e8d1ea7686c24b3d3' - '705f394052fdd0dec22e95321d170de0' - '34908bc0ec15b6ae4e1074f39fce44df' - 'e8cc66eb1a2405d2d9d184a727cbd9d8') - -build() { - cd $srcdir/$pkgname-$pkgver - - patch -Np1 -i $srcdir/glib2-2.32.0.patch - patch -Np1 -i $srcdir/greeter-session.patch - patch -Np1 -i $srcdir/pam-env-vars.patch - - ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm - make - - patch -Np0 -i $srcdir/lxdm.patch - patch -Np0 -i $srcdir/lxdm.conf.patch - patch -Np0 -i $srcdir/Xsession.patch -} - - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - - install -m644 $srcdir/lxdm-pam $pkgdir/etc/pam.d/lxdm - install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/lxdm - install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/lxdm.service - install -d $pkgdir/var/{lib,run}/lxdm - - # fix the greeter location - sed -i -e 's/local\/libexec/lib\/lxdm/' $pkgdir/etc/lxdm/lxdm.conf - - # avoid conflict with filesystem>=2012.06 - rm -r $pkgdir/var/run -} diff --git a/community-staging/lxdm/Xsession.patch b/community-staging/lxdm/Xsession.patch deleted file mode 100644 index 035ff0383..000000000 --- a/community-staging/lxdm/Xsession.patch +++ /dev/null @@ -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 - diff --git a/community-staging/lxdm/glib2-2.32.0.patch b/community-staging/lxdm/glib2-2.32.0.patch deleted file mode 100644 index cebfc6133..000000000 --- a/community-staging/lxdm/glib2-2.32.0.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: dgod <dgod.osa@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) diff --git a/community-staging/lxdm/greeter-session.patch b/community-staging/lxdm/greeter-session.patch deleted file mode 100644 index f3b94a57a..000000000 --- a/community-staging/lxdm/greeter-session.patch +++ /dev/null @@ -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)) diff --git a/community-staging/lxdm/lxdm-pam b/community-staging/lxdm/lxdm-pam deleted file mode 100644 index c62f62721..000000000 --- a/community-staging/lxdm/lxdm-pam +++ /dev/null @@ -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_systemd.so --session optional pam_loginuid.so diff --git a/community-staging/lxdm/lxdm.conf.patch b/community-staging/lxdm/lxdm.conf.patch deleted file mode 100644 index 1744e557e..000000000 --- a/community-staging/lxdm/lxdm.conf.patch +++ /dev/null @@ -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 diff --git a/community-staging/lxdm/lxdm.install b/community-staging/lxdm/lxdm.install deleted file mode 100644 index 4d1285dc5..000000000 --- a/community-staging/lxdm/lxdm.install +++ /dev/null @@ -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 -} diff --git a/community-staging/lxdm/lxdm.patch b/community-staging/lxdm/lxdm.patch deleted file mode 100644 index a703a386d..000000000 --- a/community-staging/lxdm/lxdm.patch +++ /dev/null @@ -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 diff --git a/community-staging/lxdm/pam-env-vars.patch b/community-staging/lxdm/pam-env-vars.patch deleted file mode 100644 index ab8605ff1..000000000 --- a/community-staging/lxdm/pam-env-vars.patch +++ /dev/null @@ -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); diff --git a/community-staging/lxdm/rc.d b/community-staging/lxdm/rc.d deleted file mode 100644 index 68eb6225d..000000000 --- a/community-staging/lxdm/rc.d +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID `which lxdm-binary`) -case "$1" in - start) - stat_busy "Starting LXDM Display Manager" - [ -z "$PID" ] && /usr/sbin/lxdm -d &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon lxdm - stat_done - fi - ;; - stop) - stat_busy "Stopping LXDM Display Manager" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon lxdm - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-staging/lxdm/service b/community-staging/lxdm/service deleted file mode 100644 index e1840476c..000000000 --- a/community-staging/lxdm/service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=LXDE Display Manager -After=systemd-user-sessions.service - -[Service] -ExecStart=/usr/sbin/lxdm - -[Install] -Alias=display-manager.service |