From 51f002d51749a0f449b80f64228374fcf5587863 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Date: Wed, 21 Oct 2009 07:14:04 +0000
Subject: [PATCH] Update pacemaker resources from upstream

---
 .cvsignore           |  2 +-
 resource-agents.spec | 25 +++++++++++++++++++++++--
 sources              |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d14b5ac..aaba772 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
+099c0e5d80db.tar.bz2
 resource-agents-3.0.3.tar.gz
-2198dc90bec4.tar.bz2
diff --git a/resource-agents.spec b/resource-agents.spec
index d3077cb..5a32da6 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -20,12 +20,12 @@
 # Invoking 'hg archive' wont but you can add one with:
 #  hg archive -t tgz -p "Cluster-Resource-Agents-" -r $altversion $altversion.tar.gz
 %define altprefix Cluster-Resource-Agents-
-%define altversion 2198dc90bec4
+%define altversion 099c0e5d80db
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
 Version: 3.0.3
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 3%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -138,6 +138,9 @@ rm -rf %{buildroot}
 %dir %{_datadir}/resource-agents
 %doc %{_datadir}/resource-agents/ra-api-1.dtd
 
+%dir %{_sysconfdir}/ha.d
+%{_sysconfdir}/ha.d/shellfuncs
+
 %dir %{_libdir}/heartbeat
 %{_libdir}/heartbeat/findif
 %{_libdir}/heartbeat/send_arp  
@@ -155,6 +158,24 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
+* Mon Oct 12 2009 Andrew Beekhof <andrew@beekhof.net> - 3.0.3-3
+- Update Pacameker agents to upstream version: 099c0e5d80db
+  + Add the ha_parameter function back into .ocf-shellfuncs.
+  + Bug bnc#534803 - Provide a default for MAILCMD
+  + Fix use of undefined macro @HA_NOARCHDATAHBDIR@
+  + High (LF 2138): IPsrcaddr: replace 0/0 with proper ip prefix (thanks to Michael Ricordeau and Michael Schwartzkopff)
+  + Import shellfuncs from heartbeat as badly written RAs use it
+  + Medium (LF 2173): nfsserver: exit properly in nfsserver_validate
+  + Medium: RA: Filesystem: implement monitor operation
+  + Medium: RA: VirtualDomain: loop on status if libvirtd is unreachable
+  + Medium: RA: VirtualDomain: loop on status if libvirtd is unreachable (addendum)
+  + Medium: RA: iSCSILogicalUnit: use a 16-byte default SCSI ID
+  + Medium: RA: iSCSITarget: be more persistent deleting targets on stop
+  + Medium: RA: portblock: add per-IP filtering capability
+  + Medium: mysql-proxy: log_level and keepalive parameters
+  + Medium: oracle: drop spurious output from sqlplus
+  + RA: Filesystem: allow configuring smbfs mounts as clones
+
 * Wed Sep 23 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.3-1
 - New rgmanager resource agents upstream release
 
diff --git a/sources b/sources
index 28a5d1b..ef96e8b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+98088230632e65c63022923ae4a835f3  099c0e5d80db.tar.bz2
 91110701087ffc915971231b392180d0  resource-agents-3.0.3.tar.gz
-af99c03587de9d314dc1b47b3ea9f6aa  2198dc90bec4.tar.bz2