summaryrefslogtreecommitdiff
path: root/extra/slim
diff options
context:
space:
mode:
Diffstat (limited to 'extra/slim')
-rw-r--r--extra/slim/fix-array-overflow.patch13
-rw-r--r--extra/slim/fix-glibc-segfault-1.3.4.patch13
-rw-r--r--extra/slim/fix-numlock-1.3.3.patch46
-rw-r--r--extra/slim/install7
-rw-r--r--extra/slim/libpng-1.4+-support.patch14
-rw-r--r--extra/slim/logrotate9
-rw-r--r--extra/slim/pam.d10
-rw-r--r--extra/slim/ptr_pam.patch52
-rwxr-xr-xextra/slim/rc.d36
-rw-r--r--extra/slim/session-name.patch21
-rw-r--r--extra/slim/slim.service9
-rw-r--r--extra/slim/tty-slowness.patch30
12 files changed, 0 insertions, 260 deletions
diff --git a/extra/slim/fix-array-overflow.patch b/extra/slim/fix-array-overflow.patch
deleted file mode 100644
index b035f8a78..000000000
--- a/extra/slim/fix-array-overflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: app.cpp
-===================================================================
---- app.cpp (revision 223)
-+++ app.cpp (working copy)
-@@ -593,7 +593,7 @@
-
- n++;
-
-- child_env = static_cast<char**>(malloc(sizeof(char*)*n));
-+ child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1)));
- memcpy(child_env, old_env, sizeof(char*)*n);
- child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
- child_env[n] = NULL;
diff --git a/extra/slim/fix-glibc-segfault-1.3.4.patch b/extra/slim/fix-glibc-segfault-1.3.4.patch
deleted file mode 100644
index b035f8a78..000000000
--- a/extra/slim/fix-glibc-segfault-1.3.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: app.cpp
-===================================================================
---- app.cpp (revision 223)
-+++ app.cpp (working copy)
-@@ -593,7 +593,7 @@
-
- n++;
-
-- child_env = static_cast<char**>(malloc(sizeof(char*)*n));
-+ child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1)));
- memcpy(child_env, old_env, sizeof(char*)*n);
- child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
- child_env[n] = NULL;
diff --git a/extra/slim/fix-numlock-1.3.3.patch b/extra/slim/fix-numlock-1.3.3.patch
deleted file mode 100644
index 179fffcbf..000000000
--- a/extra/slim/fix-numlock-1.3.3.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- trunk/app.cpp 2012/02/21 23:57:28 211
-+++ trunk/app.cpp 2012/04/16 23:28:34 212
-@@ -332,6 +332,15 @@
- Login();
- }
- }
-+
-+ // Set NumLock
-+ string numlock = cfg->getOption("numlock");
-+ if (numlock == "on") {
-+ NumLock::setOn(Dpy);
-+ } else if (numlock == "off") {
-+ NumLock::setOff(Dpy);
-+ }
-+
- // Start looping
- int panelclosed = 1;
- Panel::ActionType Action;
-@@ -971,13 +980,6 @@
- break;
- }
-
-- string numlock = cfg->getOption("numlock");
-- if (numlock == "on") {
-- NumLock::setOn(Dpy);
-- } else if (numlock == "off") {
-- NumLock::setOff(Dpy);
-- }
--
- delete args;
-
- serverStarted = true;
---- trunk/numlock.cpp 2012/02/21 23:57:28 211
-+++ trunk/numlock.cpp 2012/04/16 23:28:34 212
-@@ -68,9 +68,9 @@
- return;
-
- if( flag == true )
-- XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
-- else
- XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, mask);
-+ else
-+ XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
- }
-
- void NumLock::setOn(Display *dpy) {
diff --git a/extra/slim/install b/extra/slim/install
deleted file mode 100644
index 65aa77d72..000000000
--- a/extra/slim/install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
- cat <<EOF
-
-==> Add slim to the DAEMONS array in /etc/rc.conf or update /etc/inittab.
-
-EOF
-}
diff --git a/extra/slim/libpng-1.4+-support.patch b/extra/slim/libpng-1.4+-support.patch
deleted file mode 100644
index 57b39272b..000000000
--- a/extra/slim/libpng-1.4+-support.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/image.cpp 2012-06-26 04:20:14.000000000 -0400
-+++ b/image.cpp 2012-06-27 11:41:34.000000000 -0400
-@@ -781,7 +781,11 @@
- (png_infopp) NULL);
- }
-
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ if (setjmp(png_jmpbuf((png_ptr)))) {
-+#else
- if (setjmp(png_ptr->jmpbuf)) {
-+#endif
- goto png_destroy;
- }
-
diff --git a/extra/slim/logrotate b/extra/slim/logrotate
deleted file mode 100644
index 26ec3b0f4..000000000
--- a/extra/slim/logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/slim.log {
- compress
- rotate 1
- size 1024k
- notifempty
- missingok
- copytruncate
- noolddir
-}
diff --git a/extra/slim/pam.d b/extra/slim/pam.d
deleted file mode 100644
index 59db5a8c5..000000000
--- a/extra/slim/pam.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth requisite pam_nologin.so
-auth required pam_env.so
-auth required pam_unix.so
-account required pam_unix.so
-password required pam_unix.so
-session required pam_limits.so
-session required pam_unix.so
-session optional pam_loginuid.so
--session optional pam_systemd.so
diff --git a/extra/slim/ptr_pam.patch b/extra/slim/ptr_pam.patch
deleted file mode 100644
index 3a3fbcdb7..000000000
--- a/extra/slim/ptr_pam.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -aur old/app.cpp new/app.cpp
---- old/app.cpp 2010-07-08 07:04:10.000000000 +0200
-+++ new/app.cpp 2011-05-01 18:30:52.933844872 +0200
-@@ -43,8 +43,8 @@
- 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;
-+ (*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
-@@ -53,13 +53,13 @@
- case Panel::Suspend:
- case Panel::Halt:
- case Panel::Reboot:
-- resp[i]->resp=strdup("root");
-+ (*resp)[i].resp=strdup("root");
- break;
-
- case Panel::Console:
- case Panel::Exit:
- case Panel::Login:
-- resp[i]->resp=strdup(panel->GetName().c_str());
-+ (*resp)[i].resp=strdup(panel->GetName().c_str());
- break;
- }
- break;
-@@ -75,7 +75,7 @@
-
- default:
- panel->EventHandler(Panel::Get_Passwd);
-- resp[i]->resp=strdup(panel->GetPasswd().c_str());
-+ (*resp)[i].resp=strdup(panel->GetPasswd().c_str());
- break;
- }
- break;
-@@ -91,9 +91,9 @@
- }
- 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;
-+ if ((*resp)[i].resp==0) continue;
-+ free((*resp)[i].resp);
-+ (*resp)[i].resp=0;
- };
- free(*resp);
- *resp=0;
diff --git a/extra/slim/rc.d b/extra/slim/rc.d
deleted file mode 100755
index b0be7ffc5..000000000
--- a/extra/slim/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/slim`
-case "$1" in
- start)
- stat_busy "Starting Simple Login Manager"
- [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon slim
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Simple Login Manager"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon slim
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/slim/session-name.patch b/extra/slim/session-name.patch
deleted file mode 100644
index 8211c4f72..000000000
--- a/extra/slim/session-name.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp
---- slim-1.3.2.old/panel.cpp 2010-10-24 06:01:15.117000019 +0000
-+++ slim-1.3.2.new/panel.cpp 2010-10-24 17:26:30.987999967 +0000
-@@ -23,7 +23,7 @@
- Root = root;
- cfg = config;
-
-- session = "";
-+ session = cfg->nextSession(session);
-
- // Init GC
- XGCValues gcv;
-@@ -188,7 +188,7 @@
- }
-
- void Panel::ClearPanel() {
-- session = "";
-+ session = cfg->nextSession(session);
- Reset();
- XClearWindow(Dpy, Root);
- XClearWindow(Dpy, Win);
diff --git a/extra/slim/slim.service b/extra/slim/slim.service
deleted file mode 100644
index b894085a0..000000000
--- a/extra/slim/slim.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=SLiM Simple Login Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/slim -nodaemon
-
-[Install]
-Alias=display-manager.service
diff --git a/extra/slim/tty-slowness.patch b/extra/slim/tty-slowness.patch
deleted file mode 100644
index c590fbed8..000000000
--- a/extra/slim/tty-slowness.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -aur slim-1.3.2.a/app.cpp slim-1.3.2.b/app.cpp
---- slim-1.3.2.a/app.cpp 2010-08-21 15:10:13.702755711 +0200
-+++ slim-1.3.2.b/app.cpp 2010-08-21 15:10:48.579631179 +0200
-@@ -280,21 +280,22 @@
- signal(SIGALRM, AlarmSignal);
-
- #ifndef XNEST_DEBUG
-- OpenLog();
--
- if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
- daemonmode = true;
- }
-
- // Daemonize
- if (daemonmode) {
-- if (daemon(0, 1) == -1) {
-+ if (daemon(0, 0) == -1) {
- cerr << APPNAME << ": " << strerror(errno) << endl;
- exit(ERR_EXIT);
- }
-- UpdatePid();
- }
-
-+ OpenLog();
-+
-+ if (daemonmode) UpdatePid();
-+
- CreateServerAuth();
- StartServer();
- alarm(2);