commit: 10dac99b679c3c105be855afc5e75b3a179c4885 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Sep 8 21:15:49 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Sep 8 21:16:01 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10dac99b
sys-apps/systemd: backport patch for dbus error in logind Closes: https://bugs.gentoo.org/630424 Package-Manager: Portage-2.3.6_p60, Repoman-2.3.3_p38 ...-sure-we-don-t-process-the-same-method-ca.patch | 29 ++++++++++++++++++++++ ...systemd-234-r3.ebuild => systemd-234-r4.ebuild} | 1 + 2 files changed, 30 insertions(+) diff --git a/sys-apps/systemd/files/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch b/sys-apps/systemd/files/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch new file mode 100644 index 00000000000..97230f9dd2a --- /dev/null +++ b/sys-apps/systemd/files/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch @@ -0,0 +1,29 @@ +From f7d27d130eaac222b2d11c4d4415c9b599934da8 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lenn...@poettering.net> +Date: Sat, 26 Aug 2017 15:19:26 +0200 +Subject: [PATCH] logind: make sure we don't process the same method call twice + (#6583) + +Tiny mistake, big effect. + +Fixes: #6375 +--- + src/login/logind-session-dbus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c +index 22e5349a6..649f3c155 100644 +--- a/src/login/logind-session-dbus.c ++++ b/src/login/logind-session-dbus.c +@@ -457,7 +457,7 @@ static int method_take_device(sd_bus_message *message, void *userdata, sd_bus_er + goto error; + + session_save(s); +- return 0; ++ return 1; + + error: + session_device_free(sd); +-- +2.14.1 + diff --git a/sys-apps/systemd/systemd-234-r3.ebuild b/sys-apps/systemd/systemd-234-r4.ebuild similarity index 99% rename from sys-apps/systemd/systemd-234-r3.ebuild rename to sys-apps/systemd/systemd-234-r4.ebuild index 15bf64cd732..2582732b6cc 100644 --- a/sys-apps/systemd/systemd-234-r3.ebuild +++ b/sys-apps/systemd/systemd-234-r4.ebuild @@ -151,6 +151,7 @@ src_prepare() { "${FILESDIR}"/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch "${FILESDIR}"/234-0002-cryptsetup-fix-infinite-timeout-6486.patch "${FILESDIR}"/234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch + "${FILESDIR}"/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch ) if ! use vanilla; then
