Browse Source

Merge branch 'wip/devuan' into 'suites/experimental'

Merge LeePen/slim:wip/devuan

See merge request devuan-packages/slim!4
tags/devuan/1.3.6-5.1+devuan5
Daniel Reurich 1 year ago
parent
commit
e7b149e0d5
5 changed files with 67 additions and 24 deletions
  1. +7
    -0
      debian/changelog
  2. +1
    -1
      debian/control
  3. +0
    -23
      debian/patches/fix-hyphen-used-as-minus-sign.patch
  4. +1
    -0
      debian/patches/series
  5. +58
    -0
      debian/patches/support-consolekit-runtime-detection.patch

+ 7
- 0
debian/changelog View File

@@ -1,3 +1,10 @@
slim (1.3.6-5+devuan6) UNRELEASED; 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
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

+ 1
- 0
debian/patches/series View File

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

+ 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