# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1658333050 -3600
# Node ID 9c874a5c3b174d44f65391bc22955c26a4648780
# Parent  cb5bc40867f1e92379b34f604adf6a0addb37735
updated slim, slim-pam and slim-theme-default (1.3.5 -> 1.3.6)

diff -r cb5bc40867f1 -r 9c874a5c3b17 slim-pam/receipt
--- a/slim-pam/receipt	Wed Jul 20 10:12:48 2022 +0000
+++ b/slim-pam/receipt	Wed Jul 20 17:04:10 2022 +0100
@@ -1,23 +1,26 @@
 # SliTaz package receipt.
 
 PACKAGE="slim-pam"
-VERSION="1.3.5"
+VERSION="1.3.6"
 CATEGORY="x-window"
 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/"
+REPOLOGY="slim-login-manager"
+
 SOURCE="slim"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WGET_URL="http://download.berlios.de/slim/$TARBALL"
-CONFIG_FILES="/etc/slim.conf"
+WGET_URL="https://downloads.sourceforge.net/project/slim.berlios/$TARBALL"
 
 PROVIDE="slim:pam"
+RELATED="slim slim-theme-default"
+SUGGESTED="slim-theme-default slitaz-configs"
 DEPENDS="gcc-lib-base libjpeg libpng pam xorg-libXft xorg-libXmu"
-SUGGESTED="slim-theme-default slitaz-configs"
-BUILD_DEPENDS="cmake freetype-dev jpeg-dev libpng-dev xorg-libXft-dev \
-xorg-libXmu-dev pam-dev"
-RELATED="slim slim-theme-default"
+BUILD_DEPENDS="cmake freetype-dev jpeg-dev libpng-dev pam-dev xorg-libXft-dev
+	xorg-libXmu-dev"
+
+CONFIG_FILES="/etc/slim.conf"
 
 # What is the latest version available today?
 current_version()
@@ -29,28 +32,33 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	patch -p1 < $WOK/$SOURCE/stuff/$SOURCE-$VERSION.patch || return 1
-	mkdir build; cd build
-	cmake \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DX11_Xmu_LIB=-lXmu \
-		-DUSE_PAM=yes \
-		.. &&
+	patch --input=$WOK/$SOURCE/stuff/patches/app.cpp-$VERSION || return 1
+	patch --input=$WOK/$SOURCE/stuff/patches/cfg.cpp-$VERSION || return 1
+	patch --input=$WOK/$SOURCE/stuff/patches/slim.conf-$VERSION || return 1
+
+	mkdir	_build &&
+	cd	_build &&
+	cmake	..					\
+		-D CMAKE_INSTALL_PREFIX=/usr		\
+		-D X11_Xmu_LIB=-lXmu			\
+		-D USE_PAM=yes &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make install DESTDIR=$DESTDIR
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share/slim
-	cp -a $install/etc $fs
-	cp -a $install/usr/bin $fs/usr
-	cp -a $WOK/$SOURCE/stuff/themes $fs/usr/share/slim
 
-	# Config file and rc script.
-	cp -a $WOK/$SOURCE/stuff/etc $fs
-	chown -R root.root $fs
+	cp -a $install/etc		$fs
+	cp -a $install/usr/bin		$fs/usr
+	cp -a $install/usr/lib		$fs/usr
+	cp -a $WOK/$SOURCE/stuff/themes	$fs/usr/share/slim
+
+	# Configuration file and rc script.
+	cp -a $WOK/$SOURCE/stuff/etc	$fs
+	chown -R root.root		$fs
 
 	# slim-theme manager
 	install -m755 $WOK/$SOURCE/stuff/slim-theme $fs/usr/bin/slim-theme
@@ -76,4 +84,7 @@
 	tazpkg get-install  ${PACKAGE%-pam}
 }
 
-testsuite() { ldd $install/usr/bin/slim; }
+testsuite()
+{
+	ldd $install/usr/bin/slim
+}
diff -r cb5bc40867f1 -r 9c874a5c3b17 slim-theme-default/receipt
--- a/slim-theme-default/receipt	Wed Jul 20 10:12:48 2022 +0000
+++ b/slim-theme-default/receipt	Wed Jul 20 17:04:10 2022 +0100
@@ -1,22 +1,22 @@
 # SliTaz package receipt.
 
 PACKAGE="slim-theme-default"
