Version in base suite: 1.0.0-1

Base version: xssproxy_1.0.0-1
Target version: xssproxy_1.0.0-1+deb13u1
Base file: /srv/ftp-master.debian.org/ftp/pool/main/x/xssproxy/xssproxy_1.0.0-1.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/x/xssproxy/xssproxy_1.0.0-1+deb13u1.dsc

 changelog                     |    9 +++++++++
 patches/cookie-not-zero.patch |   38 ++++++++++++++++++++++++++++++++++++++
 patches/listen-path.patch     |   38 ++++++++++++++++++++++++++++++++++++++
 patches/series                |    2 ++
 4 files changed, 87 insertions(+)

diff -Nru xssproxy-1.0.0/debian/changelog xssproxy-1.0.0/debian/changelog
--- xssproxy-1.0.0/debian/changelog	2017-08-22 14:57:23.000000000 +0000
+++ xssproxy-1.0.0/debian/changelog	2025-09-27 21:35:22.000000000 +0000
@@ -1,3 +1,12 @@
+xssproxy (1.0.0-1+deb13u1) trixie; urgency=medium
+
+  * Add listen-path.patch, listening on object path
+    /org/freedesktop/ScreenSaver too (Closes: #1092965)
+  * Add cookie-not-zero.patch, avoiding problem with xdg-desktop-portal-gtk
+    (Closes: #1115458)
+
+ -- Nicolas Schodet <nico@ni.fr.eu.org>  Sat, 27 Sep 2025 23:35:22 +0200
+
 xssproxy (1.0.0-1) unstable; urgency=medium
 
   * Initial release (Closes: #872805)
diff -Nru xssproxy-1.0.0/debian/patches/cookie-not-zero.patch xssproxy-1.0.0/debian/patches/cookie-not-zero.patch
--- xssproxy-1.0.0/debian/patches/cookie-not-zero.patch	1970-01-01 00:00:00.000000000 +0000
+++ xssproxy-1.0.0/debian/patches/cookie-not-zero.patch	2025-09-27 21:35:12.000000000 +0000
@@ -0,0 +1,38 @@
+From: Nicolas Schodet <nico@ni.fr.eu.org>
+Last-Update: 2025-09-27
+Subject: Do not use cookie with a zero value
+
+Bug: https://github.com/vincentbernat/xssproxy/pull/10
+Bug-Debian: https://bugs.debian.org/1115458
+Applied-Upstream: 1.1.2
+
+This causes problems at least for xdg-desktop-portal-gtk, see
+https://github.com/flatpak/xdg-desktop-portal-gtk/issues/528.
+
+Avoid the problem by not using zero value.
+---
+ xssproxy.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/xssproxy.c b/xssproxy.c
+index 62966ed..cceb068 100644
+--- a/xssproxy.c
++++ b/xssproxy.c
+@@ -145,13 +145,14 @@ uint32_t inhibit_request(const char *app)
+     int i;
+     for (i=0; i<cookies->len; i++)
+     {
+-        if (i != g_array_index(cookies, uint32_t, i))
++        if (i + 1 != g_array_index(cookies, uint32_t, i))
+         {
+             break;
+         }
+     }
+-    g_array_insert_val(cookies, i, i);
+-    return i;
++    uint32_t cookie = i + 1;
++    g_array_insert_val(cookies, i, cookie);
++    return cookie;
+ }
+ 
+ void handle_inhibit(DBusConnection *conn, DBusMessage *msg)
diff -Nru xssproxy-1.0.0/debian/patches/listen-path.patch xssproxy-1.0.0/debian/patches/listen-path.patch
--- xssproxy-1.0.0/debian/patches/listen-path.patch	1970-01-01 00:00:00.000000000 +0000
+++ xssproxy-1.0.0/debian/patches/listen-path.patch	2025-09-27 21:34:41.000000000 +0000
@@ -0,0 +1,38 @@
+Description: Listen on object path `/org/freedesktop/ScreenSaver` too
+Origin: upstream, https://github.com/vincentbernat/xssproxy/commit/8990c56b706f0faf1ec8ca974a8ba64f37c2b1b3
+Bug: https://github.com/vincentbernat/xssproxy/issues/9
+Bug-Debian: https://bugs.debian.org/1092965
+Last-Update: 2023-11-11
+Applied-Upstream: 1.1.1
+
+The freedesktop.org spec doesn't mention which object path the methods
+are supposed to be called on. xssproxy currently listens on
+`/ScreenSaver`, but Chromium wants the ["conventional"][1]
+`/org/freedesktop/ScreenSaver` path instead.
+
+There's no reason we can't listen on both, so let's do that.
+
+[1]: https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names-bus
+---
+ xssproxy.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/xssproxy.c b/xssproxy.c
+index 8bef8d0..2541c5d 100644
+--- a/xssproxy.c
++++ b/xssproxy.c
+@@ -280,6 +280,11 @@ DBusConnection *dbus_conn_init()
+         &vtable, NULL, &err);
+     check_and_exit(&err);
+ 
++    dbus_connection_try_register_object_path(conn,
++        "/org/freedesktop/ScreenSaver",
++        &vtable, NULL, &err);
++    check_and_exit(&err);
++
+     return conn;
+ }
+ 
+-- 
+2.47.2
+
diff -Nru xssproxy-1.0.0/debian/patches/series xssproxy-1.0.0/debian/patches/series
--- xssproxy-1.0.0/debian/patches/series	2017-08-22 14:57:23.000000000 +0000
+++ xssproxy-1.0.0/debian/patches/series	2025-09-27 21:35:12.000000000 +0000
@@ -1 +1,3 @@
 install.patch
+listen-path.patch
+cookie-not-zero.patch