[packages/fence-agents] - updated to 4.0.24 - updated check patch

[qboosh]

commit 337caaa39388c1f4a01caa46023872c68c291bb9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Oct 23 10:37:18 2016 +0200

    - updated to 4.0.24
    - updated check patch

 fence-agents-check.patch | 16 ++++++++--------
 fence-agents.spec        | 12 ++++++++----
 2 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/fence-agents.spec b/fence-agents.spec
index 31caf2d..595aa57 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -1,16 +1,15 @@
-#
 # TODO:
 #	- split into subpackages
 %include	/usr/lib/rpm/macros.perl
 Summary:	Reusable cluster fencing scripts
 Summary(pl.UTF-8):	Skrypty barier klastrowych wielokrotnego użytku
 Name:		fence-agents
-Version:	4.0.21
+Version:	4.0.24
 Release:	1
 License:	GPL v2+ (libraries), LGPL v2.1+ (applications)
 Group:		Daemons
 Source0:	https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.xz
-# Source0-md5:	ed5376de5956fd507624ce752e06c0bd
+# Source0-md5:	161195adb0c125bbbbc1440920a2ff28
 Patch0:		%{name}-check.patch
 URL:		https://fedorahosted.org/cluster/wiki/HomePage
 BuildRequires:	autoconf >= 2.63
@@ -18,6 +17,7 @@ BuildRequires:	automake
 BuildRequires:	libtool >= 2:2.2.6
 BuildRequires:	perl-Net-Telnet
 BuildRequires:	pkgconfig
+BuildRequires:	python-openwsman
 BuildRequires:	python-pexpect
 BuildRequires:	python-pycurl
 BuildRequires:	python-requests
@@ -46,6 +46,8 @@ Suggests:	openssh-clients
 Suggests:	sg3_utils
 Suggests:	sudo
 Suggests:	telnet
+# [/usr]/sbin/sbd
+Suggests:	cluster-sbd
 # /usr/bin/nova - seems not used
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -65,7 +67,8 @@ Skrypty zapewniające funkcjonalność barier dla węzłów klastra.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	SBD_PATH=/usr/sbin/sbd
 
 %{__make}
 
@@ -88,6 +91,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libexecdir}/fence_kdump_send
 %{_datadir}/fence
 %attr(755,root,root) %{_datadir}/cluster/fence_scsi_check
+%attr(755,root,root) %{_datadir}/cluster/fence_scsi_check_hardreboot
 %dir %{_datadir}/cluster/relaxng
 %{_datadir}/cluster/relaxng/fence.rng.head
 %{_datadir}/cluster/relaxng/fence.rng.tail
diff --git a/fence-agents-check.patch b/fence-agents-check.patch
index 9f481f5..6183c7b 100644
--- a/fence-agents-check.patch
+++ b/fence-agents-check.patch
@@ -1,5 +1,5 @@
---- fence-agents-4.0.10/fence/agents/lib/check_used_options.py.orig	2014-07-01 12:53:45.000000000 +0200
-+++ fence-agents-4.0.10/fence/agents/lib/check_used_options.py	2014-07-05 08:41:55.273724364 +0200
+--- fence-agents-4.0.24/fence/agents/lib/check_used_options.py.orig	2016-08-22 14:33:34.000000000 +0200
++++ fence-agents-4.0.24/fence/agents/lib/check_used_options.py	2016-10-16 16:32:47.907160497 +0200
 @@ -22,6 +22,12 @@
  
  	## add UUID which is derived automatically from --plug if possible
@@ -16,15 +16,15 @@
 @@ -48,12 +54,12 @@
  
  		for option in option_use_re.findall(line):
- 			if not available.has_key(option):
--				print "ERROR on line %d in %s: option %s is not defined" % (counter, agent, option_use_re.search(line).group(1))
-+				print "ERROR on line %d in %s: option %s is not defined" % (counter, agent, option)
+ 			if option not in available:
+-				print("ERROR on line %d in %s: option %s is not defined" % (counter, agent, option_use_re.search(line).group(1)))
++				print("ERROR on line %d in %s: option %s is not defined" % (counter, agent, option))
  				without_errors = False
  
  		for option in option_has_re.findall(line):
- 			if not available.has_key(option):
--				print "ERROR on line %d in %s: option %s is not defined" % (counter, agent, option_has_re.search(line).group(1))
-+				print "ERROR on line %d in %s: option %s is not defined" % (counter, agent, option)
+ 			if option not in available:
+-				print("ERROR on line %d in %s: option %s is not defined" % (counter, agent, option_has_re.search(line).group(1)))
++				print("ERROR on line %d in %s: option %s is not defined" % (counter, agent, option))
  				without_errors = False
  
  	if without_errors:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fence-agents.git/commitdiff/337caaa39388c1f4a01caa46023872c68c291bb9