From ff7ccc9dd90c19ad0d4754eb0c1a2fa07bc7670c Mon Sep 17 00:00:00 2001
From: CentOS Buildsys <bugs@centos.org>
Date: Feb 19 2014 15:43:10 +0000
Subject: import fence-virt-0.3.0-16.el7.src.rpm


---

diff --git a/SOURCES/bz1052449.patch b/SOURCES/bz1052449.patch
new file mode 100644
index 0000000..464f27d
--- /dev/null
+++ b/SOURCES/bz1052449.patch
@@ -0,0 +1,13 @@
+diff -ur a/fence_virtd.service.in b/fence_virtd.service.in
+--- a/fence_virtd.service.in	2012-02-07 14:56:22.000000000 -0500
++++ b/fence_virtd.service.in	2014-02-18 09:19:19.119074520 -0500
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=Fence-Virt system host daemon
+-After=syslog.target network.target libvirt-qmf.service libvirtd.service corosync.service
+-Requires=syslog.target network.target
++After=network.target libvirt-qmf.service libvirtd.service corosync.service
++Requires=network.target
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/SOURCES/bz1057258.patch b/SOURCES/bz1057258.patch
new file mode 100644
index 0000000..38ec32f
--- /dev/null
+++ b/SOURCES/bz1057258.patch
@@ -0,0 +1,32 @@
+commit 04710b40794fb31e9cd70c4a205decf6b40206fd
+Author: Ryan McCabe <rmccabe@redhat.com>
+Date:   Wed Jul 10 17:31:21 2013 -0400
+
+    fence-virt: Fail properly if unable to bind the listener socket
+    
+    Bail out properly in multicast mode if we're unable to bind the TCP
+    listener socket.
+    
+    Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
+
+diff --git a/client/mcast.c b/client/mcast.c
+index ddc1a9c..9ad48ae 100644
+--- a/client/mcast.c
++++ b/client/mcast.c
+@@ -313,11 +313,14 @@ mcast_fence_virt(fence_virt_args_t *args)
+ 		if (lfd < 0) {
+ 			printf("Failed to listen: %s\n", strerror(errno));
+ 			usleep(args->retr_time * 100000);
+-			--attempts;
+-			continue;
++			if (--attempts > 0)
++				continue;
+ 		}
+ 	} while (0);
+ 
++	if (lfd < 0)
++		return -1;
++
+ 	gettimeofday(&tv, NULL);
+ 	seqno = (uint32_t)tv.tv_usec;
+ 
diff --git a/SPECS/fence-virt.spec b/SPECS/fence-virt.spec
index ccba7e2..c790f3f 100644
--- a/SPECS/fence-virt.spec
+++ b/SPECS/fence-virt.spec
@@ -1,6 +1,6 @@
 Name:		fence-virt
 Version:	0.3.0
-Release:	13%{?dist}
+Release:	16%{?dist}
 Summary:	A pluggable fencing framework for virtual machines
 Group:		System Environment/Base
 License:	GPLv2+
@@ -19,6 +19,8 @@ Patch4: Fix-typo-in-fence_virt-8-man-page.patch
 Patch5: Explicitly-set-delay-to-0.patch
 Patch6: Return-success-if-a-domain-exists-but-is-off.patch
 Patch7: use-bswap_X-instead-of-b_swapX.patch
+Patch8: bz1052449.patch
+Patch9: bz1057258.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -90,6 +92,8 @@ machines on a desktop.
 %patch5 -p1 -b .Explicitly-set-delay-to-0
 %patch6 -p1 -b .Return-success-if-a-domain-exists-but-is-off
 %patch7 -p1 -b .use-bswap_X-instead-of-b_swapX
+%patch8 -p1 -b .bz1052449
+%patch9 -p1 -b .bz1057258
 
 
 %build
@@ -174,6 +178,15 @@ fi
 %{_libdir}/%{name}/libvirt.so
 
 %changelog
+* Wed Feb 19 2014 Ryan McCabe <rmccabe@redhat.com> - 0.3.0-16
+- Fail cleanly when unable to bind the TCP listener socket
+
+* Tue Feb 18 2014 Ryan McCabe <rmccabe@redhat.com> - 0.3.0-15
+- Remove references to syslog.target from the fence_virtd systemd unit file
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 0.3.0-14
+- Mass rebuild 2013-12-27
+
 * Tue May 07 2013 Ryan McCabe <rmccabe@redhat.com> - 0.3.0-13
 - Rebuild