# HG changeset patch # User Hans-G?nter Theisgen # Date 1659077572 -3600 # Node ID ca6fa52862c95af900e31fa374ea40aa600d7d3f # Parent 9753324921b930fe3cbc5768c1c830d7ee5b7cc3 slim and slim-pam: modified slim.conf diff -r 9753324921b9 -r ca6fa52862c9 slim-pam/receipt --- a/slim-pam/receipt Thu Jul 28 15:03:09 2022 +0000 +++ b/slim-pam/receipt Fri Jul 29 07:52:52 2022 +0100 @@ -6,12 +6,12 @@ SHORT_DESC="Desktop-independent graphical login manager for X11 (PAM enabled)." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" -WEB_SITE="https://sourceforge.net/projects/slim.berlios/" +WEB_SITE="https://www.berlios.de/software/slim/" REPOLOGY="slim-login-manager" SOURCE="slim" TARBALL="$SOURCE-$VERSION.tar.gz" -WGET_URL="https://downloads.sourceforge.net/project/slim.berlios/$TARBALL" +WGET_URL="https://github.com/iwamatsu/$SOURCE/archive/refs/tags/v$VERSION.tar.gz" PROVIDE="slim:pam" RELATED="slim slim-theme-default" @@ -56,7 +56,7 @@ cp -a $install/usr/lib $fs/usr cp -a $WOK/$SOURCE/stuff/themes $fs/usr/share/slim - # Configuration file and rc script. + # rc script. cp -a $WOK/$SOURCE/stuff/etc $fs chown -R root.root $fs @@ -66,6 +66,7 @@ post_install() { + # replace default user tux by user with userid 1000 in slim.conf local USER USER=$(awk -F: '/:1000:1000:/ { print $1 }' < "$1/etc/passwd") [ -n "$USER" ] && @@ -74,7 +75,7 @@ # In order to update the SLiM, we need to restart it. # We can't just "/etc/init.d/slim restart" because it momentarily interrupts # X session and the user will get a terrible console with strange letters. - printf '%40s\n' | tr ' ' '=' + printf '\n%40s\n' | tr ' ' '=' echo "In order to update the SLiM," echo "please, reboot your system!" } @@ -86,5 +87,5 @@ testsuite() { - ldd $install/usr/bin/slim + readelf -h $install/usr/bin/slim } diff -r 9753324921b9 -r ca6fa52862c9 slim/receipt --- a/slim/receipt Thu Jul 28 15:03:09 2022 +0000 +++ b/slim/receipt Fri Jul 29 07:52:52 2022 +0100 @@ -6,11 +6,11 @@ SHORT_DESC="Desktop-independent graphical login manager for X11." MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" -WEB_SITE="http://slim.berlios.de/" +WEB_SITE="https://www.berlios.de/software/slim/" REPOLOGY="slim-login-manager" TARBALL="$PACKAGE-$VERSION.tar.gz" -WGET_URL="https://downloads.sourceforge.net/project/slim.berlios/$TARBALL" +WGET_URL="https://github.com/iwamatsu/$PACKAGE/archive/refs/tags/v$VERSION.tar.gz" RELATED="slim-pam slim-theme-default" SUGGESTED="slim-theme-default slitaz-configs" @@ -70,14 +70,14 @@ { mkdir -p $fs/usr/share/slim - cp -a $install/etc $fs - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib $fs/usr - cp -a $stuff/themes $fs/usr/share/slim + cp -a $install/etc $fs + cp -a $install/usr/bin $fs/usr + cp -a $install/usr/lib $fs/usr + cp -a $stuff/themes $fs/usr/share/slim - # Configuration file and rc script. - cp -a $stuff/etc $fs - chown -R root.root $fs + # rc script. + cp -a $stuff/etc $fs + chown -R root.root $fs # slim-theme manager and default strings install -m755 $stuff/slim-theme $fs/usr/bin/slim-theme @@ -86,6 +86,7 @@ post_install() { + # replace default user tux by user with userid 1000 in slim.conf local USER USER=$(awk -F: '/:1000:1000:/ { print $1 }' < "$1/etc/passwd") [ -n "$USER" ] && @@ -95,5 +96,5 @@ testsuite() { - ldd $install/usr/bin/slim + readelf -h $install/usr/bin/slim } diff -r 9753324921b9 -r ca6fa52862c9 slim/stuff/patches/slim.conf-1.3.6 --- a/slim/stuff/patches/slim.conf-1.3.6 Thu Jul 28 15:03:09 2022 +0000 +++ b/slim/stuff/patches/slim.conf-1.3.6 Fri Jul 29 07:52:52 2022 +0100 @@ -8,7 +8,7 @@ # Note: -xauth $authfile is automatically appended -default_path /bin:/usr/bin:/usr/local/bin -default_xserver /usr/bin/X -+default_path ./:/bin:/usr/bin:/usr/local/bin ++default_path ./:/bin:/usr/bin +default_xserver /usr/bin/Xorg #xserver_arguments -dpi 75 @@ -31,33 +31,44 @@ # This command is executed after a succesful login. # you can place the %session and %theme variables -@@ -33,7 +36,7 @@ +@@ -33,7 +36,8 @@ # to adjust the command according to your preferred shell, # i.e. for freebsd use: # login_cmd exec /bin/sh - ~/.xinitrc %session -login_cmd exec /bin/bash -login ~/.xinitrc %session ++# login_cmd exec /bin/bash -login ~/.xinitrc %session +login_cmd exec /bin/sh -l ~/.xinitrc %session # Commands executed when starting and exiting a session. # They can be used for registering a X11 session with -@@ -51,10 +54,10 @@ +@@ -47,14 +51,16 @@ + # options "-d" and "-nodaemon" + # daemon yes + +-# Available sessions (first one is the default). ++# Available sessions are looked for in sessiondir. ++# Uncomment to enable choosing by pressing F1. # The current chosen session name is replaced in the login_cmd # above, so your login command can handle different sessions. - # see the xinitrc.sample file shipped with slim sources +-# see the xinitrc.sample file shipped with slim sources -sessions xfce4,icewm-session,wmaker,blackbox -+sessions openbox,e17,jwm ++# See the xinitrc.sample file shipped with slim sources. ++#sessiondir /usr/share/xsessions # Executed when pressing F11 (requires imagemagick) -screenshot_cmd import -window root /slim.png ++#screenshot_cmd import -window root /slim.png +#screenshot_cmd mtpaint -s /root/slim-shot.png # welcome message. Available variables: %host, %domain welcome_msg Welcome to %host -@@ -63,12 +66,12 @@ +@@ -62,13 +68,13 @@ + # Session message. Prepended to the session name when pressing F1 # session_msg Session: - # shutdown / reboot messages +-# shutdown / reboot messages -shutdown_msg The system is halting... ++# shutdown and reboot messages +shutdown_msg The system is going down... reboot_msg The system is rebooting... @@ -68,7 +79,7 @@ # Focus the password field on start when default_user is set # Set to "yes" to enable this feature -@@ -81,11 +84,10 @@ +@@ -81,11 +87,10 @@ # current theme, use comma separated list to specify a set to # randomly choose from