system/lxdm: Updated for version 20140103_b8b08e5.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

1 files changed, 9 insertions, 19 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