new upstream release

.gitignore

@@ -26,3 +26,4 @@ fence-agents-3.0.14.tar.bz2
 /fence-agents-4.0.9.tar.xz
 /fence-agents-4.0.10.tar.xz
 /fence-agents-4.0.11.tar.xz
+/fence-agents-4.0.14.tar.xz

fence-agents.spec

@@ -15,17 +15,18 @@
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
-Version: 4.0.12
+Version: 4.0.14
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sourceware.org/cluster/wiki/
 Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.xz
+Patch0: makefile-awk.patch
 
 %if 0%{?fedora}
-%global supportedagents alom amt apc apc_snmp bladecenter brocade cisco_mds cisco_ucs docker drac5 eaton_snmp eps hpblade ibmblade ifmib ilo ilo_mp ilo_ssh ilo_moonshot intelmodular ipdu ipmilan kdump ldom lpar netio ovh pve rhevm rsa rsb scsi vmware_soap wti
+%global supportedagents alom amt apc apc_snmp bladecenter brocade cisco_mds cisco_ucs docker drac5 eaton_snmp emerson eps hpblade ibmblade ifmib ilo ilo_mp ilo_ssh ilo_moonshot intelmodular ipdu ipmilan kdump ldom lpar netio ovh pve rhevm rsa rsb scsi vmware_soap wti
-%global testagents virsh raritan
+%global testagents zvm virsh raritan
-%global allfenceagents fence-agents-alom fence-agents-amt fence-agents-apc fence-agents-apc-snmp fence-agents-bladecenter fence-agents-brocade fence-agents-cisco-mds fence-agents-cisco-ucs fence-agents-docker fence-agents-drac5 fence-agents-eaton-snmp fence-agents-eps fence-agents-hpblade fence-agents-ibmblade fence-agents-ifmib fence-agents-ilo2 fence-agents-ilo-mp fence-agents-ilo-ssh fence-agents-ilo-moonshot fence-agents-intelmodular fence-agents-ipdu fence-agents-ipmilan fence-agents-kdump fence-agents-ldom fence-agents-lpar fence-agents-netio fence-agents-ovh fence-agents-rhevm fence-agents-rsa fence-agents-rsb fence-agents-scsi fence-agents-vmware-soap fence-agents-wti
+%global allfenceagents fence-agents-alom fence-agents-amt fence-agents-apc fence-agents-apc-snmp fence-agents-bladecenter fence-agents-brocade fence-agents-cisco-mds fence-agents-cisco-ucs fence-agents-docker fence-agents-drac5 fence-agents-eaton-snmp fence-agents-eps fence-agents-hpblade fence-agents-ibmblade fence-agents-ifmib fence-agents-ilo2 fence-agents-ilo-mp fence-agents-ilo-ssh fence-agents-ilo-moonshot fence-agents-intelmodular fence-agents-ipdu fence-agents-ipmilan fence-agents-kdump fence-agents-ldom fence-agents-lpar fence-agents-netio fence-agents-ovh fence-agents-rhevm fence-agents-rsa fence-agents-rsb fence-agents-scsi fence-agents-vmware-soap fence-agents-wti fence-agents-zvm fence-agents-emerson
 %endif
 
 ## Setup/build bits
@@ -37,11 +38,14 @@ BuildRequires: glibc-devel
 BuildRequires: gnutls-utils
 BuildRequires: libxslt
 BuildRequires: python pexpect python-pycurl python-suds python-requests
+BuildRequires: autoconf automake libtool
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .makefile-awk
 
 %build
+./autogen.sh
 %{configure} --with-agents='%{supportedagents} %{testagents}'
 CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
 
@@ -248,6 +252,19 @@ The fence-agents-eaton-snmp package contains a fence agent for Eaton network pow
 %{_sbindir}/fence_eaton_snmp
 %{_mandir}/man8/fence_eaton_snmp.8*
 
