!39 dbus: backport patch from upstream

From: @tmacbb 
Reviewed-by: @sunsuwan 
Signed-off-by: @sunsuwan
This commit is contained in:
openeuler-ci-bot 2023-08-10 03:11:21 +00:00 committed by Gitee
commit 10a8ccb103
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,22 @@
From 367c652758bf0b5ce567e775b710cb0164966528 Mon Sep 17 00:00:00 2001
From: Jeltz <89084173+koh6uawi@users.noreply.github.com>
Date: Tue, 4 Apr 2023 15:05:18 +0200
Subject: [PATCH] dbus: fix type of Name property in Interface
---
keepalived/dbus/org.keepalived.Vrrp1.Instance.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/keepalived/dbus/org.keepalived.Vrrp1.Instance.xml b/keepalived/dbus/org.keepalived.Vrrp1.Instance.xml
index ed5798a56..4e6b4f8f7 100644
--- a/keepalived/dbus/org.keepalived.Vrrp1.Instance.xml
+++ b/keepalived/dbus/org.keepalived.Vrrp1.Instance.xml
@@ -25,7 +25,7 @@
<signal name='VrrpStatusChange'>
<arg type='u' name='status' />
</signal>
- <property type='s' name='Name' access='read' />
+ <property type='(s)' name='Name' access='read' />
<property type='(us)' name='State' access='read' />
</interface>
</node>

View File

@ -9,7 +9,7 @@
Name: keepalived
Version: 2.2.4
Release: 3
Release: 4
Summary: High Availability monitor built upon LVS, VRRP and service pollers
License: GPLv2+
URL: http://www.keepalived.org/
@ -27,6 +27,7 @@ Patch0005: Fix-segfault-when-receive-netlink-message-for-static.patch
Patch0006: vrrp-deley-freeing-vrrp-instances-until-all-referenc.patch
Patch0007: check-use-last-entry-if-duplicate-definition.patch
Patch0008: check-fix-further-memory-leaks-when-configuration-is.patch
Patch0009: dbus-fix-type-of-name-property-in-interface.patch
Requires(post): systemd
Requires(preun): systemd
@ -111,6 +112,12 @@ install -Dd -m 0755 %{buildroot}%{_libexecdir}/keepalived
%{_mandir}/man*
%changelog
* Thu Aug 10 2023 liubo <liubo335@huawei.com> - 2.2.4-4
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:dbus:fix type of name property in interface
* Mon Jun 12 2023 sunsuwan <sunsuwan3@huawei.com> - 2.2.4-3
- Type:CVE
- ID:NA