diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-06-13 14:50:49 +0200 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-06-13 14:50:49 +0200 |
| commit | c779e019ac53019baa07eb843aba59bc55ffec20 (patch) | |
| tree | f4dd959f71cea6ac6a8741a1a8f9933a389f5bc7 /deps/elogind | |
| parent | e0d005c66dbed44be15070995d9d9e9200c989fa (diff) | |
| download | ktown-c779e019ac53019baa07eb843aba59bc55ffec20.tar.gz ktown-c779e019ac53019baa07eb843aba59bc55ffec20.tar.xz | |
Updated 'testing' in preparation for June '18 release of Plasma 5.13
Diffstat (limited to 'deps/elogind')
| -rwxr-xr-x | deps/elogind/elogind.SlackBuild | 5 | ||||
| -rw-r--r-- | deps/elogind/patches/elogind-219.12-runtime.patch | 46 |
2 files changed, 49 insertions, 2 deletions
diff --git a/deps/elogind/elogind.SlackBuild b/deps/elogind/elogind.SlackBuild index 042ba8f..b9d2d70 100755 --- a/deps/elogind/elogind.SlackBuild +++ b/deps/elogind/elogind.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # Copyright 2016 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2016 Eric Hameleers, Eindhoven, NL +# Copyright 2016, 2017 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -25,7 +25,7 @@ PKGNAM=elogind VERSION=${VERSION:-219.14} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -91,6 +91,7 @@ sed -i src/login/org.freedesktop.login1.service \ # Apply Gentoo patches: #cat $CWD/patches/elogind-219.12-session.patch | patch -p1 --verbose || exit 1 +cat $CWD/patches/elogind-219.12-runtime.patch | patch -p1 --verbose || exit 1 cat $CWD/patches/elogind-lrt.patch | patch -p1 --verbose || exit 1 cat $CWD/patches/elogind-docs.patch | patch -p1 --verbose || exit 1 # Merge a pull request for an upstream fix: diff --git a/deps/elogind/patches/elogind-219.12-runtime.patch b/deps/elogind/patches/elogind-219.12-runtime.patch new file mode 100644 index 0000000..985dc57 --- /dev/null +++ b/deps/elogind/patches/elogind-219.12-runtime.patch @@ -0,0 +1,46 @@ +Taken from Gentoo: +https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-auth/elogind/files/elogind-219.12-runtime.patch + +From 276746896985c438d317fcae414e9c83a6dd3d76 Mon Sep 17 00:00:00 2001 +From: Sven Eden <yamakuzure@gmx.net> +Date: Fri, 20 Jan 2017 17:14:35 +0100 +Subject: [PATCH] Create /run/systemd as needed + +* src/login/logind.c (main): Also create /run/systemd at startup. +* Create /run/systemd/machines, so that the login monitor works. +* Fail if any of the needed directories could not be created. +* But do not fail if any of the needed directories exist. +--- + src/login/logind.c | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +diff --git a/src/login/logind.c b/src/login/logind.c +index 1ab50ec..07a77b1 100644 +--- a/src/login/logind.c ++++ b/src/login/logind.c +@@ -1131,10 +1131,21 @@ int main(int argc, char *argv[]) { + * existence of /run/systemd/seats/ to determine whether + * logind is available, so please always make sure this check + * stays in. */ +- mkdir_label("/run/systemd/seats", 0755); +- mkdir_label("/run/systemd/users", 0755); +- mkdir_label("/run/systemd/sessions", 0755); +- mkdir_label("/run/systemd/machines", 0755); ++ r = mkdir_label("/run/systemd", 0755); ++ if ( (r < 0) && (-EEXIST != r) ) ++ return log_error_errno(r, "Failed to create /run/systemd : %m"); ++ r = mkdir_label("/run/systemd/seats", 0755); ++ if ( r < 0 && (-EEXIST != r) ) ++ return log_error_errno(r, "Failed to create /run/systemd/seats : %m"); ++ r = mkdir_label("/run/systemd/users", 0755); ++ if ( r < 0 && (-EEXIST != r) ) ++ return log_error_errno(r, "Failed to create /run/systemd/users : %m"); ++ r = mkdir_label("/run/systemd/sessions", 0755); ++ if ( r < 0 && (-EEXIST != r) ) ++ return log_error_errno(r, "Failed to create /run/systemd/sessions : %m"); ++ r = mkdir_label("/run/systemd/machines", 0755); ++ if ( r < 0 && (-EEXIST != r) ) ++ return log_error_errno(r, "Failed to create /run/systemd/machines : %m"); + + m = manager_new(); + if (!m) { |