[gentoo-commits] repo/gentoo:master commit in: sys-auth/polkit/, sys-auth/polkit/files/

[Michael Palimaka]

commit:     487ef5103ed45a49310282d483c41f0dcf6638e2
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Tue Jun 27 12:03:40 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 12:04:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=487ef510

sys-auth/polkit: improve elogind patch

Gentoo-bug: 622800
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-auth/polkit/files/polkit-0.113-elogind.patch   | 22 ++++++++++++++++++++--
 ...lkit-0.113-r2.ebuild => polkit-0.113-r3.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 fb142c65ce6..c822e00d24a 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
similarity index 100%
rename from sys-auth/polkit/polkit-0.113-r2.ebuild
rename to sys-auth/polkit/polkit-0.113-r3.ebuild