wok rev 25366

slim and slim-pam: modified slim.conf
author Hans-G?nter Theisgen
date Fri Jul 29 07:52:52 2022 +0100 (4 months ago)
parents 9753324921b9
children 5c0ba7968d4c
files slim-pam/receipt slim/receipt slim/stuff/patches/slim.conf-1.3.6
line diff
     1.1 --- a/slim-pam/receipt	Thu Jul 28 15:03:09 2022 +0000
     1.2 +++ b/slim-pam/receipt	Fri Jul 29 07:52:52 2022 +0100
     1.3 @@ -6,12 +6,12 @@
     1.4  SHORT_DESC="Desktop-independent graphical login manager for X11 (PAM enabled)."
     1.5  MAINTAINER="pascal.bellard@slitaz.org"
     1.6  LICENSE="GPL2"
     1.7 -WEB_SITE="https://sourceforge.net/projects/slim.berlios/"
     1.8 +WEB_SITE="https://www.berlios.de/software/slim/"
     1.9  REPOLOGY="slim-login-manager"
    1.10  
    1.11  SOURCE="slim"
    1.12  TARBALL="$SOURCE-$VERSION.tar.gz"
    1.13 -WGET_URL="https://downloads.sourceforge.net/project/slim.berlios/$TARBALL"
    1.14 +WGET_URL="https://github.com/iwamatsu/$SOURCE/archive/refs/tags/v$VERSION.tar.gz"
    1.15  
    1.16  PROVIDE="slim:pam"
    1.17  RELATED="slim slim-theme-default"
    1.18 @@ -56,7 +56,7 @@
    1.19  	cp -a $install/usr/lib		$fs/usr
    1.20  	cp -a $WOK/$SOURCE/stuff/themes	$fs/usr/share/slim
    1.21  
    1.22 -	# Configuration file and rc script.
    1.23 +	# rc script.
    1.24  	cp -a $WOK/$SOURCE/stuff/etc	$fs
    1.25  	chown -R root.root		$fs
    1.26  
    1.27 @@ -66,6 +66,7 @@
    1.28  
    1.29  post_install()
    1.30  {
    1.31 +	# replace default user tux by user with userid 1000 in slim.conf
    1.32  	local USER
    1.33  	USER=$(awk -F: '/:1000:1000:/ { print $1 }' < "$1/etc/passwd")
    1.34  	[ -n "$USER" ] &&
    1.35 @@ -74,7 +75,7 @@
    1.36  	# In order to update the SLiM, we need to restart it.
    1.37  	# We can't just "/etc/init.d/slim restart" because it momentarily interrupts
    1.38  	# X session and the user will get a terrible console with strange letters.
    1.39 -	printf '%40s\n' | tr ' ' '='
    1.40 +	printf '\n%40s\n' | tr ' ' '='
    1.41  	echo "In order to update the SLiM,"
    1.42  	echo "please, reboot your system!"
    1.43  }
    1.44 @@ -86,5 +87,5 @@
    1.45  
    1.46  testsuite()
    1.47  {
    1.48 -	ldd $install/usr/bin/slim
    1.49 +	readelf -h	$install/usr/bin/slim
    1.50  }
     2.1 --- a/slim/receipt	Thu Jul 28 15:03:09 2022 +0000
     2.2 +++ b/slim/receipt	Fri Jul 29 07:52:52 2022 +0100
     2.3 @@ -6,11 +6,11 @@
     2.4  SHORT_DESC="Desktop-independent graphical login manager for X11."
     2.5  MAINTAINER="pankso@slitaz.org"
     2.6  LICENSE="GPL2"
     2.7 -WEB_SITE="http://slim.berlios.de/"
     2.8 +WEB_SITE="https://www.berlios.de/software/slim/"
     2.9  REPOLOGY="slim-login-manager"
    2.10  
    2.11  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.12 -WGET_URL="https://downloads.sourceforge.net/project/slim.berlios/$TARBALL"
    2.13 +WGET_URL="https://github.com/iwamatsu/$PACKAGE/archive/refs/tags/v$VERSION.tar.gz"
    2.14  
    2.15  RELATED="slim-pam slim-theme-default"
    2.16  SUGGESTED="slim-theme-default slitaz-configs"
    2.17 @@ -70,14 +70,14 @@
    2.18  {
    2.19  	mkdir -p $fs/usr/share/slim
    2.20  
    2.21 -	cp -a $install/etc	$fs
    2.22 -	cp -a $install/usr/bin	$fs/usr
    2.23 -	cp -a $install/usr/lib	$fs/usr
    2.24 -	cp -a $stuff/themes	$fs/usr/share/slim
    2.25 +	cp -a $install/etc		$fs
    2.26 +	cp -a $install/usr/bin		$fs/usr
    2.27 +	cp -a $install/usr/lib		$fs/usr
    2.28 +	cp -a $stuff/themes		$fs/usr/share/slim
    2.29  
    2.30 -	# Configuration file and rc script.
    2.31 -	cp -a $stuff/etc	$fs
    2.32 -	chown -R root.root	$fs
    2.33 +	# rc script.
    2.34 +	cp -a $stuff/etc		$fs
    2.35 +	chown -R root.root		$fs
    2.36  
    2.37  	# slim-theme manager and default strings
    2.38  	install -m755 $stuff/slim-theme	$fs/usr/bin/slim-theme
    2.39 @@ -86,6 +86,7 @@
    2.40  
    2.41  post_install()
    2.42  {
    2.43 +	# replace default user tux by user with userid 1000 in slim.conf
    2.44  	local USER
    2.45  	USER=$(awk -F: '/:1000:1000:/ { print $1 }' < "$1/etc/passwd")
    2.46  	[ -n "$USER" ] &&
    2.47 @@ -95,5 +96,5 @@
    2.48  
    2.49  testsuite()
    2.50  {
    2.51 -	ldd $install/usr/bin/slim
    2.52 +	readelf -h	$install/usr/bin/slim
    2.53  }
     3.1 --- a/slim/stuff/patches/slim.conf-1.3.6	Thu Jul 28 15:03:09 2022 +0000
     3.2 +++ b/slim/stuff/patches/slim.conf-1.3.6	Fri Jul 29 07:52:52 2022 +0100
     3.3 @@ -8,7 +8,7 @@
     3.4   # Note: -xauth $authfile is automatically appended
     3.5  -default_path        /bin:/usr/bin:/usr/local/bin
     3.6  -default_xserver     /usr/bin/X
     3.7 -+default_path        ./:/bin:/usr/bin:/usr/local/bin
     3.8 ++default_path        ./:/bin:/usr/bin
     3.9  +default_xserver     /usr/bin/Xorg
    3.10   #xserver_arguments   -dpi 75
    3.11   
    3.12 @@ -31,33 +31,44 @@
    3.13   
    3.14   # This command is executed after a succesful login.
    3.15   # you can place the %session and %theme variables
    3.16 -@@ -33,7 +36,7 @@
    3.17 +@@ -33,7 +36,8 @@
    3.18   # to adjust the command according to your preferred shell,
    3.19   # i.e. for freebsd use:
    3.20   # login_cmd           exec /bin/sh - ~/.xinitrc %session
    3.21  -login_cmd           exec /bin/bash -login ~/.xinitrc %session
    3.22 ++# login_cmd           exec /bin/bash -login ~/.xinitrc %session
    3.23  +login_cmd           exec /bin/sh -l ~/.xinitrc %session
    3.24   
    3.25   # Commands executed when starting and exiting a session.
    3.26   # They can be used for registering a X11 session with
    3.27 -@@ -51,10 +54,10 @@
    3.28 +@@ -47,14 +51,16 @@
    3.29 + # options "-d" and "-nodaemon"
    3.30 + # daemon	yes
    3.31 + 
    3.32 +-# Available sessions (first one is the default).
    3.33 ++# Available sessions are looked for in sessiondir.
    3.34 ++# Uncomment to enable choosing by pressing F1.
    3.35   # The current chosen session name is replaced in the login_cmd
    3.36   # above, so your login command can handle different sessions.
    3.37 - # see the xinitrc.sample file shipped with slim sources
    3.38 +-# see the xinitrc.sample file shipped with slim sources
    3.39  -sessions            xfce4,icewm-session,wmaker,blackbox
    3.40 -+sessions            openbox,e17,jwm
    3.41 ++# See the xinitrc.sample file shipped with slim sources.
    3.42 ++#sessiondir          /usr/share/xsessions
    3.43   
    3.44   # Executed when pressing F11 (requires imagemagick)
    3.45  -screenshot_cmd      import -window root /slim.png
    3.46 ++#screenshot_cmd      import -window root /slim.png
    3.47  +#screenshot_cmd      mtpaint -s /root/slim-shot.png
    3.48   
    3.49   # welcome message. Available variables: %host, %domain
    3.50   welcome_msg         Welcome to %host
    3.51 -@@ -63,12 +66,12 @@
    3.52 +@@ -62,13 +68,13 @@
    3.53 + # Session message. Prepended to the session name when pressing F1
    3.54   # session_msg         Session: 
    3.55   
    3.56 - # shutdown / reboot messages
    3.57 +-# shutdown / reboot messages
    3.58  -shutdown_msg       The system is halting...
    3.59 ++# shutdown and reboot messages
    3.60  +shutdown_msg       The system is going down...
    3.61   reboot_msg         The system is rebooting...
    3.62   
    3.63 @@ -68,7 +79,7 @@
    3.64   
    3.65   # Focus the password field on start when default_user is set
    3.66   # Set to "yes" to enable this feature
    3.67 -@@ -81,11 +84,10 @@
    3.68 +@@ -81,11 +87,10 @@
    3.69   
    3.70   # current theme, use comma separated list to specify a set to 
    3.71   # randomly choose from