Browse Source

Merge branch 'suites/experimental' into 'suites/unstable'

Suites/experimental

See merge request devuan-packages/slim!7
tags/devuan/1.3.6-5.1+devuan5
Ralph Rönnquist 1 year ago
parent
commit
aa93c16916
7 changed files with 88 additions and 25 deletions
  1. +15
    -0
      debian/changelog
  2. +1
    -1
      debian/control
  3. +0
    -23
      debian/patches/fix-hyphen-used-as-minus-sign.patch
  4. +2
    -0
      debian/patches/series
  5. +11
    -0
      debian/patches/sessreg.patch
  6. +1
    -1
      debian/patches/slim-conf.patch
  7. +58
    -0
      debian/patches/support-consolekit-runtime-detection.patch

+ 15
- 0
debian/changelog View File

@@ -1,3 +1,18 @@
slim (1.3.6-5.1+devuan3) experimental; urgency=medium

* Bump version number so that upgrades work.
* Use sessreg to update utmp, wtmp and lastlog (Closes: #302).
* Don't use bash when exec will do.

-- Mark Hindley <mark@hindley.org.uk> Tue, 05 Mar 2019 16:56:23 +0000

slim (1.3.6-5+devuan6) experimental; urgency=medium

* If consolekit is not available, fall back on logind PAM session.
* Remove unused duplicate quilt patch.

-- Mark Hindley <mark@hindley.org.uk> Mon, 11 Feb 2019 17:38:54 +0000

slim (1.3.6-5+devuan5) unstable; urgency=medium

* Update Maintainers, Uploaders, Changed-By


+ 1
- 1
debian/control View File

@@ -15,7 +15,7 @@ Architecture: any
Provides: x-display-manager
Recommends: xterm
Suggests: scrot, xauth
Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.9) | debconf-2.0, dbus, consolekit
Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.9) | debconf-2.0, dbus, consolekit | libpam-elogind | logind, x11-xserver-utils
Description: desktop-independent graphical login manager for X11
SLiM aims to be light, simple and independent from the various
desktop environments. Although completely configurable through


+ 0
- 23
debian/patches/fix-hyphen-used-as-minus-sign.patch View File

@@ -1,23 +0,0 @@
Description: Fix hyphen used as minus sign
Author: Mateusz Łukasik <mati75@linuxmint.pl>

--- a/slimlock.1
+++ b/slimlock.1
@@ -5,7 +5,7 @@
.SH SYNOPSIS
.nf
.fam C
-\fBslimlock\fP [-v]
+\fBslimlock\fP [\-v]
.fam T
.fi
.SH DESCRIPTION
@@ -25,7 +25,7 @@ slimlock.conf contains the following set
.B dpms_standby_timeout
number of seconds of inactivity before the screen blanks.
.BI "Default: " 60
-.TP
+.TP
.B dpms_off_timeout
number of seconds of inactivity before the screen is turned off.
.BI "Default: " 600

+ 2
- 0
debian/patches/series View File

@@ -5,3 +5,5 @@ no-slimlock-with-pam.patch
libslim-cmake-fixes.patch
fix-systemd-service.patch
manpage-formatting-fixes.patch
support-consolekit-runtime-detection.patch
sessreg.patch

+ 11
- 0
debian/patches/sessreg.patch View File

@@ -0,0 +1,11 @@
--- a/slim.conf
+++ b/slim.conf
@@ -42,6 +42,8 @@
#
# sessionstart_cmd some command
# sessionstop_cmd some command
+sessionstart_cmd exec /usr/bin/sessreg -a -l "$DISPLAY" %user
+sessionstop_cmd exec /usr/bin/sessreg -d -l "$DISPLAY" %user
# Start in daemon mode. Valid values: yes | no
# Note that this can be overriden by the command line

+ 1
- 1
debian/patches/slim-conf.patch View File

@@ -33,7 +33,7 @@ Index: slim/slim.conf
# i.e. for freebsd use:
# login_cmd exec /bin/sh - ~/.xinitrc %session
-login_cmd exec /bin/bash -login ~/.xinitrc %session
+login_cmd exec /bin/bash -login /etc/X11/Xsession %session
+login_cmd exec /etc/X11/Xsession %session
# Commands executed when starting and exiting a session.
# They can be used for registering a X11 session with


+ 58
- 0
debian/patches/support-consolekit-runtime-detection.patch View File

@@ -0,0 +1,58 @@
--- a/app.cpp
+++ b/app.cpp
@@ -570,8 +570,13 @@
ck.open_session(DisplayName, pw->pw_uid);
}
catch(Ck::Exception &e) {
+#ifdef USE_PAM
+ logStream << APPNAME << ": Consolekit::" << e << endl;
+ logStream << APPNAME << ": falling back to PAM session" << endl;
+#else
logStream << APPNAME << ": " << e << endl;
exit(ERR_EXIT);
+#endif
}
#endif
@@ -584,18 +589,20 @@
char** child_env = pam.getenvlist();
# ifdef USE_CONSOLEKIT
- char** old_env = child_env;
+ if (ck.get_xdg_session_cookie()) {
+ char** old_env = child_env;
- /* Grow the copy of the environment for the session cookie */
- int n;
- for(n = 0; child_env[n] != NULL ; n++);
-
- 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;
+ /* Grow the copy of the environment for the session cookie */
+ int n;
+ for(n = 0; child_env[n] != NULL ; n++);
+
+ 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;
+ }
# endif /* USE_CONSOLEKIT */
#else
@@ -663,7 +670,8 @@
#ifdef USE_CONSOLEKIT
try {
- ck.close_session();
+ if (ck.get_xdg_session_cookie())
+ ck.close_session();
}
catch(Ck::Exception &e) {
logStream << APPNAME << ": " << e << endl;

Loading…
Cancel
Save