Am 05.09.2016 um 21:01 schrieb Adam D. Barratt: > Hi, > > On Mon, 2016-09-05 at 18:16 +0200, Michael Biebl wrote: >> sd_uid_get_state() is apparently broken in jessie with systemd-logind >> under sysvinit. This was fixed in a later systemd version, that's why >> no-one ever noticed it in unstable/testing. >> >> debian/patches/0.113/sessionmonitor-systemd-Use-sd_uid_get_state-to-check.patch >> and >> debian/patches/0.113/sessionmonitor-systemd-prepare-for-D-Bus-user-bus-mo.patch >> >> where added to support the systemd --user / D-Bus user model. >> This is not really a concern for jessie though. >> >> So my proposal would be, to simply disable those two particular patches. >> Those would be the only change between policykit-1/0.105-15~deb8u1 and >> deb8u2. >> >> Does that sound ok to you? > > Yes, please feel free to upload that; thanks. I've uploaded policykit-1_0.105-15~deb8u2 debdiff is attached Regards, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff --git a/debian/changelog b/debian/changelog
index bcee1a2..05e81b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+policykit-1 (0.105-15~deb8u2) stable; urgency=medium
+
+ * Disable 0.113/sessionmonitor-systemd-prepare-for-D-Bus-user-bus-mo.patch
+ and 0.113/sessionmonitor-systemd-Use-sd_uid_get_state-to-check.patch.
+ Those two patches add support for `systemd --user` sessions and the D-Bus
+ user model. For that they rely on sd_uid_get_state() which seems to be
+ broken in Jessie when logind is running under sysvinit. Since those
+ features are not yet needed in Jessie, do not apply those patches.
+ (Closes: #825956)
+
+ -- Michael Biebl <biebl@debian.org> Tue, 06 Sep 2016 17:53:11 +0200
+
policykit-1 (0.105-15~deb8u1) stable; urgency=medium
* Upload to stable.
diff --git a/debian/patches/10_build-against-libsystemd.patch b/debian/patches/10_build-against-libsystemd.patch
index 6230a63..a95b688 100644
--- a/debian/patches/10_build-against-libsystemd.patch
+++ b/debian/patches/10_build-against-libsystemd.patch
@@ -8,11 +8,11 @@ Forwarded: no, obsoleted by upstream commit 2291767a014f5a04a92ca6f0eb472794f212
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index 388605d..f55ddb7 100644
+Index: b/configure.ac
+===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -160,7 +160,7 @@ AC_ARG_ENABLE([systemd],
+@@ -160,14 +160,14 @@
[enable_systemd=auto])
if test "$enable_systemd" != "no"; then
PKG_CHECK_MODULES(SYSTEMD,
@@ -21,8 +21,7 @@ index 388605d..f55ddb7 100644
have_systemd=yes,
have_systemd=no)
if test "$have_systemd" = "yes"; then
-@@ -171,7 +171,7 @@ if test "$enable_systemd" != "no"; then
- LIBS=$save_LIBS
+ SESSION_TRACKING=systemd
else
if test "$enable_systemd" = "yes"; then
- AC_MSG_ERROR([systemd support requested but libsystemd-login1 library not found])
diff --git a/debian/patches/series b/debian/patches/series
index bb91422..960bff9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,11 +12,11 @@
0.113/Fixed-compilation-problem-in-the-backend.patch
0.113/Don-t-discard-error-data-returned-by-polkit_system_b.patch
0.113/sessionmonitor-systemd-Deduplicate-code-paths.patch
-0.113/sessionmonitor-systemd-prepare-for-D-Bus-user-bus-mo.patch
+#0.113/sessionmonitor-systemd-prepare-for-D-Bus-user-bus-mo.patch
0.113/Refuse-duplicate-user-arguments-to-pkexec.patch
0.113/00git_fix_memleak.patch
0.113/00git_invalid_object_paths.patch
-0.113/sessionmonitor-systemd-Use-sd_uid_get_state-to-check.patch
+#0.113/sessionmonitor-systemd-Use-sd_uid_get_state-to-check.patch
0.113/Fix-a-possible-NULL-dereference.patch
0.113/Fix-duplicate-GError-use-when-uid-is-missing.patch
0.113/Fix-a-crash-when-two-authentication-requests-are-in-.patch
Attachment:
signature.asc
Description: OpenPGP digital signature