...
 
Commits (5)
......@@ -7,13 +7,13 @@ Uploaders:
Build-Depends:
autoconf-archive,
dbus <!nocheck>,
debhelper-compat (= 11),
debhelper-compat (= 12),
docbook-xml,
docbook-xsl,
libglib2.0-dev,
xsltproc,
Rules-Requires-Root: no
Standards-Version: 4.2.1
Standards-Version: 4.3.0
Homepage: https://github.com/flatpak/xdg-dbus-proxy
Vcs-Git: https://salsa.debian.org/debian/xdg-dbus-proxy.git
Vcs-Browser: https://salsa.debian.org/debian/xdg-dbus-proxy
......
......@@ -6,7 +6,7 @@ Most of the content here is taken from the big comment
at the top of flatpak-proxy.c, slightly rearranged
and reformatted.
(cherry picked from commit 2a0ff0e641b831e17b11d7e216aa62fa67ab13d6)
Origin: upstream, 0.1.1, commit:2a0ff0e641b831e17b11d7e216aa62fa67ab13d6
---
Makefile-docs.am | 18 +++++
Makefile.am | 5 ++
......
......@@ -4,7 +4,7 @@ Subject: Add a simple unit test
Signed-off-by: Simon McVittie <smcv@collabora.com>
Forwarded: https://github.com/flatpak/xdg-dbus-proxy/pull/5
Applied-upstream: 0.1.1, commit:79745cd52d19258ee5345b01e2c3a4ba217bce79
Applied-upstream: 0.1.1, commit:e339140bb59dae022cd30b91d785a601aa1f1aeb
---
Makefile.am | 10 +-
backport-autoptr.h | 2 +
......
......@@ -4,7 +4,7 @@ Subject: Add --help
Print the expected usage message when the --help option is used.
(cherry picked from commit 5f4b8113b374eaa658c5c457742df7e2df52c1cd)
Origin: upstream, 0.1.1, commit:5f4b8113b374eaa658c5c457742df7e2df52c1cd
---
dbus-proxy.c | 38 ++++++++++++++++++++++++++++++++++++--
1 file changed, 36 insertions(+), 2 deletions(-)
......
......@@ -4,7 +4,7 @@ Subject: Add license
Just copied over from flatpak, where this code used to live.
(cherry picked from commit d76c1ec488672cf33c9c64871ed11e81452c16ae)
Origin: upstream, 0.1.1, commit:d76c1ec488672cf33c9c64871ed11e81452c16ae
---
COPYING | 502 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 502 insertions(+)
......
......@@ -11,7 +11,7 @@ If it isn't told that usage() never returns, gcc 8 warns:
dbus-proxy.c:215:1: warning: control reaches end of non-void function [-Wreturn-type]
Signed-off-by: Simon McVittie <smcv@debian.org>
Applied-upstream: 0.1.1, commit:d70bf4c6b03a8ba04571cba96cb11ea18efb5ab1
Applied-upstream: 0.1.1, commit:fbf0208f6e6a4623b8a418bc5b6c96982dc77711
---
dbus-proxy.c | 1 +
1 file changed, 1 insertion(+)
......
......@@ -4,7 +4,7 @@ Subject: Use EXIT_SUCCESS/FAILURE
Trivial cleanup.
(cherry picked from commit 7af339ff3df9f465c0e6a390738e5520a39d5a3d)
Origin: upstream, 0.1.1, commit:7af339ff3df9f465c0e6a390738e5520a39d5a3d
---
dbus-proxy.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
......
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 12 Dec 2018 13:34:09 +0000
Subject: backport-autoptr.h: Remove redundant autoptr for
GSubprocess{,Launcher}
I added these to the "GObject-based types" section when I added the
unit test, but they were actually already in the previous section.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Applied-upstream, 0.1.1, commit:2829654fcbe82adb5dd66b1ad2c1538573dacadf
---
backport-autoptr.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/backport-autoptr.h b/backport-autoptr.h
index e78acac..21be66c 100644
--- a/backport-autoptr.h
+++ b/backport-autoptr.h
@@ -183,8 +183,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVariantIter, g_variant_iter_free)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVariantDict, g_variant_dict_unref)
G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GVariantDict, g_variant_dict_clear)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVariantType, g_variant_type_free)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GSubprocess, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GSubprocessLauncher, g_object_unref)
/* Add GObject-based types as needed. */
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GAsyncResult, g_object_unref)
......@@ -2,8 +2,8 @@ From: Simon McVittie <smcv@collabora.com>
Date: Tue, 11 Dec 2018 18:12:46 +0000
Subject: build: Put Autotools droppings in build-aux/
Applied-upstream: 0.1.1, commit:d247cf16da5f16d95da3364c701be677c9669be4
Signed-off-by: Simon McVittie <smcv@collabora.com>
Applied-upstream: 0.1.1, commit:79745cd52d19258ee5345b01e2c3a4ba217bce79
---
configure.ac | 1 +
1 file changed, 1 insertion(+)
......
......@@ -5,3 +5,7 @@ Add-a-man-page.patch
Reassure-compiler-that-parse_generic_args-always-returns-.patch
build-Put-Autotools-droppings-in-build-aux.patch
Add-a-simple-unit-test.patch
test-proxy-Add-missing-header-for-strchr-strlen.patch
test-proxy-Don-t-pass-nosyslog-to-dbus-daemon.patch
backport-autoptr.h-Remove-redundant-autoptr-for-GSubproce.patch
test-proxy-Use-backport-autoptr.h-to-work-on-older-OSs.patch
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 12 Dec 2018 13:17:21 +0000
Subject: test-proxy: Add missing header for strchr, strlen
In current Debian unstable this is brought in by some other header,
but in Ubuntu 16.04 'xenial' as used on Travis-CI that isn't the case.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Applied-upstream, 0.1.1, commit:3b6661429fd558c3d30bd61720016507ea8f73a4
---
tests/test-proxy.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/test-proxy.c b/tests/test-proxy.c
index 2644a61..efcf398 100644
--- a/tests/test-proxy.c
+++ b/tests/test-proxy.c
@@ -20,6 +20,7 @@
#include <errno.h>
#include <fcntl.h>
#include <signal.h>
+#include <string.h>
#include <glib.h>
#include <glib-unix.h>
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 12 Dec 2018 13:25:33 +0000
Subject: test-proxy: Don't pass --nosyslog to dbus-daemon
This option is unsupported in older versions.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Applied-upstream, 0.1.1, commit:aa28a35013a219e4a006a57c930955ca40c14500
---
tests/test-proxy.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/tests/test-proxy.c b/tests/test-proxy.c
index efcf398..475750f 100644
--- a/tests/test-proxy.c
+++ b/tests/test-proxy.c
@@ -68,7 +68,6 @@ setup (Fixture *f,
"--session",
"--print-address=1",
"--nofork",
- "--nosyslog",
NULL);
g_assert_no_error (error);
g_assert_nonnull (f->dbus_daemon);
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 12 Dec 2018 13:42:40 +0000
Subject: test-proxy: Use backport-autoptr.h to work on older OSs
Signed-off-by: Simon McVittie <smcv@collabora.com>
Applied-upstream, 0.1.1, commit:5e532cca1bcfd706f12eb6e188a660b9fef4a663
---
tests/test-proxy.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/test-proxy.c b/tests/test-proxy.c
index 475750f..125d1fc 100644
--- a/tests/test-proxy.c
+++ b/tests/test-proxy.c
@@ -27,6 +27,8 @@
#include <glib/gstdio.h>
#include <gio/gio.h>
+#include "backport-autoptr.h"
+
#define DBUS_SERVICE_DBUS "org.freedesktop.DBus"
#define DBUS_PATH_DBUS "/org/freedesktop/DBus"
#define DBUS_INTERFACE_DBUS "org.freedesktop.DBus"
......@@ -15,5 +15,11 @@ override_dh_auto_configure:
--libexecdir=/usr/libexec \
$(NULL)
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
chmod +x build-aux/tap-test
dh_auto_test
endif
override_dh_missing:
dh_missing --fail-missing