diff options
author | BlackNoxis <steven.darklight@gmail.com> | 2014-02-15 23:24:26 +0200 |
---|---|---|
committer | BlackNoxis <steven.darklight@gmail.com> | 2014-02-15 23:24:26 +0200 |
commit | 7224c1253228e5c29c78cb3f0f26ce34770f2356 (patch) | |
tree | 1684924656132935256e034f35f92abee6623265 /lxde-base/lxdm/files |
Added ebuilds for kogaion desktop
Diffstat (limited to 'lxde-base/lxdm/files')
13 files changed, 363 insertions, 0 deletions
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch b/lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch new file mode 100644 index 00000000..d91bf75a --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch @@ -0,0 +1,45 @@ +From 949ee91acb55baeb4b8761957eabd2e5a345d2ae Mon Sep 17 00:00:00 2001 +From: Mitch Harder <mitch.harder@sabayonlinux.org> +Date: Thu, 8 Dec 2011 11:02:28 -0600 +Subject: Fix configure.ac test for pam libs. + +A bug report on Gentoo noted that the configure test for pam +wasn't working correctly. +https://bugs.gentoo.org/show_bug.cgi?id=384615 + +This corrections borrows the configure.ac pam testing method used in xdm. +--- + configure.ac | 13 +++++++++++-- + 1 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e952473..eaa883a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -14,12 +14,21 @@ AC_PROG_INSTALL + AM_PROG_CC_C_O + + # Checks for libraries. + AC_CHECK_LIB([crypt], [crypt]) + +-AC_ARG_WITH(pam,AC_HELP_STRING([--without-pam],[build without pam]), +-[],[AC_CHECK_LIB([pam], [pam_open_session])]) ++# Check for PAM support ++AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam],[Use PAM for authentication]), ++ [USE_PAM=$withval], [USE_PAM=$use_pam_default]) ++if test "x$USE_PAM" != "xno" ; then ++ AC_SEARCH_LIBS(pam_open_session,[pam]) ++ AC_CHECK_FUNC(pam_open_session, ++ [AC_DEFINE(USE_PAM,1,[Use PAM for authentication])], ++ [if test "x$USE_PAM" != "xtry" ; then ++ AC_MSG_ERROR(["PAM support requested, but pam_open_session not found."]) ++ fi]) ++fi + + AC_CHECK_LIB([ck-connector],[ck_connector_open_session]) + + # Checks for header files. + AC_PATH_X +-- +1.7.3.4 + diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-fix-event-check-bug.patch b/lxde-base/lxdm/files/lxdm-0.4.1-fix-event-check-bug.patch new file mode 100644 index 00000000..f0ca23be --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-fix-event-check-bug.patch @@ -0,0 +1,25 @@ +From d4e41ecb36a1ea29482b75674d804bb0f05540b2 Mon Sep 17 00:00:00 2001 +From: dgod <dgod.osa@gmail.com> +Date: Sun, 25 Dec 2011 15:23:19 +0800 +Subject: [PATCH] fix event check bug caused cpu 100% + +--- + src/lxcom.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +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) +-- +1.7.4.1 + diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch b/lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch new file mode 100644 index 00000000..103268ef --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch @@ -0,0 +1,16 @@ +--- lxdm-0.4.1.orig/src/lxdm.c ++++ lxdm-0.4.1/src/lxdm.c +@@ -1458,8 +1458,12 @@ void lxdm_do_login(struct passwd *pw, ch + setenv("XDG_SESSION_COOKIE", ck_connector_get_cookie(s->ckc), 1); + } + #endif ++ int i; ++ for(i=2;i<256;i++) ++ g_source_remove(i); ++ + char** env, *path; +- int n_env,i; ++ int n_env; + n_env = g_strv_length(environ); + /* copy all environment variables and override some of them */ + env = g_new(char*, n_env + 1 + 13); diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-fix-session-args.patch b/lxde-base/lxdm/files/lxdm-0.4.1-fix-session-args.patch new file mode 100644 index 00000000..11bacdbb --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-fix-session-args.patch @@ -0,0 +1,29 @@ +diff -Nurp data//Xsession data.new//Xsession +--- data//Xsession 2011-07-29 15:42:33.000000000 +0200 ++++ data.new//Xsession 2012-01-04 15:49:39.009452532 +0100 +@@ -20,7 +20,7 @@ if [ -f /etc/X11/xinit/xinitrc-common ]; + elif [ -x /usr/bin/ck-launch-session -a -z "$CK_XINIT_SESSION" ]; then + CK_XINIT_SESSION="/usr/bin/ck-launch-session" + fi +- exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\"" ++ exec -l "$SHELL" -c "$CK_XINIT_SESSION $LXSESSION" + elif [ -x /etc/X11/xinit/Xsession ]; then + # fedora + exec /etc/X11/xinit/Xsession "$LXSESSION" +@@ -30,7 +30,7 @@ elif [ -x /etc/X11/Xsession ]; then + elif [ -x /etc/X11/xinit/xinitrc ]; then + #suse + export WINDOWMANAGER=$LXSESSION +- exec -l $SHELL -c /etc/X11/xinit/xinitrc ++ exec -l "$SHELL" -c /etc/X11/xinit/xinitrc + else + # unknown, user should custom /etc/lxdm/xinitrc self + if [ -x /etc/lxdm/xinitrc ]; then +@@ -41,6 +41,6 @@ else + elif [ -x /usr/bin/ck-launch-session ]; then + CK_XINIT_SESSION="/usr/bin/ck-launch-session" + fi +- exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\"" ++ exec -l "$SHELL" -c "$CK_XINIT_SESSION $LXSESSION" + fi + diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch b/lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch new file mode 100644 index 00000000..7abdbd47 --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch @@ -0,0 +1,51 @@ +From 19f82a206b2cec964cea0475395d63dedf183788 Mon Sep 17 00:00:00 2001 +From: Andrea Florio <andrea@opensuse.org> +Date: Fri, 29 Jul 2011 23:59:32 +0200 +Subject: [PATCH] fix null pointer dereference + +--- + src/config.c | 25 ++++++++++--------------- + 1 files changed, 10 insertions(+), 15 deletions(-) + +diff --git a/src/config.c b/src/config.c +index 3f92f7b..4603ab4 100644 +--- a/src/config.c ++++ b/src/config.c +@@ -125,24 +125,19 @@ static gboolean image_file_valid(const char *filename) + static void update_face_image(GtkWidget *w) + { + GdkPixbuf *pixbuf; +- char *path; +- path=g_build_filename(user->pw_dir,".face",NULL); +- if(access(path,R_OK)) +- { +- g_free(path); +- if(ui_nobody) +- pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL); +- if(!pixbuf) +- pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), ++ char *path=g_build_filename(user->pw_dir,".face",NULL); ++ pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL); ++ g_free(path); ++ if(!pixbuf && ui_nobody) ++ pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL); ++ if(!pixbuf) ++ pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), + "avatar-default", 48,GTK_ICON_LOOKUP_FORCE_SIZE,NULL); +- } +- else ++ if(pixbuf) + { +- pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL); +- g_free(path); ++ gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf); ++ g_object_unref(pixbuf); + } +- gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf); +- g_object_unref(pixbuf); + } + + static void set_face_file(const char *filename) +-- +1.7.0.1 + diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch b/lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch new file mode 100644 index 00000000..a59273cc --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch @@ -0,0 +1,29 @@ +From 0f9e8e53a8d30f5c8ccfb03edc282148f58bfd30 Mon Sep 17 00:00:00 2001 +From: dgod <dgod.osa@gmail.com> +Date: Sun, 1 Jan 2012 17:05:22 +0800 +Subject: [PATCH] fix bug introduced from pam detect + +--- + src/lxdm.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/src/lxdm.c b/src/lxdm.c +index b5a90be..07be1e0 100644 +--- a/src/lxdm.c ++++ b/src/lxdm.c +@@ -25,8 +25,12 @@ + #include <config.h> + #endif + #ifndef HAVE_LIBPAM ++#ifdef USE_PAM ++#define HAVE_LIBPAM 1 ++#else + #define HAVE_LIBPAM 0 + #endif ++#endif + + #include <stdio.h> + #include <stdlib.h> +-- +1.7.4.1 + diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch b/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch new file mode 100644 index 00000000..021f3212 --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch @@ -0,0 +1,38 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -28,8 +28,6 @@ if test "x$USE_PAM" != "xno" ; then + fi]) + fi + +-AC_CHECK_LIB([ck-connector],[ck_connector_open_session]) +- + # Checks for header files. + AC_PATH_X + AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h]) +@@ -89,11 +87,21 @@ PKG_CHECK_MODULES(GTK, [$pkg_modules]) + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + +-PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[ +- AC_SUBST(CONSOLEKIT_CFLAGS) +- AC_SUBST(CONSOLEKIT_LIBS)],[ +- echo "ConsoleKit devel package not found" +- ]) ++AC_ARG_ENABLE(consolekit, ++AC_HELP_STRING([--enable-consolekit], [enable ConsoleKit support]), ++[case "${enableval}" in ++ yes) enable_ck=yes ;; ++ no) enable_ck=no ;; ++ *) AC_MSG_ERROR([bad value "${enableval}" for --enable-consolekit, use "yes" (default) or "no".]) ;; ++esac],[]) ++if test "x$enable_ck" = "xyes" ; then ++ AC_CHECK_LIB([ck-connector],[ck_connector_open_session]) ++ PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[ ++ AC_SUBST(CONSOLEKIT_CFLAGS) ++ AC_SUBST(CONSOLEKIT_LIBS)],[ ++ echo "ConsoleKit devel package not found" ++ ]) ++fi + + AC_ARG_ENABLE(password, + AC_HELP_STRING([--enable-password],[enable to load autologin password store at config file]), diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-pam-use-system-local-login.patch b/lxde-base/lxdm/files/lxdm-0.4.1-pam-use-system-local-login.patch new file mode 100644 index 00000000..9f723a2f --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-pam-use-system-local-login.patch @@ -0,0 +1,15 @@ +--- lxdm-0.4.1.orig/pam/lxdm ++++ lxdm-0.4.1/pam/lxdm +@@ -1,9 +1,9 @@ + #%PAM-1.0 +-auth substack system-auth ++auth substack system-local-login + auth optional pam_gnome_keyring.so +-account include system-auth ++account include system-local-login + session optional pam_keyinit.so force revoke +-session include system-auth ++session include system-local-login + session required pam_loginuid.so + #session optional pam_console.so + session optional pam_gnome_keyring.so auto_start diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-pam_console-disable.patch b/lxde-base/lxdm/files/lxdm-0.4.1-pam_console-disable.patch new file mode 100644 index 00000000..628e9a51 --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-pam_console-disable.patch @@ -0,0 +1,9 @@ +--- lxdm-0.4.0.orig/pam/lxdm ++++ lxdm-0.4.0/pam/lxdm +@@ -5,5 +5,5 @@ account include system-auth + session optional pam_keyinit.so force revoke + session include system-auth + session required pam_loginuid.so +-session optional pam_console.so ++#session optional pam_console.so + session optional pam_gnome_keyring.so auto_start diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-rogentos-1-theme.patch b/lxde-base/lxdm/files/lxdm-0.4.1-rogentos-1-theme.patch new file mode 100644 index 00000000..1a7f84a7 --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-rogentos-1-theme.patch @@ -0,0 +1,32 @@ +--- orig/data/lxdm.conf.in 2013-07-01 01:20:22.289454072 +0300 ++++ data/lxdm.conf.in 2013-07-01 01:19:34.353452789 +0300 +@@ -1,6 +1,6 @@ + [base] + ## uncomment and set autologin username to enable autologin +-# autologin=dgod ++# autologin=rogentosuser + + ## uncomment and set timeout to enable timeout autologin, + ## the value should >=5 +@@ -24,10 +24,10 @@ + + [display] + ## gtk theme used by greeter +-gtk_theme=Clearlooks ++gtk_theme=Kogaion-light + + ## background of the greeter +-bg=/usr/share/backgrounds/default.png ++bg=/usr/share/lxdm/themes/Kogaion/kogaion.png + + ## if show bottom pane + bottom_pane=1 +@@ -39,7 +39,7 @@ + keyboard=0 + + ## the theme of greeter +-theme=Industrial ++theme=Kogaion + + [input] + diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-rogentos-conf.patch b/lxde-base/lxdm/files/lxdm-0.4.1-rogentos-conf.patch new file mode 100644 index 00000000..bfa28b6c --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-rogentos-conf.patch @@ -0,0 +1,11 @@ +--- orig/data/lxdm.conf 2013-07-01 01:27:22.793465333 +0300 ++++ data/lxdm.conf 2013-07-01 01:27:34.691465652 +0300 +@@ -24,7 +24,7 @@ + + [display] + ## gtk theme used by greeter +-gtk_theme=Clearlooks ++gtk_theme=Kogaion-light + + ## background of the greeter + bg=/usr/share/backgrounds/default.png diff --git a/lxde-base/lxdm/files/lxdm.service b/lxde-base/lxdm/files/lxdm.service new file mode 100644 index 00000000..298914b5 --- /dev/null +++ b/lxde-base/lxdm/files/lxdm.service @@ -0,0 +1,11 @@ +[Unit] +Description=LXDM (Lightweight X11 Display Manager) +After=systemd-user-sessions.service + +[Service] +ExecStart=/usr/sbin/lxdm +Restart=always + +[Install] +Alias=display-manager.service +WantedBy=graphical.target diff --git a/lxde-base/lxdm/files/xinitrc b/lxde-base/lxdm/files/xinitrc new file mode 100644 index 00000000..013b8164 --- /dev/null +++ b/lxde-base/lxdm/files/xinitrc @@ -0,0 +1,52 @@ +# Source for this script borrowed from portions of kdm's Xsession. + +case $SHELL in + */bash) + [ -z "$BASH" ] && exec $SHELL $0 "$@" + set +o posix + [ -f /etc/profile ] && . /etc/profile + if [ -f $HOME/.bash_profile ]; then + . $HOME/.bash_profile + elif [ -f $HOME/.bash_login ]; then + . $HOME/.bash_login + elif [ -f $HOME/.profile ]; then + . $HOME/.profile + fi + ;; + */zsh) + [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@" + emulate -R zsh + [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc + zhome=${ZDOTDIR:-$HOME} + # zshenv is always sourced automatically. + [ -f $zdir/zprofile ] && . $zdir/zprofile + [ -f $zhome/.zprofile ] && . $zhome/.zprofile + [ -f $zdir/zlogin ] && . $zdir/zlogin + [ -f $zhome/.zlogin ] && . $zhome/.zlogin + ;; + */csh|*/tcsh) + # [t]cshrc is always sourced automatically. + # Note that sourcing csh.login after .cshrc is non-standard. + xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX` + $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c export -p >! $xsess_tmp" + . $xsess_tmp + rm -f $xsess_tmp + ;; + *) # Plain sh, ksh, and anything we do not know. + [ -f /etc/profile ] && . /etc/profile + [ -f $HOME/.profile ] && . $HOME/.profile + ;; +esac + +[ -f /etc/xprofile ] && . /etc/xprofile +[ -f $HOME/.xprofile ] && . $HOME/.xprofile + +# run all system xinitrc shell scripts. +if [ -d /etc/X11/xinit/xinitrc.d ]; then + for i in /etc/X11/xinit/xinitrc.d/* ; do + if [ -x "$i" ]; then + . "$i" + fi + done +fi + |