diff options
author | Sven Eden <yamakuzure@gmx.net> | 2017-06-27 22:03:40 +1000 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2017-06-27 22:04:19 +1000 |
commit | 487ef5103ed45a49310282d483c41f0dcf6638e2 (patch) | |
tree | c8a63465a83049214835ec079787da2968524498 /sys-auth/polkit | |
parent | dev-ml/ocaml-ctypes: keyword ~arm64 (diff) | |
download | gentoo-487ef5103ed45a49310282d483c41f0dcf6638e2.tar.gz gentoo-487ef5103ed45a49310282d483c41f0dcf6638e2.tar.bz2 gentoo-487ef5103ed45a49310282d483c41f0dcf6638e2.zip |
sys-auth/polkit: improve elogind patch
Gentoo-bug: 622800
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'sys-auth/polkit')
-rw-r--r-- | sys-auth/polkit/files/polkit-0.113-elogind.patch | 22 | ||||
-rw-r--r-- | sys-auth/polkit/polkit-0.113-r3.ebuild (renamed from sys-auth/polkit/polkit-0.113-r2.ebuild) | 0 |
2 files changed, 20 insertions, 2 deletions
diff --git a/sys-auth/polkit/files/polkit-0.113-elogind.patch b/sys-auth/polkit/files/polkit-0.113-elogind.patch index fb142c65ce6e..c822e00d24a7 100644 --- a/sys-auth/polkit/files/polkit-0.113-elogind.patch +++ b/sys-auth/polkit/files/polkit-0.113-elogind.patch @@ -117,8 +117,8 @@ $(NULL) libpolkit_gobject_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)' ---- a/src/polkitbackend/polkitbackendjsauthority.c 2016-11-04 04:44:29.650112018 +0100 -+++ b/src/polkitbackend/polkitbackendjsauthority.c 2016-11-04 04:44:58.283111505 +0100 +--- a/src/polkitbackend/polkitbackendjsauthority.c 2017-06-27 09:22:03.375841040 +0200 ++++ b/src/polkitbackend/polkitbackendjsauthority.c 2017-06-27 09:25:33.815845141 +0200 @@ -39,6 +39,10 @@ #include <systemd/sd-login.h> #endif /* HAVE_LIBSYSTEMD */ @@ -130,6 +130,24 @@ #include <jsapi.h> #include "initjs.h" /* init.js */ +@@ -793,7 +797,7 @@ + g_assert_not_reached (); + } + +-#ifdef HAVE_LIBSYSTEMD ++#if defined(HAVE_LIBSYSTEMD) || defined(HAVE_LIBELOGIND) + if (sd_pid_get_session (pid, &session_str) == 0) + { + if (sd_session_get_seat (session_str, &seat_str) == 0) +@@ -801,7 +805,7 @@ + /* do nothing */ + } + } +-#endif /* HAVE_LIBSYSTEMD */ ++#endif /* HAVE_LIBSYSTEMD or HAVE_LIBELOGIND */ + + g_assert (POLKIT_IS_UNIX_USER (user_for_subject)); + uid = polkit_unix_user_get_uid (POLKIT_UNIX_USER (user_for_subject)); --- a/src/polkitbackend/polkitbackendsessionmonitor-systemd.c 2016-11-04 04:44:29.650112018 +0100 +++ b/src/polkitbackend/polkitbackendsessionmonitor-systemd.c 2016-11-04 04:46:52.718109455 +0100 @@ -25,7 +25,11 @@ diff --git a/sys-auth/polkit/polkit-0.113-r2.ebuild b/sys-auth/polkit/polkit-0.113-r3.ebuild index 71f994020fb9..71f994020fb9 100644 --- a/sys-auth/polkit/polkit-0.113-r2.ebuild +++ b/sys-auth/polkit/polkit-0.113-r3.ebuild |