diff --git a/.gitignore b/.gitignore index 58ba81a..5cf4f30 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /xdg-dbus-proxy-0.1.2.tar.xz /xdg-dbus-proxy-0.1.3.tar.xz /xdg-dbus-proxy-0.1.4.tar.xz +/xdg-dbus-proxy-0.1.5.tar.xz diff --git a/0001-flatpak-proxy-Fix-D-Bus-disconnection-with-overly-lo.patch b/0001-flatpak-proxy-Fix-D-Bus-disconnection-with-overly-lo.patch deleted file mode 100644 index b37c045..0000000 --- a/0001-flatpak-proxy-Fix-D-Bus-disconnection-with-overly-lo.patch +++ /dev/null @@ -1,37 +0,0 @@ -From dea3530414f8d118e64f8ae408eb19f479abc082 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Thu, 20 Jul 2023 14:48:41 +0200 -Subject: [PATCH] flatpak-proxy: Fix D-Bus disconnection with overly long - object paths - -According to the D-Bus specifications: -https://dbus.freedesktop.org/doc/dbus-specification.html#id-1.4.4 -For the STRING and OBJECT_PATH types, [the data length] is encoded in 4 -bytes (a UINT32). - -But the code was trying to parse the 32-bit integer as an 8-bit one, -meaning that, as was the case with object paths created by the dLeyna -project, a 259-byte long string would be parsed like a 3-byte long -one. - -Fixes: 004b7b2ca0e9 ("Parse dbus headers") in flatpak ---- - flatpak-proxy.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/flatpak-proxy.c b/flatpak-proxy.c -index 48781560c8bc..47e51df3df40 100644 ---- a/flatpak-proxy.c -+++ b/flatpak-proxy.c -@@ -1116,7 +1116,7 @@ get_signature (Buffer *buffer, guint32 *offset, guint32 end_offset) - static const char * - get_string (Buffer *buffer, Header *header, guint32 *offset, guint32 end_offset) - { -- guint8 len; -+ guint32 len; - char *str; - - *offset = align_by_4 (*offset); --- -2.41.0 - diff --git a/sources b/sources index e2b7d38..3d3af95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xdg-dbus-proxy-0.1.4.tar.xz) = d50fa916d07f23e080ab53cf290b5d6db73cfd8262253a48b9f012ce6c182e201d0a67efaeb7f28a844d3ef146aa48936dfbe4279a59b909a6dc4419d5f15b04 +SHA512 (xdg-dbus-proxy-0.1.5.tar.xz) = 4b079c060aa4c1d7f305216d03166b9edc19cb73ef1230e14a882f07a6400929f62afc8535338c8560ea032a519c0934fbc69533f5bebb555fecb8f090330a33 diff --git a/xdg-dbus-proxy.spec b/xdg-dbus-proxy.spec index de9ff01..8b2bc1b 100644 --- a/xdg-dbus-proxy.spec +++ b/xdg-dbus-proxy.spec @@ -1,6 +1,6 @@ Name: xdg-dbus-proxy -Version: 0.1.4 -Release: 2%{?dist} +Version: 0.1.5 +Release: 1%{?dist} Summary: Filtering proxy for D-Bus connections License: LGPLv2+ @@ -17,9 +17,6 @@ BuildRequires: /usr/bin/xsltproc Requires: dbus -# https://github.com/flatpak/xdg-dbus-proxy/pull/50 -Patch0: 0001-flatpak-proxy-Fix-D-Bus-disconnection-with-overly-lo.patch - %description xdg-dbus-proxy is a filtering proxy for D-Bus connections. It was originally part of the flatpak project, but it has been broken out as a standalone module @@ -41,6 +38,9 @@ to facilitate using it in other contexts. %{_mandir}/man1/xdg-dbus-proxy.1* %changelog +* Mon Aug 07 2023 Kalev Lember - 0.1.5-1 +- Update to 0.1.5 (rhbz#2229713) + * Wed Jul 19 2023 Bastien Nocera - 0.1.4-2 - Fix D-Bus disconnection when an object path was overly long