commit 53cd79e046a57ae1df8fd0d4ad4c40bde754709d
Author: Jacek Konieczny <[email protected]>
Date: Tue Oct 30 13:57:01 2012 +0100
Version: 3.9.3
- use a better source URL
– -bash.patch: many agents are written with bash syntax, so they
should start with '#!/bin/bash', not '#!/bin/sh'
resource-agents-bash.patch | 54 ++++++++++++++++++++++++++++++++++++++++++++++
resource-agents.spec | 14 ++++++------
2 files changed, 62 insertions(+), 6 deletions(-)
---
diff --git a/resource-agents.spec b/resource-agents.spec
index 9193c39..8503209 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -1,16 +1,16 @@
-%define gitrel b735277
Summary: Reusable cluster resource scripts
Name: resource-agents
-Version: 3.9.2
-Release: 2
+Version: 3.9.3
+Release: 1
License: GPL v2+; LGPL v2.1+
Group: Daemons
URL: http://www.linux-ha.org/
-Source0: https://github.com/ClusterLabs/resource-agents/tarball/v3.9.2
-# Source0-md5: 3b5790e8041f2a459d8a0ff310682bfe
+Source0:
https://github.com/ClusterLabs/resource-agents/tarball/v3.9.3/%{name}-%{version}.tar.bz2
+# Source0-md5: 244cf2b90c94c6a0c5ed0747244eaa56
Source1: ldirectord.init
Source2: %{name}.tmpfiles
Patch0: %{name}-no_header_parsing.patch
+Patch1: %{name}-bash.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: cluster-glue-libs-devel
@@ -57,8 +57,9 @@ lditrecord is simple to install and works with the heartbeat
code
See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
%prep
-%setup -q -n ClusterLabs-%{name}-%{gitrel}
+%setup -q -n ClusterLabs-%{name}-2fafa06
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
@@ -155,6 +156,7 @@ fi
%attr(755,root,root) %{_datadir}/cluster/utils/*
%{_prefix}/lib/ocf/resource.d/heartbeat/.ocf-*
%{_prefix}/lib/ocf/lib/heartbeat/ocf-*
+%{_prefix}/lib/ocf/lib/heartbeat/*.sh
%{_prefix}/lib/ocf/resource.d/redhat
%{_mandir}/man7/*.7*
%{_mandir}/man8/ocf-tester.8*
diff --git a/resource-agents-bash.patch b/resource-agents-bash.patch
new file mode 100644
index 0000000..dfcb224
--- /dev/null
+++ b/resource-agents-bash.patch
@@ -0,0 +1,54 @@
+diff -dur -x '*~' ClusterLabs-resource-agents-2fafa06.orig/heartbeat/CTDB
ClusterLabs-resource-agents-2fafa06/heartbeat/CTDB
+--- ClusterLabs-resource-agents-2fafa06.orig/heartbeat/CTDB 2012-05-25
18:23:59.000000000 +0200
++++ ClusterLabs-resource-agents-2fafa06/heartbeat/CTDB 2012-10-30
13:48:13.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # OCF Resource Agent for managing CTDB
+ #
+diff -dur -x '*~' ClusterLabs-resource-agents-2fafa06.orig/heartbeat/Xen
ClusterLabs-resource-agents-2fafa06/heartbeat/Xen
+--- ClusterLabs-resource-agents-2fafa06.orig/heartbeat/Xen 2012-05-25
18:23:59.000000000 +0200
++++ ClusterLabs-resource-agents-2fafa06/heartbeat/Xen 2012-10-30
13:48:27.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ #
+ # Support: [email protected]
+diff -dur -x '*~' ClusterLabs-resource-agents-2fafa06.orig/heartbeat/apache
ClusterLabs-resource-agents-2fafa06/heartbeat/apache
+--- ClusterLabs-resource-agents-2fafa06.orig/heartbeat/apache 2012-05-25
18:23:59.000000000 +0200
++++ ClusterLabs-resource-agents-2fafa06/heartbeat/apache 2012-10-30
13:48:43.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # High-Availability Apache/IBMhttp control script
+ #
+diff -dur -x '*~' ClusterLabs-resource-agents-2fafa06.orig/heartbeat/dhcpd
ClusterLabs-resource-agents-2fafa06/heartbeat/dhcpd
+--- ClusterLabs-resource-agents-2fafa06.orig/heartbeat/dhcpd 2012-05-25
18:23:59.000000000 +0200
++++ ClusterLabs-resource-agents-2fafa06/heartbeat/dhcpd 2012-10-30
13:47:07.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # Resource Agent for managing dhcpd resources.
+ #
+diff -dur -x '*~' ClusterLabs-resource-agents-2fafa06.orig/heartbeat/exportfs
ClusterLabs-resource-agents-2fafa06/heartbeat/exportfs
+--- ClusterLabs-resource-agents-2fafa06.orig/heartbeat/exportfs
2012-05-25 18:23:59.000000000 +0200
++++ ClusterLabs-resource-agents-2fafa06/heartbeat/exportfs 2012-10-30
13:48:52.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # exportfs
+ #
+ # Description: Manages nfs exported file system.
+diff -dur -x '*~' ClusterLabs-resource-agents-2fafa06.orig/heartbeat/nginx
ClusterLabs-resource-agents-2fafa06/heartbeat/nginx
+--- ClusterLabs-resource-agents-2fafa06.orig/heartbeat/nginx 2012-05-25
18:23:59.000000000 +0200
++++ ClusterLabs-resource-agents-2fafa06/heartbeat/nginx 2012-10-30
13:49:01.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # High-Availability nginx OCF resource agent
+ #
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/resource-agents.git/commitdiff/53cd79e046a57ae1df8fd0d4ad4c40bde754709d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