-VERSION="1.3.5"
+VERSION="1.3.6"
 CATEGORY="customization"
 SHORT_DESC="Default theme bundled with SLiM."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://sourceforge.net/projects/slim.berlios/"
 
+RELATED="slim slim-pam"
 DEPENDS="slim"
 WANTED="slim"
-RELATED="slim slim-pam"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share/slim
-	cp -a $install/usr/share/slim/themes $fs/usr/share/slim
+	cp -a $install/usr/share/slim/themes	$fs/usr/share/slim
 }
 
 post_install()
diff -r cb5bc40867f1 -r 9c874a5c3b17 slim/description.txt
--- a/slim/description.txt	Wed Jul 20 10:12:48 2022 +0000
+++ b/slim/description.txt	Wed Jul 20 17:04:10 2022 +0100
@@ -1,3 +1,5 @@
-SLiM aims to be light, simple and independent from the various desktop
-environments. Although completely configurable through themes and an option
-file. It is particularly suitable for machines that don't require remote logins.
+SLiM aims to be light, simple and independent from the various
+desktop environments.
+Also completely configurable through themes and an option file.
+It is particularly suitable for machines that don't require
+remote logins.
diff -r cb5bc40867f1 -r 9c874a5c3b17 slim/receipt
--- a/slim/receipt	Wed Jul 20 10:12:48 2022 +0000
+++ b/slim/receipt	Wed Jul 20 17:04:10 2022 +0100
@@ -1,32 +1,41 @@
 # SliTaz package receipt.
 
 PACKAGE="slim"
-VERSION="1.3.5"
+VERSION="1.3.6"
 CATEGORY="x-window"
-SHORT_DESC="Desktop-independent graphical login manager for X11"
+SHORT_DESC="Desktop-independent graphical login manager for X11."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="https://sourceforge.net/projects/slim.berlios/"
+WEB_SITE="http://slim.berlios.de/"
+REPOLOGY="slim-login-manager"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://download.berlios.de/slim/$TARBALL"
-CONFIG_FILES="/etc/slim.conf"
-HOST_ARCH="i486 arm"
-COOKOPTS="!pngquant op8"
+WGET_URL="https://downloads.sourceforge.net/project/slim.berlios/$TARBALL"
 
-RELATED="slim-pam slim-theme-default" # don't forget to upgrade them too
+RELATED="slim-pam slim-theme-default"
 SUGGESTED="slim-theme-default slitaz-configs"
 DEPENDS="gcc-lib-base libjpeg libpng xorg-libXft xorg-libXmu"
 BUILD_DEPENDS="freetype-dev jpeg-dev libpng-dev xorg-libXft-dev xorg-libXmu-dev"
 
+CONFIG_FILES="/etc/slim.conf"
+
+COOKOPTS="!pngquant op8"
+
+HOST_ARCH="i486 arm"
+
+# @maintainer:	Please update also slim-pam and slim-theme-default
+
 # Handle cross compilation
 case "$ARCH" in
-	i?86) 
+	(i?86) 
 		BUILD_DEPENDS="$BUILD_DEPENDS cmake" 
 		INCL=/usr/include
-		LIBS=/usr/lib ;;
-	arm*)
+		LIBS=/usr/lib
+		;;
+	(arm*)
 		INCL=/cross/$ARCH/sysroot/usr/include
-		LIBS=/cross/$ARCH/sysroot/usr/lib ;;
+		LIBS=/cross/$ARCH/sysroot/usr/lib
+		;;
 esac
 
 current_version()
