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.
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 <kilob...@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č <m...@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 <calva...@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
>From 5abd436741827a3b3920a1df4c95682bbefb8648 Mon Sep 17 00:00:00 2001 From: Adam Borowski <kilob...@angband.pl> Date: Thu, 14 Jan 2016 06:34:08 +0100 Subject: [PATCH 1/2] Fix FTBFS on non-linux/non-systemd. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This uses Christian Seiler's version on the patch, sans unescaping UTF-8 in Miloslav Trmač's name. --- ...rd-error-data-returned-by-polkit_system_b.patch | 29 ++++++++++++++++++++++ .../Fixed-compilation-problem-in-the-backend.patch | 26 +++++++++++++++++++ debian/patches/series | 2 ++ 3 files changed, 57 insertions(+) create mode 100644 debian/patches/0.113/Don-t-discard-error-data-returned-by-polkit_system_b.patch create mode 100644 debian/patches/0.113/Fixed-compilation-problem-in-the-backend.patch diff --git a/debian/patches/0.113/Don-t-discard-error-data-returned-by-polkit_system_b.patch b/debian/patches/0.113/Don-t-discard-error-data-returned-by-polkit_system_b.patch new file mode 100644 index 0000000..e49e47e --- /dev/null +++ b/debian/patches/0.113/Don-t-discard-error-data-returned-by-polkit_system_b.patch @@ -0,0 +1,29 @@ +From: Miloslav Trmač <m...@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 --git a/debian/patches/0.113/Fixed-compilation-problem-in-the-backend.patch b/debian/patches/0.113/Fixed-compilation-problem-in-the-backend.patch new file mode 100644 index 0000000..5e37113 --- /dev/null +++ b/debian/patches/0.113/Fixed-compilation-problem-in-the-backend.patch @@ -0,0 +1,26 @@ +From: Xabier Rodriguez Calvar <calva...@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 --git a/debian/patches/series b/debian/patches/series index b28f628..bb91422 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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 -- 2.7.0.rc3
>From c99f6b08cc0238dd0771ff326c947bbc7d8230b5 Mon Sep 17 00:00:00 2001 From: Adam Borowski <kilob...@angband.pl> Date: Thu, 14 Jan 2016 06:35:42 +0100 Subject: [PATCH 2/2] releasing package policykit-1 version 0.105-14.1 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index b4f8b6b..ceaa401 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <kilob...@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 -- 2.7.0.rc3
