From ac5bd5dc7d5e81e8f8dd2620f4f248be877aa4c6 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sat, 3 Dec 2022 04:10:38 +0000
Subject: [PATCH] import fence-virt-1.0.0-6.el8

---
 ...virtd-update-fence_virt.conf-manpage.patch | 55 +++++++++++++++++++
 SPECS/fence-virt.spec                         |  9 ++-
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/bz2149649-fence_virtd-update-fence_virt.conf-manpage.patch

diff --git a/SOURCES/bz2149649-fence_virtd-update-fence_virt.conf-manpage.patch b/SOURCES/bz2149649-fence_virtd-update-fence_virt.conf-manpage.patch
new file mode 100644
index 0000000..b927445
--- /dev/null
+++ b/SOURCES/bz2149649-fence_virtd-update-fence_virt.conf-manpage.patch
@@ -0,0 +1,55 @@
+From 6f213eb637bf7d957ba035e3aa09ce1f1bbccf84 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Tue, 29 Nov 2022 16:21:18 +0100
+Subject: [PATCH] fence_virtd: add info about using multiple uuid/ip entries
+ for groups
+
+---
+ man/fence_virt.conf.5 | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/man/fence_virt.conf.5 b/man/fence_virt.conf.5
+index c8434ed65..dfb3504f5 100644
+--- a/man/fence_virt.conf.5
++++ b/man/fence_virt.conf.5
+@@ -1,4 +1,4 @@
+-.TH fence_virtd.conf 5
++.TH fence_virt.conf 5
+ 
+ .SH NAME
+ fence_virt.conf - configuration file for fence_virtd
+@@ -304,15 +304,17 @@ This defines a group.
+ .TP
+ .B uuid
+ .
+-defines UUID as a member of a group.
++Defines UUID as a member of a group.  It can be used multiple times
++to specify both node name and UUID values that can be fenced.
+ 
+ .TP
+ .B ip
+ .
+-defines an IP which is allowed to send fencing requests
+-for members of this group (e.g. for multicast).  It is
+-highly recommended that this be used in conjunction with
+-a key file.
++Defines an IP which is allowed to send fencing requests
++for members of this group (e.g. for multicast).  It can be used
++multiple times to allow more than 1 IP to send fencing requests to
++the group.  It is highly recommended that this be used in conjunction
++with a key file.
+ 
+ 
+ 
+@@ -340,8 +342,11 @@ a key file.
+  groups {
+   group {
+    ip = "192.168.1.1";
++   ip = "192.168.1.2";
+    uuid = "44179d3f-6c63-474f-a212-20c8b4b25b16";
+    uuid = "1ce02c4b-dfa1-42cb-b5b1-f0b1091ece60";
++   uuid = "node1";
++   uuid = "node2";
+   }
+  }
+ 
diff --git a/SPECS/fence-virt.spec b/SPECS/fence-virt.spec
index 83358a4..b47cc24 100644
--- a/SPECS/fence-virt.spec
+++ b/SPECS/fence-virt.spec
@@ -13,7 +13,7 @@
 Name:    fence-virt
 Summary: A pluggable fencing framework for virtual machines
 Version: 1.0.0
-Release: 5%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release: 6%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License: GPLv2+
 Group:   System Environment/Base
 URL:     https://github.com/ClusterLabs/fence-virt
@@ -22,6 +22,7 @@ Patch0:  bz1927171-fence_xvm-fix-typo.patch
 Patch1:  bz2132010-fence_virt-add-note-reboot-action.patch
 Patch2:  bz2138825-fence_virtd-update-manpage.patch
 Patch3:  bz2144530-fence_virtd-warn-files-not-mode-600.patch
+Patch4:  bz2149649-fence_virtd-update-fence_virt.conf-manpage.patch
 
 %if 0%{?rhel}
 ExclusiveArch: i686 x86_64
@@ -55,6 +56,7 @@ Conflicts:	fence-agents < 3.0.5-2
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 ./autogen.sh
@@ -183,6 +185,11 @@ are located on corosync cluster nodes.
 %{_libdir}/%{name}/cpg.so
 
 %changelog
+* Fri Dec  2 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 1.0.0-6
+- fence_virtd: add info about multiple uuid/ip entries to manpage
+
+  Resolves: rhbz#2149649
+
 * Tue Nov 22 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 1.0.0-5
 - fence_virtd: warn if config or key file(s) are not mode 600