Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=17fcd01ac969f0f8e2d19e02848885d4ef3412f7
commit 17fcd01ac969f0f8e2d19e02848885d4ef3412f7 Author: Devil505 <[email protected]> Date: Sat May 5 11:24:20 2012 +0200 slim-1.3.3-2-i686 * bin, replaced by lightdm diff --git a/source/xfce4/slim/15287-fix-pam-authentication-with-pam_unix2.patch b/source/xfce4/slim/15287-fix-pam-authentication-with-pam_unix2.patch deleted file mode 100644 index 2163d20..0000000 --- a/source/xfce4/slim/15287-fix-pam-authentication-with-pam_unix2.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -rc slim-1.3.1-orig/app.cpp slim-1.3.1/app.cpp -*** slim-1.3.1-orig/app.cpp 2008-09-26 02:54:15.000000000 +0200 ---- slim-1.3.1/app.cpp 2009-02-17 19:50:06.000000000 +0100 -*************** -*** 41,48 **** - Panel* panel = *static_cast<Panel**>(appdata_ptr); - int result = PAM_SUCCESS; - for (int i=0; i<num_msg; i++){ -! resp[i]->resp=0; -! resp[i]->resp_retcode=0; - switch(msg[i]->msg_style){ - case PAM_PROMPT_ECHO_ON: - // We assume PAM is asking for the username ---- 41,48 ---- - Panel* panel = *static_cast<Panel**>(appdata_ptr); - int result = PAM_SUCCESS; - for (int i=0; i<num_msg; i++){ -! (*resp)[i].resp=0; -! (*resp)[i].resp_retcode=0; - switch(msg[i]->msg_style){ - case PAM_PROMPT_ECHO_ON: - // We assume PAM is asking for the username -*************** -*** 51,63 **** - case Panel::Suspend: - case Panel::Halt: - case Panel::Reboot: -! resp[i]->resp=strdup("root"); - break; - - case Panel::Console: - case Panel::Exit: - case Panel::Login: -! resp[i]->resp=strdup(panel->GetName().c_str()); - break; - } - break; ---- 51,63 ---- - case Panel::Suspend: - case Panel::Halt: - case Panel::Reboot: -! (*resp)[i].resp=strdup("root"); - break; - - case Panel::Console: - case Panel::Exit: - case Panel::Login: -! (*resp)[i].resp=strdup(panel->GetName().c_str()); - break; - } - break; -*************** -*** 73,79 **** - - default: - panel->EventHandler(Panel::Get_Passwd); -! resp[i]->resp=strdup(panel->GetPasswd().c_str()); - break; - } - break; ---- 73,79 ---- - - default: - panel->EventHandler(Panel::Get_Passwd); -! (*resp)[i].resp=strdup(panel->GetPasswd().c_str()); - break; - } - break; -*************** -*** 89,97 **** - } - if (result!=PAM_SUCCESS){ - for (int i=0; i<num_msg; i++){ -! if (resp[i]->resp==0) continue; -! free(resp[i]->resp); -! resp[i]->resp=0; - }; - free(*resp); - *resp=0; ---- 89,97 ---- - } - if (result!=PAM_SUCCESS){ - for (int i=0; i<num_msg; i++){ -! if ((*resp)[i].resp==0) continue; -! free((*resp)[i].resp); -! (*resp)[i].resp=0; - }; - free(*resp); - *resp=0; diff --git a/source/xfce4/slim/405579-fix-numlock.patch b/source/xfce4/slim/405579-fix-numlock.patch deleted file mode 100644 index 1e6ea7e..0000000 --- a/source/xfce4/slim/405579-fix-numlock.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- numlock.cpp.orig 2012-03-04 16:21:34.000000000 +0100 -+++ numlock.cpp 2012-03-04 16:24:49.000000000 +0100 -@@ -68,9 +68,11 @@ - return; - - if( flag == true ) -- XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0); -- else - XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, mask); -+ else -+ XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0); -+ -+ XSync( dpy, false ); - } - - void NumLock::setOn(Display *dpy) { diff --git a/source/xfce4/slim/FrugalBuild b/source/xfce4/slim/FrugalBuild deleted file mode 100644 index d28a2ab..0000000 --- a/source/xfce4/slim/FrugalBuild +++ /dev/null @@ -1,47 +0,0 @@ -# Compiling Time: 0.03 SBU -# Maintainer: Priyank Gosalia <[email protected]> - -pkgname=slim -pkgver=1.3.3 -pkgrel=2 -pkgdesc="SLiM is a lightweight, Desktop-independent graphical login manager for X11." -depends=('libxml2>=2.7.8' 'libpng' 'libjpeg' 'consolekit-x11' 'freeglut') -makedepends=('libx11>=1.2.2-1' 'libxft' 'libxmu' 'pam') -rodepends=('xorg-server>=1.6.1-8') -groups=('xfce4') -archs=('i686' 'x86_64') -backup=('etc/slim.conf') -Finclude berlios cmake -up2date="Flasttar http://slim.berlios.de/"; -source=(${source[@]} \ - slim.conf \ - slim.install \ - pam.d \ - logrotate \ - slim-tmpfiles.conf \ - 15287-fix-pam-authentication-with-pam_unix2.patch \ - 405579-fix-numlock.patch \ - http://ftp.frugalware.org/pub/other/artwork/slim-theme/frugalware-1.6.tar.bz2) - -sha1sums=('791635fc13ec859ed3be8bf1eb2ce0ba2bb3f155' \ - 'b172c8c55c3eba0b0052ff6e34e3dac7d9ff798f' \ - 'a17849f628f4f74cf1bd48eea21a144f2f1a274d' \ - '93c26670a5046602c9d0e91960c463f11a383281' \ - 'b969cc902c1d9915a5609141a652c77b2732407b' \ - 'cdca8b856049c2e6baeca7ac45b2e5573e8ad6e2' \ - 'e17c582fe0cc1d2a07e51d410db2d61c11aba4c6' \ - 'd043c6870bd83df554f8a0304d34348113ebbed1' \ - '644712d038ef637ceab7e158e3f8fae98561bf31') - -build() -{ - Fcd - CMake_build -DUSE_PAM=yes -DUSE_CONSOLEKIT=yes -DCKCONNECTOR_INCLUDE_DIR=/usr/include/ConsoleKit/ck-connector - Finstall 644 pam.d etc/pam.d/slim - Finstall 644 logrotate etc/logrotate.d/slim - Finstall 644 slim-tmpfiles.conf /etc/tmpfiles.d/slim.conf - Fcpr frugalware /usr/share/slim/themes/frugalware - Fcpr slim.conf /etc/slim.conf -} - -# optimization OK diff --git a/source/xfce4/slim/logrotate b/source/xfce4/slim/logrotate deleted file mode 100644 index 26ec3b0..0000000 --- a/source/xfce4/slim/logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/slim.log { - compress - rotate 1 - size 1024k - notifempty - missingok - copytruncate - noolddir -} diff --git a/source/xfce4/slim/pam.d b/source/xfce4/slim/pam.d deleted file mode 100644 index ea5284d..0000000 --- a/source/xfce4/slim/pam.d +++ /dev/null @@ -1,11 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_unix.so -auth optional pam_gnome_keyring.so -account required pam_unix.so -session required pam_limits.so -session required pam_unix.so -session optional pam_gnome_keyring.so auto_start -password required pam_unix.so -session optional pam_ck_connector.so diff --git a/source/xfce4/slim/slim-tmpfiles.conf b/source/xfce4/slim/slim-tmpfiles.conf deleted file mode 100644 index c430efa..0000000 --- a/source/xfce4/slim/slim-tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /var/run/slim \ No newline at end of file diff --git a/source/xfce4/slim/slim.conf b/source/xfce4/slim/slim.conf deleted file mode 100644 index b4af018..0000000 --- a/source/xfce4/slim/slim.conf +++ /dev/null @@ -1,78 +0,0 @@ -# Path, X server and arguments (if needed) -# Note: -xauth $authfile is automatically appended -default_path ./:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin -default_xserver /usr/bin/X -xserver_arguments -dpi 72 -nolisten tcp vt07 - -# 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" -#suspend_cmd /usr/sbin/suspend - -# Full path to the xauth binary -xauth_path /usr/bin/xauth - -# Xauth file for server -authfile /var/run/slim.auth - - -# Activate numlock when slim starts. Valid values: on|off -# numlock on - -# Hide the mouse cursor (note: does not work with some WMs). -# Valid values: true|false -# hidecursor false - -# This command is executed after a succesful login. -# you can place the %session and %theme variables -# to handle launching of specific commands in .xinitrc -# depending of chosen session and slim theme -# -# NOTE: if your system does not have bash you need -# to adjust the command according to your preferred shell, -# i.e. for freebsd use: -# login_cmd exec /bin/sh - ~/.xinitrc %session -login_cmd exec ck-launch-session dbus-launch /bin/bash -login /usr/bin/startxfce4 %session - -# Commands executed when starting and exiting a session. -# They can be used for registering a X11 session with -# sessreg. You can use the %user variable -# -# sessionstart_cmd some command -# sessionstop_cmd some command - -# Start in daemon mode. Valid values: yes | no -# Note that this can overridden by the command line -# option "-d" - daemon yes - -# Available sessions (first one is the default). -# 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 - -# Executed when pressing F11 (requires imagemagick) -screenshot_cmd import -window root /slim.png - -# welcome message. Available variables: %host, %domain -welcome_msg Welcome to %host - -# shutdown / reboot messages -shutdown_msg The system is halting... -reboot_msg The system is rebooting... - -# default user, leave blank or remove this line -# for avoid pre-loading the username. -#default_user simone - -# current theme, use comma separated list to specify a set to -# randomly choose from -current_theme frugalware - -# Lock file -lockfile /var/lock/slim.lock - -# Log file -logfile /var/log/slim.log diff --git a/source/xfce4/slim/slim.install b/source/xfce4/slim/slim.install deleted file mode 100644 index 993935d..0000000 --- a/source/xfce4/slim/slim.install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() -{ - sed 's|^#desktop="/usr/bin/slim"$|desktop="/usr/bin/slim"|' -i /etc/sysconfig/desktop -} - -post_upgrade() -{ - post_install -} - -post_remove() -{ - sed 's|^desktop="/usr/bin/slim"$|#desktop="/usr/bin/slim"|' -i /etc/sysconfig/desktop -} - -op=$1 -shift - -$op $* - -# vim: ft=sh _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
