From d121b6aa0b0c2711bacddea60a795dc6dcbff0fb Mon Sep 17 00:00:00 2001
From: tmacbb <liubo335@huawei.com>
Date: Thu, 10 Aug 2023 10:03:55 +0800
Subject: [PATCH] dbus:fix type of name property in interface

(cherry picked from commit 51c0d736871da1b0f260f5a1ba377a5bbc8451db)
---
 ...x-type-of-name-property-in-interface.patch | 22 +++++++++++++++++++
 keepalived.spec                               |  9 +++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 dbus-fix-type-of-name-property-in-interface.patch

diff --git a/dbus-fix-type-of-name-property-in-interface.patch b/dbus-fix-type-of-name-property-in-interface.patch
new file mode 100644
index 0000000..a46f00a
--- /dev/null
+++ b/dbus-fix-type-of-name-property-in-interface.patch
@@ -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>
diff --git a/keepalived.spec b/keepalived.spec
index 60bf9bf..064a747 100644
--- a/keepalived.spec
+++ b/keepalived.spec
@@ -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 
-- 
Gitee