diff options
| -rw-r--r-- | system/lxdm/lxdm.SlackBuild | 28 | ||||
| -rw-r--r-- | system/lxdm/lxdm.info | 6 | ||||
| -rw-r--r-- | system/lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff | 8 | ||||
| -rw-r--r-- | system/lxdm/patches/remove_suse_from_Xsession.diff | 10 | ||||
| -rw-r--r-- | system/lxdm/patches/source_profile_in_Xsession.diff | 25 |
5 files changed, 31 insertions, 46 deletions
diff --git a/system/lxdm/lxdm.SlackBuild b/system/lxdm/lxdm.SlackBuild index 5df8f91c19..ef3b1f6e24 100644 --- a/system/lxdm/lxdm.SlackBuild +++ b/system/lxdm/lxdm.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lxdm -VERSION=${VERSION:-20120728_102ea5e} +VERSION=${VERSION:-20140103_b8b08e5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -64,14 +64,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# patch lxdm.conf.in to avoid a wrong libexec path - must go deep on -# why the build system gets it wrong -sed -i "s/@FULL_LIBEXECDIR@/\/usr\/libexec/" data/lxdm.conf.in + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Patch the Xsession file to source /etc/profile and xprofile on session start patch -p1 < $CWD/patches/source_profile_in_Xsession.diff @@ -81,9 +77,6 @@ patch -p1 < $CWD/patches/source_profile_in_Xsession.diff # pointing to, regardless of what the user wants... patch -p1 < $CWD/patches/remove_suse_from_Xsession.diff -# No PAM here -patch -p1 < $CWD/patches/lxdm-0.3.0-without_pam.diff - # Set DESKTOP_SESSION in the environment when starting a session # I'd normally say this is a bad idea, since upstream disagrees with it # (they say that this should not be populated except when PAM is used), @@ -112,24 +105,21 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -# We said --without-pam -rm -rf $PKG/etc/pam.d - # change default non-existent background image to a newly added one sed -i -e "s|^bg=.*|bg=/usr/share/wallpapers/stripes-lxdm.jpg|" \ $PKG/etc/lxdm/lxdm.conf install -m 0644 -D $CWD/stripes-lxdm.jpg $PKG/usr/share/wallpapers/stripes-lxdm.jpg # Install a to-be-customized-if-needed /etc/lxdm/xinitrc -cat $CWD/xinitrc > $PKG/etc/lxdm/xinitrc.new +install -m 0755 -D $CWD/xinitrc $PKG/etc/lxdm/xinitrc # Don't clobber configs on upgrade # But *do* clobber Xsession -for file in LoginReady PostLogin PostLogout PreLogin PreReboot PreShutdown lxdm.conf ; - do mv $PKG/etc/lxdm/$file $PKG/etc/lxdm/$file.new ; +for file in LoginReady PostLogin PostLogout PreLogin PreReboot PreShutdown lxdm.conf xinitrc ; do + mv $PKG/etc/lxdm/$file $PKG/etc/lxdm/$file.new ; done -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/system/lxdm/lxdm.info b/system/lxdm/lxdm.info index 50614b0a83..ea7cd1baae 100644 --- a/system/lxdm/lxdm.info +++ b/system/lxdm/lxdm.info @@ -1,8 +1,8 @@ PRGNAM="lxdm" -VERSION="20120728_102ea5e" +VERSION="20140103_b8b08e5" HOMEPAGE="http://lxde.org/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxdm-20120728_102ea5e.tar.xz" -MD5SUM="b81aced3c6892896030dae117b89952b" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxdm-20140103_b8b08e5.tar.xz" +MD5SUM="d02de3a54f518b3dcfe8979b042e5537" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff b/system/lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff index 6563354a68..e19acd3579 100644 --- a/system/lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff +++ b/system/lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff @@ -1,7 +1,7 @@ -diff -Naur lxdm-20120419_2ce143c.orig/src/lxdm.c lxdm-20120419_2ce143c/src/lxdm.c ---- lxdm-20120419_2ce143c.orig/src/lxdm.c 2012-04-19 16:31:16.000000000 +0200 -+++ lxdm-20120419_2ce143c/src/lxdm.c 2012-04-28 18:17:25.186023147 +0200 -@@ -1490,6 +1490,10 @@ +diff -Naur lxdm-20131220_68eacbd.orig/src/lxdm.c lxdm-20131220_68eacbd/src/lxdm.c +--- lxdm-20131220_68eacbd.orig/src/lxdm.c 2013-12-20 02:30:50.000000000 +0100 ++++ lxdm-20131220_68eacbd/src/lxdm.c 2013-12-30 17:59:04.445723000 +0100 +@@ -1296,6 +1296,10 @@ NULL)) { setenv("XDG_SESSION_COOKIE", ck_connector_get_cookie(s->ckc), 1); diff --git a/system/lxdm/patches/remove_suse_from_Xsession.diff b/system/lxdm/patches/remove_suse_from_Xsession.diff index 475c5c75a9..8e25dbc17b 100644 --- a/system/lxdm/patches/remove_suse_from_Xsession.diff +++ b/system/lxdm/patches/remove_suse_from_Xsession.diff @@ -1,14 +1,14 @@ -diff -Naur lxdm-0.4.0.orig/data/Xsession lxdm-0.4.0/data/Xsession ---- lxdm-0.4.0.orig/data/Xsession 2011-03-17 16:35:47.000000000 +0100 -+++ lxdm-0.4.0/data/Xsession 2011-07-22 17:23:49.000000000 +0200 -@@ -27,10 +27,6 @@ +diff -Naur lxdm-20131220_68eacbd.orig/data/Xsession lxdm-20131220_68eacbd/data/Xsession +--- lxdm-20131220_68eacbd.orig/data/Xsession 2013-12-20 02:30:50.000000000 +0100 ++++ lxdm-20131220_68eacbd/data/Xsession 2013-12-30 17:51:29.545723000 +0100 +@@ -22,10 +22,6 @@ elif [ -x /etc/X11/Xsession ]; then # mandriva, debian, ubuntu exec /etc/X11/Xsession "$LXSESSION" -elif [ -x /etc/X11/xinit/xinitrc ]; then -#suse - export WINDOWMANAGER=$LXSESSION -- exec -l $SHELL -c /etc/X11/xinit/xinitrc +- exec -l bash -c /etc/X11/xinit/xinitrc else # unknown, user should custom /etc/lxdm/xinitrc self if [ -x /etc/lxdm/xinitrc ]; then diff --git a/system/lxdm/patches/source_profile_in_Xsession.diff b/system/lxdm/patches/source_profile_in_Xsession.diff index 8f19e31284..8d04af8f7c 100644 --- a/system/lxdm/patches/source_profile_in_Xsession.diff +++ b/system/lxdm/patches/source_profile_in_Xsession.diff @@ -1,17 +1,12 @@ -diff -Nur lxdm-0.2.0.orig//data/Xsession lxdm-0.2.0/data/Xsession ---- lxdm-0.2.0.orig//data/Xsession 2010-04-12 11:49:44.000000000 -0500 -+++ lxdm-0.2.0/data/Xsession 2010-06-26 04:55:43.301983179 -0500 -@@ -2,6 +2,13 @@ +diff -Naur lxdm-20131220_68eacbd.orig/data/Xsession lxdm-20131220_68eacbd/data/Xsession +--- lxdm-20131220_68eacbd.orig/data/Xsession 2013-12-20 02:30:50.000000000 +0100 ++++ lxdm-20131220_68eacbd/data/Xsession 2013-12-30 17:48:52.110723000 +0100 +@@ -9,6 +9,8 @@ + LXSESSION=/usr/bin/startlxde + fi - # use bash for "exec -l", howto run login shell by /bin/sh ? ++[ -f /etc/profile ] && . /etc/profile ++[ -f ~/.profile ] && . ~/.profile + [ -f /etc/xprofile ] && . /etc/xprofile + [ -f ~/.xprofile ] && . ~/.xprofile -+# First read /etc/profile and .profile -+test -f /etc/profile && . /etc/profile -+test -f "$HOME/.profile" && . "$HOME/.profile" -+# Second read /etc/xprofile and .xprofile for X specific setup -+test -f /etc/xprofile && . /etc/xprofile -+test -f "$HOME/.xprofile" && . "$HOME/.xprofile" -+ - if [ $# -eq 1 -a -n "$1" ]; then - LXSESSION=$1 - else |