wok annotate slim/stuff/slim-1.3.5.patch @ rev 14774

Up xorg-libXi (1.7.1.901), see http://www.x.org/wiki/Development/Security/Advisory-2013-05-23
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Jun 30 10:36:53 2013 +0200 (2013-06-30)
parents
children 6956f290aa5a
rev   line source
al@14601 1 --- slim-1.3.5/app.cpp
al@14601 2 +++ slim-1.3.5/app.cpp
al@14601 3
al@14601 4 Link forgotten header.
al@14601 5 @@ -25,6 +25,7 @@
al@14601 6 #include "app.h"
al@14601 7 #include "numlock.h"
al@14601 8 #include "util.h"
al@14601 9 +#include <X11/Xmu/WinUtil.h>
al@14601 10
al@14601 11 #ifdef HAVE_SHADOW
al@14601 12 #include <shadow.h>
al@14601 13
al@14601 14 Option not to enter root's password if special command was given in the
al@14601 15 login field (suspend, halt or reboot).
al@14601 16 @@ -437,6 +438,11 @@
al@14601 17 case Panel::Console:
al@14601 18 logStream << APPNAME << ": Got a special command (" << LoginPanel->GetName() << ")" << endl;
al@14601 19 return true; /* <--- This is simply fake! */
al@14601 20 + case Panel::Suspend:
al@14601 21 + case Panel::Halt:
al@14601 22 + case Panel::Reboot:
al@14601 23 + if (cfg->getOption("root_password") == "false")
al@14601 24 + return true;
al@14601 25 default:
al@14601 26 break;
al@14601 27 }
al@14601 28
al@14601 29
al@14601 30 --- slim-1.3.5/cfg.cpp
al@14601 31 +++ slim-1.3.5/cfg.cpp
al@14601 32
al@14601 33 Change default settings for SliTaz.
al@14601 34 @@ -28,34 +28,35 @@
al@14601 35 : currentSession(-1)
al@14601 36 {
al@14601 37 /* Configuration options */
al@14601 38 - options.insert(option("default_path","/bin:/usr/bin:/usr/local/bin"));
al@14601 39 - options.insert(option("default_xserver","/usr/bin/X"));
al@14601 40 + options.insert(option("default_path","/sbin:/bin:/usr/sbin:/usr/bin"));
al@14601 41 + options.insert(option("default_xserver","/usr/bin/Xorg"));
al@14601 42 options.insert(option("xserver_arguments",""));
al@14601 43 options.insert(option("numlock",""));
al@14601 44 options.insert(option("daemon",""));
al@14601 45 options.insert(option("xauth_path","/usr/bin/xauth"));
al@14601 46 - options.insert(option("login_cmd","exec /bin/bash -login ~/.xinitrc %session"));
al@14601 47 - options.insert(option("halt_cmd","/sbin/shutdown -h now"));
al@14601 48 - options.insert(option("reboot_cmd","/sbin/shutdown -r now"));
al@14601 49 + options.insert(option("login_cmd","exec /bin/sh -l ~/.xinitrc %session"));
al@14601 50 + options.insert(option("halt_cmd","/sbin/poweroff"));
al@14601 51 + options.insert(option("reboot_cmd","/sbin/reboot"));
al@14601 52 + options.insert(option("root_password","true"));
al@14601 53 options.insert(option("suspend_cmd",""));
al@14601 54 options.insert(option("sessionstart_cmd",""));
al@14601 55 options.insert(option("sessionstop_cmd",""));
al@14601 56 - 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"""));
al@14601 57 - options.insert(option("screenshot_cmd","import -window root /slim.png"));
al@14601 58 + 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"""));
al@14601 59 + options.insert(option("screenshot_cmd","mtpaint -s /root/slim-shot.png"));
al@14601 60 options.insert(option("welcome_msg","Welcome to %host"));
al@14601 61 options.insert(option("session_msg","Session:"));
al@14601 62 - options.insert(option("default_user",""));
al@14601 63 + options.insert(option("default_user","tux"));
al@14601 64 options.insert(option("focus_password","no"));
al@14601 65 options.insert(option("auto_login","no"));
al@14601 66 - options.insert(option("current_theme","default"));
al@14601 67 - options.insert(option("lockfile","/var/run/slim.lock"));
al@14601 68 + options.insert(option("current_theme","slitaz,base"));
al@14601 69 + options.insert(option("lockfile","/var/lock/slim.lock"));
al@14601 70 options.insert(option("logfile","/var/log/slim.log"));
al@14601 71 options.insert(option("authfile","/var/run/slim.auth"));
al@14601 72 - options.insert(option("shutdown_msg","The system is halting..."));
al@14601 73 + options.insert(option("shutdown_msg","The system is going down..."));
al@14601 74 options.insert(option("reboot_msg","The system is rebooting..."));
al@14601 75 - options.insert(option("sessions","wmaker,blackbox,icewm"));
al@14601 76 + options.insert(option("sessions","openbox,e17,jwm"));
al@14601 77 options.insert(option("sessiondir",""));
al@14601 78 - options.insert(option("hidecursor","false"));
al@14601 79 + options.insert(option("hidecursor","true"));
al@14601 80
al@14601 81 /* Theme stuff */
al@14601 82 options.insert(option("input_panel_x","50%"));
al@14601 83
al@14601 84
al@14601 85 --- slim-1.3.5/slim.conf.original
al@14601 86 +++ slim-1.3.5/slim.conf
al@14601 87
al@14601 88 Change default settings for SliTaz too.
al@14601 89 @@ -1,13 +1,16 @@
al@14601 90 +# /etc/slim.conf: Slim LogIn Manger configuration file
al@14601 91 +#
al@14601 92 +
al@14601 93 # Path, X server and arguments (if needed)
al@14601 94 # Note: -xauth $authfile is automatically appended
al@14601 95 -default_path /bin:/usr/bin:/usr/local/bin
al@14601 96 -default_xserver /usr/bin/X
al@14601 97 +default_path ./:/bin:/usr/bin:/usr/local/bin
al@14601 98 +default_xserver /usr/bin/Xorg
al@14601 99 #xserver_arguments -dpi 75
al@14601 100
al@14601 101 # Commands for halt, login, etc.
al@14601 102 -halt_cmd /sbin/shutdown -h now
al@14601 103 -reboot_cmd /sbin/shutdown -r now
al@14601 104 -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"
al@14601 105 +halt_cmd /sbin/poweroff
al@14601 106 +reboot_cmd /sbin/reboot
al@14601 107 +console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -l -c "exec /bin/login"
al@14601 108 #suspend_cmd /usr/sbin/suspend
al@14601 109
al@14601 110 # Full path to the xauth binary
al@14601 111 @@ -22,7 +25,7 @@
al@14601 112
al@14601 113 # Hide the mouse cursor (note: does not work with some WMs).
al@14601 114 # Valid values: true|false
al@14601 115 -# hidecursor false
al@14601 116 +hidecursor true
al@14601 117
al@14601 118 # This command is executed after a succesful login.
al@14601 119 # you can place the %session and %theme variables
al@14601 120 @@ -33,7 +36,7 @@
al@14601 121 # to adjust the command according to your preferred shell,
al@14601 122 # i.e. for freebsd use:
al@14601 123 # login_cmd exec /bin/sh - ~/.xinitrc %session
al@14601 124 -login_cmd exec /bin/bash -login ~/.xinitrc %session
al@14601 125 +login_cmd exec /bin/sh -l ~/.xinitrc %session
al@14601 126
al@14601 127 # Commands executed when starting and exiting a session.
al@14601 128 # They can be used for registering a X11 session with
al@14601 129 @@ -51,10 +54,10 @@
al@14601 130 # The current chosen session name is replaced in the login_cmd
al@14601 131 # above, so your login command can handle different sessions.
al@14601 132 # see the xinitrc.sample file shipped with slim sources
al@14601 133 -sessions xfce4,icewm-session,wmaker,blackbox
al@14601 134 +sessions openbox,e17,jwm
al@14601 135
al@14601 136 # Executed when pressing F11 (requires imagemagick)
al@14601 137 -screenshot_cmd import -window root /slim.png
al@14601 138 +#screenshot_cmd mtpaint -s /root/slim-shot.png
al@14601 139
al@14601 140 # welcome message. Available variables: %host, %domain
al@14601 141 welcome_msg Welcome to %host
al@14601 142 @@ -63,12 +66,12 @@
al@14601 143 # session_msg Session:
al@14601 144
al@14601 145 # shutdown / reboot messages
al@14601 146 -shutdown_msg The system is halting...
al@14601 147 +shutdown_msg The system is going down...
al@14601 148 reboot_msg The system is rebooting...
al@14601 149
al@14601 150 # default user, leave blank or remove this line
al@14601 151 # for avoid pre-loading the username.
al@14601 152 -#default_user simone
al@14601 153 +default_user tux
al@14601 154
al@14601 155 # Focus the password field on start when default_user is set
al@14601 156 # Set to "yes" to enable this feature
al@14601 157 @@ -81,10 +84,10 @@
al@14601 158
al@14601 159 # current theme, use comma separated list to specify a set to
al@14601 160 # randomly choose from
al@14601 161 -current_theme default
al@14601 162 +current_theme slitaz,base
al@14601 163
al@14601 164 # Lock file
al@14601 165 -lockfile /var/run/slim.lock
al@14601 166 +lockfile /var/lock/slim.lock
al@14601 167
al@14601 168 # Log file
al@14601 169 logfile /var/log/slim.log