[Pkg-utopia-maintainers] Bug#798769: NMU in DELAYED/7

Thu Jan 14 05:43:25 UTC 2016

Hi!
Now that I can do it myself, I've prepared a NMU and scheduled it for 7 days
from now.  If you're unhappy with this, please say so.

Debdiff attached, and so are two commits against
ssh://git.debian.org/git/pkg-utopia/policykit.git

-- 
A tit a day keeps the vet away.
-------------- next part --------------
diff -Nru policykit-1-0.105/debian/changelog policykit-1-0.105/debian/changelog

--- policykit-1-0.105/debian/changelog	2015-11-23 11:38:06.000000000 +0100
+++ policykit-1-0.105/debian/changelog	2016-01-14 06:29:13.000000000 +0100
@@ -1,3 +1,10 @@
+policykit-1 (0.105-14.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS on non-linux/non-systemd. (Closes: #798769)
+
+ -- Adam Borowski <kilobyte at angband.pl>  Thu, 14 Jan 2016 06:28:38 +0100
+
 policykit-1 (0.105-14) unstable; urgency=medium
 
   * debian/policykit-1.preinst: Use systemctl unmask instead of direct symlink
diff -Nru policykit-1-0.105/debian/patches/0.113/Don-t-discard-error-data-returned-by-polkit_system_b.patch policykit-1-0.105/debian/patches/0.113/Don-t-discard-error-data-returned-by-polkit_system_b.patch
--- policykit-1-0.105/debian/patches/0.113/Don-t-discard-error-data-returned-by-polkit_system_b.patch	1970-01-01 01:00:00.000000000 +0100
+++ policykit-1-0.105/debian/patches/0.113/Don-t-discard-error-data-returned-by-polkit_system_b.patch	2016-01-14 06:25:07.000000000 +0100
@@ -0,0 +1,29 @@
+From: Miloslav Trma? <mitr at redhat.com>
+Date: Mon, 11 Nov 2013 23:51:23 +0100
+Subject: [PATCH] Don't discard error data returned by
+ polkit_system_bus_name_get_user_sync
+
+https://bugs.freedesktop.org/show_bug.cgi?id=71458
+
+Origin: upstream, 0.113, commit: 145d43b9c891f248ad68ebe597cb151a865bdb3a
+Bug-Debian: https://bugs.debian.org/798769
+---
+ src/polkitbackend/polkitbackendsessionmonitor.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/polkitbackend/polkitbackendsessionmonitor.c b/src/polkitbackend/polkitbackendsessionmonitor.c
+index 05f51c5..e1a9ab3 100644
+--- a/src/polkitbackend/polkitbackendsessionmonitor.c
++++ b/src/polkitbackend/polkitbackendsessionmonitor.c
+@@ -306,7 +306,7 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor
+     }
+   else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
+     {
+-      ret = (PolkitIdentity*)polkit_system_bus_name_get_user_sync (POLKIT_SYSTEM_BUS_NAME (subject), NULL, NULL);
++      ret = (PolkitIdentity*)polkit_system_bus_name_get_user_sync (POLKIT_SYSTEM_BUS_NAME (subject), NULL, error);
+     }
+   else if (POLKIT_IS_UNIX_SESSION (subject))
+     {
+-- 
+2.1.4
+
diff -Nru policykit-1-0.105/debian/patches/0.113/Fixed-compilation-problem-in-the-backend.patch policykit-1-0.105/debian/patches/0.113/Fixed-compilation-problem-in-the-backend.patch
--- policykit-1-0.105/debian/patches/0.113/Fixed-compilation-problem-in-the-backend.patch	1970-01-01 01:00:00.000000000 +0100
+++ policykit-1-0.105/debian/patches/0.113/Fixed-compilation-problem-in-the-backend.patch	2016-01-14 06:02:23.000000000 +0100
@@ -0,0 +1,26 @@
+From: Xabier Rodriguez Calvar <calvaris at igalia.com>
+Date: Sun, 10 Nov 2013 19:16:41 +0100
+Subject: [PATCH] Fixed compilation problem in the backend
+
+Origin: upstream, 0.113, commit: dbbb7dc60abdd970af0a8fae404484181fa909c9
+Bug-Debian: https://bugs.debian.org/798769
+---
+ src/polkitbackend/polkitbackendsessionmonitor.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/polkitbackend/polkitbackendsessionmonitor.c b/src/polkitbackend/polkitbackendsessionmonitor.c
+index 4075d3f..05f51c5 100644
+--- a/src/polkitbackend/polkitbackendsessionmonitor.c
++++ b/src/polkitbackend/polkitbackendsessionmonitor.c
+@@ -306,7 +306,7 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor
+     }
+   else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
+     {
+-      ret = (PolkitIdentity*)polkit_system_bus_name_get_user_sync (POLKIT_SYSTEM_BUS_NAME (subject));
++      ret = (PolkitIdentity*)polkit_system_bus_name_get_user_sync (POLKIT_SYSTEM_BUS_NAME (subject), NULL, NULL);
+     }
+   else if (POLKIT_IS_UNIX_SESSION (subject))
+     {
+-- 
+2.1.4
+
diff -Nru policykit-1-0.105/debian/patches/series policykit-1-0.105/debian/patches/series
--- policykit-1-0.105/debian/patches/series	2015-11-23 11:38:06.000000000 +0100
+++ policykit-1-0.105/debian/patches/series	2016-01-14 06:02:23.000000000 +0100
@@ -9,6 +9,8 @@
 0.113/03_PolkitAgentSession-fix-race-between-child-and-io-wat.patch
 0.113/polkitd-Fix-problem-with-removing-non-existent-sourc.patch
 0.113/PolkitSystemBusName-Add-public-API-to-retrieve-Unix-.patch
+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/Refuse-duplicate-user-arguments-to-pkexec.patch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Fix-FTBFS-on-non-linux-non-systemd.patch
Type: text/x-diff
Size: 4452 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-utopia-maintainers/attachments/20160114/218d04da/attachment.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-releasing-package-policykit-1-version-0.105-14.1.patch
Type: text/x-diff
Size: 797 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-utopia-maintainers/attachments/20160114/218d04da/attachment-0001.patch>