@@ -38,33 +47,41 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	patch -p1 < $stuff/$PACKAGE-$VERSION.patch || return 1
-	mkdir build; cd build
-	cmake \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DX11_Xmu_LIB="$LIBS/libXmu.so" \
-		-DX11_Xft_INCLUDE_PATH=${INCL} \
-		-DX11_Xmu_INCLUDE_PATH= ${INCL} \
-		.. &&
+	patch --input=$stuff/patches/app.cpp-$VERSION || return 1
+	patch --input=$stuff/patches/cfg.cpp-$VERSION || return 1
+	patch --input=$stuff/patches/slim.conf-$VERSION || return 1
+
+	# do NOT build slimlock
+	sed -i	-e '/install(TARGETS slimlock/d'	CMakeLists.txt
+
+	mkdir	_build &&
+	cd	_build &&
+	cmake	..					\
+		-D CMAKE_INSTALL_PREFIX=/usr		\
+		-D X11_Xmu_LIB="$LIBS/libXmu.so"	\
+		-D X11_Xft_INCLUDE_PATH=${INCL}		\
+		-D X11_Xmu_INCLUDE_PATH=${INCL} &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make install DESTDIR=$DESTDIR
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share/slim
-	cp -a $install/etc $fs
-	cp -a $install/usr/bin $fs/usr
-	cp -a $stuff/themes $fs/usr/share/slim
 
-	# Config file and rc script.
-	cp -a $stuff/etc $fs
-	chown -R root.root $fs
+	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
 
-	# slim-theme manager & default strings
-	install -m755 $stuff/slim-theme $fs/usr/bin/slim-theme
-	install -m644 $stuff/strings $fs/usr/share/slim/strings
+	# Configuration file and 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
+	install -m644 $stuff/strings	$fs/usr/share/slim/strings
 }
 
 post_install()
@@ -76,4 +93,7 @@
 	sed -i 's|>/tmp/X-output||' "$1/etc/slim.conf"
 }
 