+%package emerson
+License: GPLv2+ and LGPLv2+
+Group: System Environment/Base
+Summary: Fence agent for Emerson devices (SNMP)
+Requires: fence-agents-common = %{version}-%{release}
+Obsoletes: fence-agents
+%description emerson
+The fence-agents-emerson package contains a fence agent for Emerson devices that are accessed via the SNMP protocol. 
+%files emerson
+%defattr(-,root,root,-)
+%{_sbindir}/fence_emerson
+%{_mandir}/man8/fence_emerson.8*
+
 %package eps
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -360,6 +377,10 @@ The fence-agents-ilo-ssh package contains a fence agent for HP iLO devices that
 %defattr(-,root,root,-)
 %{_sbindir}/fence_ilo_ssh
 %{_mandir}/man8/fence_ilo_ssh.8*
+%{_sbindir}/fence_ilo3_ssh
+%{_mandir}/man8/fence_ilo3_ssh.8*
+%{_sbindir}/fence_ilo4_ssh
+%{_mandir}/man8/fence_ilo4_ssh.8*
 
 %package intelmodular
 License: GPLv2+ and LGPLv2+
@@ -633,7 +654,24 @@ The fence-agents-wti package contains a fence agent for WTI network power switch
 %{_sbindir}/fence_wti
 %{_mandir}/man8/fence_wti.8*
 
+%package zvm
+License: GPLv2+ and LGPLv2+
+Group: System Environment/Base
+Summary: Fence agent for IBM z/VM over IP
+Requires: fence-agents-common = %{version}-%{release}
+Obsoletes: fence-agents
+%description zvm
+The fence-agents-zvm package contains a fence agent for IBM z/VM over IP.
+%files zvm
+%defattr(-,root,root,-)
+%{_sbindir}/fence_zvmip
+%{_mandir}/man8/fence_zvmip.8*
+
 %changelog
+* Thu Jan 08 2015 Marek Grac <mgrac@redhat.com> - 4.0.14-1
+- new upstream release
+- new packages fence-agents-zvm and fence-agents-emerson
+
 * Thu Oct 16 2014 Marek Grac <mgrac@redhat.com> - 4.0.12-1
 - new upstream release
 - new package fence-agents-ilo-ssh

makefile-awk.patch

@@ -0,0 +1,27 @@
+diff --git a/make/agentpycheck.mk b/make/agentpycheck.mk
+index 090116b..291e242 100644
+--- a/make/agentpycheck.mk
++++ b/make/agentpycheck.mk
+@@ -1,19 +1,19 @@
+ TEMPFILE:=$(shell mktemp)
+ #DATADIR:=$(abs_top_builddir)/tests/data/metadata
+ DATADIR:=$(abs_top_srcdir)/tests/data/metadata
+-AWK='BEGIN {store=-1} /name=\"store_path\"/ {store=2} {if (store!=0) {print}; store--}'
++AWK_VAL='BEGIN {store=-1} /name=\"store_path\"/ {store=2} {if (store!=0) {print}; store--}'
+ 
+ check: $(TARGET:%=xml-check.%) $(SYMTARGET:%=xml-check.%) $(TARGET:%=delay-check.%)
+ 
+ xml-check.%: %
+ 	$(eval INPUT=$(subst xml-check.,,$@))
+-	PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib python ./$(INPUT) -o metadata | awk $(AWK) > $(TEMPFILE)
++	PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib python ./$(INPUT) -o metadata | $(AWK) $(AWK_VAL) > $(TEMPFILE)
+ 	diff $(TEMPFILE) $(DATADIR)/$(INPUT).xml
+ 	rm $(TEMPFILE)
+ 
+ xml-upload.%: %
+ 	$(eval INPUT=$(subst xml-upload.,,$@))
+-	PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib python ./$(INPUT) -o metadata | awk $(AWK) > $(DATADIR)/$(INPUT).xml
++	PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib python ./$(INPUT) -o metadata | $(AWK) $(AWK_VAL) > $(DATADIR)/$(INPUT).xml
+ 
+ # If test will fail, rerun fence agents to show problems
+ delay-check.%: %

sources

@@ -1 +1 @@
-c662d5b554e228021cb2450a75826750  fence-agents-4.0.12.tar.xz
+5a5f3ddc0f054764e964068e74abfecc  fence-agents-4.0.14.tar.xz