Compare commits

..

No commits in common. "7cab46164e5c0398ae28a71de50eef4c427eebf8" and "dcdfeb1ef44fca2aff5b02d2e85c0d254774b346" have entirely different histories.

5 changed files with 37 additions and 25 deletions

View File

@ -0,0 +1,31 @@
From f52e1f5c91a02b581abaad312134740d590c4270 Mon Sep 17 00:00:00 2001
From: Zhipeng Xie <xiezhipeng1@huawei.com>
Date: Tue, 10 Apr 2018 11:46:38 +0800
Subject: [PATCH] Fix double free for data.channel
Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
---
dbus/dbus-binding-tool-glib.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dbus/dbus-binding-tool-glib.c b/dbus/dbus-binding-tool-glib.c
index ff0bb47..6d1c032 100644
--- a/dbus/dbus-binding-tool-glib.c
+++ b/dbus/dbus-binding-tool-glib.c
@@ -870,11 +870,13 @@ dbus_binding_tool_output_glib_server (BaseInfo *info, GIOChannel *channel, const
ret = FALSE;
g_io_channel_shutdown (data.channel, TRUE, error);
g_io_channel_unref (data.channel);
+ data.channel = NULL;
goto io_lose;
}
g_io_channel_shutdown (data.channel, TRUE, error);
g_io_channel_unref (data.channel);
+ data.channel = NULL;
/* Now spawn glib-genmarshal to insert all our required marshallers */
argv = g_ptr_array_new ();
--
1.7.12.4

BIN
dbus-glib-0.110.tar.gz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,14 +1,14 @@
Name: dbus-glib
Version: 0.112
Release: 3
Version: 0.110
Release: 5
Summary: GLib bindings for DBUS
License: AFL-2.1 and GPLv2+
License: AFL and GPLv2+
URL: http://www.freedesktop.org/software/dbus/
Source0: https://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz
Patch6000: 0001-Fix-double-free-for-data.channel.patch
BuildRequires: gcc gettext chrpath
BuildRequires: gcc git gettext chrpath
BuildRequires: pkgconfig(dbus-1) >= 1.8 pkgconfig(glib-2.0) >= 2.40.0 expat-devel >= 1.95.5
BuildRequires: dbus-daemon
%description
The D-Bus GLib package contains GLib interfaces to the D-Bus API.
@ -30,7 +30,7 @@ Requires: man
The %{name}-help package contains doc files for %{name}.
%prep
%autosetup -n %{name}-%{version} -p1
%autosetup -n %{name}-%{version} -p1 -S git
%build
%configure --enable-tests --enable-asserts --disable-gtk-doc --disable-static
@ -74,21 +74,6 @@ make check
%{_datadir}/gtk-doc/html/%{name}
%changelog
* Mon Jan 30 2023 Wenlong Zhang <zhangwenlong@loongson.cn> - 0.112-3
- add BuildRequires of dbus-daemon to fix the error dbus-run-session not found
* Thu Jun 2 2022 Chenyx <chenyixiong3@huawei.com> - 0.112-2
- License compliance rectification
* Wed Dec 29 2021 zoulin <zoulin13@huawei.com> - 0.112-1
- Type: enhancement
- ID: NA
- SUG: NA
- DESC: update version to 0.112
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 0.110-6
- DESC: delete -S git from %autosetup, and delete BuildRequires git
* Mon Sep 30 2019 luhuaxin <luhuaxin@huawei.com> - 0.110-5
- Type: enhancement
- ID: NA

View File

@ -1,4 +0,0 @@
version_control: git
src_repo: https://gitlab.freedesktop.org/dbus/dbus-glib.git
tag_prefix: "^dbus-glib-"
seperator: "."