wok rev 25310
updated slim, slim-pam and slim-theme-default (1.3.5 -> 1.3.6)
| author | Hans-G?nter Theisgen |
|---|---|
| date | Wed Jul 20 17:04:10 2022 +0100 (22 months ago) |
| parents | cb5bc40867f1 |
| children | 9773cbef7450 |
| files | slim-pam/receipt slim-theme-default/receipt slim/description.txt slim/receipt slim/stuff/patches/app.cpp-1.3.6 slim/stuff/patches/cfg.cpp-1.3.6 slim/stuff/patches/slim.conf-1.3.6 |
line diff
1.1 --- a/slim-pam/receipt Wed Jul 20 10:12:48 2022 +0000 1.2 +++ b/slim-pam/receipt Wed Jul 20 17:04:10 2022 +0100 1.3 @@ -1,23 +1,26 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="slim-pam" 1.7 -VERSION="1.3.5" 1.8 +VERSION="1.3.6" 1.9 CATEGORY="x-window" 1.10 SHORT_DESC="Desktop-independent graphical login manager for X11 (PAM enabled)." 1.11 MAINTAINER="pascal.bellard@slitaz.org" 1.12 LICENSE="GPL2" 1.13 WEB_SITE="https://sourceforge.net/projects/slim.berlios/" 1.14 +REPOLOGY="slim-login-manager" 1.15 + 1.16 SOURCE="slim" 1.17 TARBALL="$SOURCE-$VERSION.tar.gz" 1.18 -WGET_URL="http://download.berlios.de/slim/$TARBALL" 1.19 -CONFIG_FILES="/etc/slim.conf" 1.20 +WGET_URL="https://downloads.sourceforge.net/project/slim.berlios/$TARBALL" 1.21 1.22 PROVIDE="slim:pam" 1.23 +RELATED="slim slim-theme-default" 1.24 +SUGGESTED="slim-theme-default slitaz-configs" 1.25 DEPENDS="gcc-lib-base libjpeg libpng pam xorg-libXft xorg-libXmu" 1.26 -SUGGESTED="slim-theme-default slitaz-configs" 1.27 -BUILD_DEPENDS="cmake freetype-dev jpeg-dev libpng-dev xorg-libXft-dev \ 1.28 -xorg-libXmu-dev pam-dev" 1.29 -RELATED="slim slim-theme-default" 1.30 +BUILD_DEPENDS="cmake freetype-dev jpeg-dev libpng-dev pam-dev xorg-libXft-dev 1.31 + xorg-libXmu-dev" 1.32 + 1.33 +CONFIG_FILES="/etc/slim.conf" 1.34 1.35 # What is the latest version available today? 1.36 current_version() 1.37 @@ -29,28 +32,33 @@ 1.38 # Rules to configure and make the package. 1.39 compile_rules() 1.40 { 1.41 - patch -p1 < $WOK/$SOURCE/stuff/$SOURCE-$VERSION.patch || return 1 1.42 - mkdir build; cd build 1.43 - cmake \ 1.44 - -DCMAKE_INSTALL_PREFIX=/usr \ 1.45 - -DX11_Xmu_LIB=-lXmu \ 1.46 - -DUSE_PAM=yes \ 1.47 - .. && 1.48 + patch --input=$WOK/$SOURCE/stuff/patches/app.cpp-$VERSION || return 1 1.49 + patch --input=$WOK/$SOURCE/stuff/patches/cfg.cpp-$VERSION || return 1 1.50 + patch --input=$WOK/$SOURCE/stuff/patches/slim.conf-$VERSION || return 1 1.51 + 1.52 + mkdir _build && 1.53 + cd _build && 1.54 + cmake .. \ 1.55 + -D CMAKE_INSTALL_PREFIX=/usr \ 1.56 + -D X11_Xmu_LIB=-lXmu \ 1.57 + -D USE_PAM=yes && 1.58 make && 1.59 - make DESTDIR=$DESTDIR install 1.60 + make install DESTDIR=$DESTDIR 1.61 } 1.62 1.63 # Rules to gen a SliTaz package suitable for Tazpkg. 1.64 genpkg_rules() 1.65 { 1.66 mkdir -p $fs/usr/share/slim 1.67 - cp -a $install/etc $fs 1.68 - cp -a $install/usr/bin $fs/usr 1.69 - cp -a $WOK/$SOURCE/stuff/themes $fs/usr/share/slim 1.70 1.71 - # Config file and rc script. 1.72 - cp -a $WOK/$SOURCE/stuff/etc $fs 1.73 - chown -R root.root $fs 1.74 + cp -a $install/etc $fs 1.75 + cp -a $install/usr/bin $fs/usr 1.76 + cp -a $install/usr/lib $fs/usr 1.77 + cp -a $WOK/$SOURCE/stuff/themes $fs/usr/share/slim 1.78 + 1.79 + # Configuration file and rc script. 1.80 + cp -a $WOK/$SOURCE/stuff/etc $fs 1.81 + chown -R root.root $fs 1.82 1.83 # slim-theme manager 1.84 install -m755 $WOK/$SOURCE/stuff/slim-theme $fs/usr/bin/slim-theme 1.85 @@ -76,4 +84,7 @@ 1.86 tazpkg get-install ${PACKAGE%-pam} 1.87 } 1.88 1.89 -testsuite() { ldd $install/usr/bin/slim; } 1.90 +testsuite() 1.91 +{ 1.92 + ldd $install/usr/bin/slim 1.93 +}
2.1 --- a/slim-theme-default/receipt Wed Jul 20 10:12:48 2022 +0000 2.2 +++ b/slim-theme-default/receipt Wed Jul 20 17:04:10 2022 +0100 2.3 @@ -1,22 +1,22 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="slim-theme-default" 2.7 -VERSION="1.3.5" 2.8 +VERSION="1.3.6" 2.9 CATEGORY="customization" 2.10 SHORT_DESC="Default theme bundled with SLiM." 2.11 MAINTAINER="pankso@slitaz.org" 2.12 LICENSE="GPL2" 2.13 WEB_SITE="https://sourceforge.net/projects/slim.berlios/" 2.14 2.15 +RELATED="slim slim-pam" 2.16 DEPENDS="slim" 2.17 WANTED="slim" 2.18 -RELATED="slim slim-pam" 2.19 2.20 # Rules to gen a SliTaz package suitable for Tazpkg. 2.21 genpkg_rules() 2.22 { 2.23 mkdir -p $fs/usr/share/slim 2.24 - cp -a $install/usr/share/slim/themes $fs/usr/share/slim 2.25 + cp -a $install/usr/share/slim/themes $fs/usr/share/slim 2.26 } 2.27 2.28 post_install()
3.1 --- a/slim/description.txt Wed Jul 20 10:12:48 2022 +0000 3.2 +++ b/slim/description.txt Wed Jul 20 17:04:10 2022 +0100 3.3 @@ -1,3 +1,5 @@ 3.4 -SLiM aims to be light, simple and independent from the various desktop 3.5 -environments. Although completely configurable through themes and an option 3.6 -file. It is particularly suitable for machines that don't require remote logins. 3.7 +SLiM aims to be light, simple and independent from the various 3.8 +desktop environments. 3.9 +Also completely configurable through themes and an option file. 3.10 +It is particularly suitable for machines that don't require 3.11 +remote logins.
4.1 --- a/slim/receipt Wed Jul 20 10:12:48 2022 +0000 4.2 +++ b/slim/receipt Wed Jul 20 17:04:10 2022 +0100 4.3 @@ -1,32 +1,41 @@ 4.4 # SliTaz package receipt. 4.5 4.6 PACKAGE="slim" 4.7 -VERSION="1.3.5" 4.8 +VERSION="1.3.6" 4.9 CATEGORY="x-window" 4.10 -SHORT_DESC="Desktop-independent graphical login manager for X11" 4.11 +SHORT_DESC="Desktop-independent graphical login manager for X11." 4.12 MAINTAINER="pankso@slitaz.org" 4.13 LICENSE="GPL2" 4.14 -WEB_SITE="https://sourceforge.net/projects/slim.berlios/" 4.15 +WEB_SITE="http://slim.berlios.de/" 4.16 +REPOLOGY="slim-login-manager" 4.17 + 4.18 TARBALL="$PACKAGE-$VERSION.tar.gz" 4.19 -WGET_URL="http://download.berlios.de/slim/$TARBALL" 4.20 -CONFIG_FILES="/etc/slim.conf" 4.21 -HOST_ARCH="i486 arm" 4.22 -COOKOPTS="!pngquant op8" 4.23 +WGET_URL="https://downloads.sourceforge.net/project/slim.berlios/$TARBALL" 4.24 4.25 -RELATED="slim-pam slim-theme-default" # don't forget to upgrade them too 4.26 +RELATED="slim-pam slim-theme-default" 4.27 SUGGESTED="slim-theme-default slitaz-configs" 4.28 DEPENDS="gcc-lib-base libjpeg libpng xorg-libXft xorg-libXmu" 4.29 BUILD_DEPENDS="freetype-dev jpeg-dev libpng-dev xorg-libXft-dev xorg-libXmu-dev" 4.30 4.31 +CONFIG_FILES="/etc/slim.conf" 4.32 + 4.33 +COOKOPTS="!pngquant op8" 4.34 + 4.35 +HOST_ARCH="i486 arm" 4.36 + 4.37 +# @maintainer: Please update also slim-pam and slim-theme-default 4.38 + 4.39 # Handle cross compilation 4.40 case "$ARCH" in 4.41 - i?86) 4.42 + (i?86) 4.43 BUILD_DEPENDS="$BUILD_DEPENDS cmake" 4.44 INCL=/usr/include 4.45 - LIBS=/usr/lib ;; 4.46 - arm*) 4.47 + LIBS=/usr/lib 4.48 + ;; 4.49 + (arm*) 4.50 INCL=/cross/$ARCH/sysroot/usr/include 4.51 - LIBS=/cross/$ARCH/sysroot/usr/lib ;; 4.52 + LIBS=/cross/$ARCH/sysroot/usr/lib 4.53 + ;; 4.54 esac 4.55 4.56 current_version() 4.57 @@ -38,33 +47,41 @@ 4.58 # Rules to configure and make the package. 4.59 compile_rules() 4.60 { 4.61 - patch -p1 < $stuff/$PACKAGE-$VERSION.patch || return 1 4.62 - mkdir build; cd build 4.63 - cmake \ 4.64 - -DCMAKE_INSTALL_PREFIX=/usr \ 4.65 - -DX11_Xmu_LIB="$LIBS/libXmu.so" \ 4.66 - -DX11_Xft_INCLUDE_PATH=${INCL} \ 4.67 - -DX11_Xmu_INCLUDE_PATH= ${INCL} \ 4.68 - .. && 4.69 + patch --input=$stuff/patches/app.cpp-$VERSION || return 1 4.70 + patch --input=$stuff/patches/cfg.cpp-$VERSION || return 1 4.71 + patch --input=$stuff/patches/slim.conf-$VERSION || return 1 4.72 + 4.73 + # do NOT build slimlock 4.74 + sed -i -e '/install(TARGETS slimlock/d' CMakeLists.txt 4.75 + 4.76 + mkdir _build && 4.77 + cd _build && 4.78 + cmake .. \ 4.79 + -D CMAKE_INSTALL_PREFIX=/usr \ 4.80 + -D X11_Xmu_LIB="$LIBS/libXmu.so" \ 4.81 + -D X11_Xft_INCLUDE_PATH=${INCL} \ 4.82 + -D X11_Xmu_INCLUDE_PATH=${INCL} && 4.83 make && 4.84 - make DESTDIR=$DESTDIR install 4.85 + make install DESTDIR=$DESTDIR 4.86 } 4.87 4.88 # Rules to gen a SliTaz package suitable for Tazpkg. 4.89 genpkg_rules() 4.90 { 4.91 mkdir -p $fs/usr/share/slim 4.92 - cp -a $install/etc $fs 4.93 - cp -a $install/usr/bin $fs/usr 4.94 - cp -a $stuff/themes $fs/usr/share/slim 4.95 4.96 - # Config file and rc script. 4.97 - cp -a $stuff/etc $fs 4.98 - chown -R root.root $fs 4.99 + cp -a $install/etc $fs 4.100 + cp -a $install/usr/bin $fs/usr 4.101 + cp -a $install/usr/lib $fs/usr 4.102 + cp -a $stuff/themes $fs/usr/share/slim 4.103 4.104 - # slim-theme manager & default strings 4.105 - install -m755 $stuff/slim-theme $fs/usr/bin/slim-theme 4.106 - install -m644 $stuff/strings $fs/usr/share/slim/strings 4.107 + # Configuration file and rc script. 4.108 + cp -a $stuff/etc $fs 4.109 + chown -R root.root $fs 4.110 + 4.111 + # slim-theme manager and default strings 4.112 + install -m755 $stuff/slim-theme $fs/usr/bin/slim-theme 4.113 + install -m644 $stuff/strings $fs/usr/share/slim/strings 4.114 } 4.115 4.116 post_install() 4.117 @@ -76,4 +93,7 @@ 4.118 sed -i 's|>/tmp/X-output||' "$1/etc/slim.conf" 4.119 } 4.120 4.121 -testsuite() { ldd $install/usr/bin/slim; } 4.122 +testsuite() 4.123 +{ 4.124 + ldd $install/usr/bin/slim 4.125 +}
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/slim/stuff/patches/app.cpp-1.3.6 Wed Jul 20 17:04:10 2022 +0100 5.3 @@ -0,0 +1,22 @@ 5.4 +--- app.cpp.orig 5.5 ++++ app.cpp 5.6 +@@ -25,6 +25,7 @@ 5.7 + #include "app.h" 5.8 + #include "numlock.h" 5.9 + #include "util.h" 5.10 ++#include <X11/Xmu/WinUtil.h> 5.11 + 5.12 + #ifdef HAVE_SHADOW 5.13 + #include <shadow.h> 5.14 +@@ -447,6 +448,11 @@ 5.15 + case Panel::Console: 5.16 + logStream << APPNAME << ": Got a special command (" << LoginPanel->GetName() << ")" << endl; 5.17 + return true; /* <--- This is simply fake! */ 5.18 ++ case Panel::Suspend: 5.19 ++ case Panel::Halt: 5.20 ++ case Panel::Reboot: 5.21 ++ if (cfg->getOption("root_password") == "false") 5.22 ++ return true; 5.23 + default: 5.24 + break; 5.25 + }
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/slim/stuff/patches/cfg.cpp-1.3.6 Wed Jul 20 17:04:10 2022 +0100 6.3 @@ -0,0 +1,49 @@ 6.4 +--- cfg.cpp.orig 6.5 ++++ cfg.cpp 6.6 +@@ -29,33 +29,34 @@ 6.7 + : currentSession(-1) 6.8 + { 6.9 + /* Configuration options */ 6.10 +- options.insert(option("default_path","/bin:/usr/bin:/usr/local/bin")); 6.11 +- options.insert(option("default_xserver","/usr/bin/X")); 6.12 ++ options.insert(option("default_path","/sbin:/bin:/usr/sbin:/usr/bin")); 6.13 ++ options.insert(option("default_xserver","/usr/bin/Xorg")); 6.14 + options.insert(option("xserver_arguments","")); 6.15 + options.insert(option("numlock","")); 6.16 + options.insert(option("daemon","")); 6.17 + options.insert(option("xauth_path","/usr/bin/xauth")); 6.18 +- options.insert(option("login_cmd","exec /bin/bash -login ~/.xinitrc %session")); 6.19 +- options.insert(option("halt_cmd","/sbin/shutdown -h now")); 6.20 +- options.insert(option("reboot_cmd","/sbin/shutdown -r now")); 6.21 ++ options.insert(option("login_cmd","exec /bin/sh -l ~/.xinitrc %session")); 6.22 ++ options.insert(option("halt_cmd","/sbin/poweroff")); 6.23 ++ options.insert(option("reboot_cmd","/sbin/reboot")); 6.24 ++ options.insert(option("root_password","true")); 6.25 + options.insert(option("suspend_cmd","")); 6.26 + options.insert(option("sessionstart_cmd","")); 6.27 + options.insert(option("sessionstop_cmd","")); 6.28 +- 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""")); 6.29 +- options.insert(option("screenshot_cmd","import -window root /slim.png")); 6.30 ++ 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""")); 6.31 ++ options.insert(option("screenshot_cmd","mtpaint -s /root/slim-shot.png")); 6.32 + options.insert(option("welcome_msg","Welcome to %host")); 6.33 + options.insert(option("session_msg","Session:")); 6.34 +- options.insert(option("default_user","")); 6.35 ++ options.insert(option("default_user","tux")); 6.36 + options.insert(option("focus_password","no")); 6.37 + options.insert(option("auto_login","no")); 6.38 +- options.insert(option("current_theme","default")); 6.39 +- options.insert(option("lockfile","/var/run/slim.lock")); 6.40 ++ options.insert(option("current_theme","slitaz,base")); 6.41 ++ options.insert(option("lockfile","/var/lock/slim.lock")); 6.42 + options.insert(option("logfile","/var/log/slim.log")); 6.43 + options.insert(option("authfile","/var/run/slim.auth")); 6.44 +- options.insert(option("shutdown_msg","The system is halting...")); 6.45 ++ options.insert(option("shutdown_msg","The system is going down...")); 6.46 + options.insert(option("reboot_msg","The system is rebooting...")); 6.47 + options.insert(option("sessiondir","")); 6.48 +- options.insert(option("hidecursor","false")); 6.49 ++ options.insert(option("hidecursor","true")); 6.50 + 6.51 + /* Theme stuff */ 6.52 + options.insert(option("input_panel_x","50%"));
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/slim/stuff/patches/slim.conf-1.3.6 Wed Jul 20 17:04:10 2022 +0100 7.3 @@ -0,0 +1,84 @@ 7.4 +--- slim.conf.original 7.5 ++++ slim.conf 7.6 +@@ -1,13 +1,16 @@ 7.7 ++# /etc/slim.conf: Slim LogIn Manger configuration file 7.8 ++# 7.9 ++ 7.10 + # Path, X server and arguments (if needed) 7.11 + # Note: -xauth $authfile is automatically appended 7.12 +-default_path /bin:/usr/bin:/usr/local/bin 7.13 +-default_xserver /usr/bin/X 7.14 ++default_path ./:/bin:/usr/bin:/usr/local/bin 7.15 ++default_xserver /usr/bin/Xorg 7.16 + #xserver_arguments -dpi 75 7.17 + 7.18 + # Commands for halt, login, etc. 7.19 +-halt_cmd /sbin/shutdown -h now 7.20 +-reboot_cmd /sbin/shutdown -r now 7.21 +-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" 7.22 ++halt_cmd /sbin/poweroff 7.23 ++reboot_cmd /sbin/reboot 7.24 ++console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -l -c "exec /bin/login" 7.25 + #suspend_cmd /usr/sbin/suspend 7.26 + 7.27 + # Full path to the xauth binary 7.28 +@@ -22,7 +25,7 @@ 7.29 + 7.30 + # Hide the mouse cursor (note: does not work with some WMs). 7.31 + # Valid values: true|false 7.32 +-# hidecursor false 7.33 ++hidecursor true 7.34 + 7.35 + # This command is executed after a succesful login. 7.36 + # you can place the %session and %theme variables 7.37 +@@ -33,7 +36,7 @@ 7.38 + # to adjust the command according to your preferred shell, 7.39 + # i.e. for freebsd use: 7.40 + # login_cmd exec /bin/sh - ~/.xinitrc %session 7.41 +-login_cmd exec /bin/bash -login ~/.xinitrc %session 7.42 ++login_cmd exec /bin/sh -l ~/.xinitrc %session 7.43 + 7.44 + # Commands executed when starting and exiting a session. 7.45 + # They can be used for registering a X11 session with 7.46 +@@ -51,10 +54,10 @@ 7.47 + # The current chosen session name is replaced in the login_cmd 7.48 + # above, so your login command can handle different sessions. 7.49 + # see the xinitrc.sample file shipped with slim sources 7.50 +-sessions xfce4,icewm-session,wmaker,blackbox 7.51 ++sessions openbox,e17,jwm 7.52 + 7.53 + # Executed when pressing F11 (requires imagemagick) 7.54 +-screenshot_cmd import -window root /slim.png 7.55 ++#screenshot_cmd mtpaint -s /root/slim-shot.png 7.56 + 7.57 + # welcome message. Available variables: %host, %domain 7.58 + welcome_msg Welcome to %host 7.59 +@@ -63,12 +66,12 @@ 7.60 + # session_msg Session: 7.61 + 7.62 + # shutdown / reboot messages 7.63 +-shutdown_msg The system is halting... 7.64 ++shutdown_msg The system is going down... 7.65 + reboot_msg The system is rebooting... 7.66 + 7.67 + # default user, leave blank or remove this line 7.68 + # for avoid pre-loading the username. 7.69 +-#default_user simone 7.70 ++default_user tux 7.71 + 7.72 + # Focus the password field on start when default_user is set 7.73 + # Set to "yes" to enable this feature 7.74 +@@ -81,11 +84,10 @@ 7.75 + 7.76 + # current theme, use comma separated list to specify a set to 7.77 + # randomly choose from 7.78 +-current_theme default 7.79 ++current_theme slitaz,base 7.80 + 7.81 + # Lock file 7.82 +-lockfile /var/run/slim.lock 7.83 ++lockfile /var/lock/slim.lock 7.84 + 7.85 + # Log file 7.86 + logfile /var/log/slim.log 7.87 +-