-testsuite() { ldd $install/usr/bin/slim; }
+testsuite()
+{
+	ldd $install/usr/bin/slim
+}
diff -r cb5bc40867f1 -r 9c874a5c3b17 slim/stuff/patches/app.cpp-1.3.6
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/slim/stuff/patches/app.cpp-1.3.6	Wed Jul 20 17:04:10 2022 +0100
@@ -0,0 +1,22 @@
+--- app.cpp.orig
++++ app.cpp
+@@ -25,6 +25,7 @@
+ #include "app.h"
+ #include "numlock.h"
+ #include "util.h"
++#include <X11/Xmu/WinUtil.h>
+ 
+ #ifdef HAVE_SHADOW
+ #include <shadow.h>
+@@ -447,6 +448,11 @@
+ 			case Panel::Console:
+ 				logStream << APPNAME << ": Got a special command (" << LoginPanel->GetName() << ")" << endl;
+ 				return true; /* <--- This is simply fake! */
++			case Panel::Suspend:
++			case Panel::Halt:
++			case Panel::Reboot:
++				if (cfg->getOption("root_password") == "false")
++					return true;
+ 			default:
+ 				break;
+ 		}
diff -r cb5bc40867f1 -r 9c874a5c3b17 slim/stuff/patches/cfg.cpp-1.3.6
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/slim/stuff/patches/cfg.cpp-1.3.6	Wed Jul 20 17:04:10 2022 +0100
@@ -0,0 +1,49 @@
+--- cfg.cpp.orig
++++ cfg.cpp
+@@ -29,33 +29,34 @@
+ 	: currentSession(-1)
+ {
+ 	/* Configuration options */
+-	options.insert(option("default_path","/bin:/usr/bin:/usr/local/bin"));
+-	options.insert(option("default_xserver","/usr/bin/X"));
++	options.insert(option("default_path","/sbin:/bin:/usr/sbin:/usr/bin"));
++	options.insert(option("default_xserver","/usr/bin/Xorg"));
+ 	options.insert(option("xserver_arguments",""));
+ 	options.insert(option("numlock",""));
+ 	options.insert(option("daemon",""));
+ 	options.insert(option("xauth_path","/usr/bin/xauth"));
+-	options.insert(option("login_cmd","exec /bin/bash -login ~/.xinitrc %session"));
+-	options.insert(option("halt_cmd","/sbin/shutdown -h now"));
+-	options.insert(option("reboot_cmd","/sbin/shutdown -r now"));
++	options.insert(option("login_cmd","exec /bin/sh -l ~/.xinitrc %session"));
++	options.insert(option("halt_cmd","/sbin/poweroff"));
++	options.insert(option("reboot_cmd","/sbin/reboot"));
++	options.insert(option("root_password","true"));
+ 	options.insert(option("suspend_cmd",""));
+ 	options.insert(option("sessionstart_cmd",""));
+ 	options.insert(option("sessionstop_cmd",""));
+-	options.insert(option("console_cmd","/usr/bin/xterm -C -fg white -bg black +sb -g %dx%d+%d+%d -fn %dx%d -T ""Console login"" -e /bin/sh -c ""/bin/cat /etc/issue; exec /bin/login"""));
+-	options.insert(option("screenshot_cmd","import -window root /slim.png"));
++	options.insert(option("console_cmd","/usr/bin/xterm -C -fg white -bg black +sb -T ""Console login"" -e /bin/sh -l -c ""exec /bin/login"""));
++	options.insert(option("screenshot_cmd","mtpaint -s /root/slim-shot.png"));
+ 	options.insert(option("welcome_msg","Welcome to %host"));
+ 	options.insert(option("session_msg","Session:"));
+-	options.insert(option("default_user",""));
++	options.insert(option("default_user","tux"));
+ 	options.insert(option("focus_password","no"));
+ 	options.insert(option("auto_login","no"));
+-	options.insert(option("current_theme","default"));
+-	options.insert(option("lockfile","/var/run/slim.lock"));
++	options.insert(option("current_theme","slitaz,base"));
++	options.insert(option("lockfile","/var/lock/slim.lock"));
+ 	options.insert(option("logfile","/var/log/slim.log"));
+ 	options.insert(option("authfile","/var/run/slim.auth"));
+-	options.insert(option("shutdown_msg","The system is halting..."));
++	options.insert(option("shutdown_msg","The system is going down..."));
+ 	options.insert(option("reboot_msg","The system is rebooting..."));
+ 	options.insert(option("sessiondir",""));
+-	options.insert(option("hidecursor","false"));
++	options.insert(option("hidecursor","true"));
+ 
+ 	/* Theme stuff */
+ 	options.insert(option("input_panel_x","50%"));
diff -r cb5bc40867f1 -r 9c874a5c3b17 slim/stuff/patches/slim.conf-1.3.6
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/slim/stuff/patches/slim.conf-1.3.6	Wed Jul 20 17:04:10 2022 +0100
@@ -0,0 +1,84 @@
+--- slim.conf.original
++++ slim.conf
+@@ -1,13 +1,16 @@
++# /etc/slim.conf: Slim LogIn Manger configuration file
++#
++
+ # Path, X server and arguments (if needed)
+ # 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_xserver     /usr/bin/Xorg
+ #xserver_arguments   -dpi 75
+ 
+ # Commands for halt, login, etc.
+-halt_cmd            /sbin/shutdown -h now
+-reboot_cmd          /sbin/shutdown -r now
+-console_cmd         /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login"
++halt_cmd            /sbin/poweroff
++reboot_cmd          /sbin/reboot
++console_cmd         /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -l -c "exec /bin/login"
+ #suspend_cmd        /usr/sbin/suspend
+ 
+ # Full path to the xauth binary
+@@ -22,7 +25,7 @@
+ 
+ # Hide the mouse cursor (note: does not work with some WMs).
+ # Valid values: true|false
+-# hidecursor          false
++hidecursor          true
+ 
+ # This command is executed after a succesful login.
+ # you can place the %session and %theme variables
+@@ -33,7 +36,7 @@
+ # 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/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 @@
+ # 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
+-sessions            xfce4,icewm-session,wmaker,blackbox
++sessions            openbox,e17,jwm
+ 
+ # Executed when pressing F11 (requires imagemagick)
+-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 @@
+ # session_msg         Session: 
+ 
+ # shutdown / reboot messages
+-shutdown_msg       The system is halting...
++shutdown_msg       The system is going down...
+ reboot_msg         The system is rebooting...
+ 
+ # default user, leave blank or remove this line
+ # for avoid pre-loading the username.
+-#default_user        simone
++default_user        tux
+ 
+ # Focus the password field on start when default_user is set
+ # Set to "yes" to enable this feature
+@@ -81,11 +84,10 @@
+ 
+ # current theme, use comma separated list to specify a set to 
+ # randomly choose from
+-current_theme       default
++current_theme       slitaz,base
+ 
+ # Lock file
+-lockfile            /var/run/slim.lock
++lockfile            /var/lock/slim.lock
+ 
+ # Log file
+ logfile             /var/log/slim.log
+-