[packages/resource-agents] - updated to 3.9.5 - updated bash patch - added ac patch (fixes install_sh define in makefiles)

[qboosh]

commit a3f1a2a909d3ec48b970417070ecfb2c91aaaeec
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 7 15:59:36 2013 +0200

    - updated to 3.9.5
    - updated bash patch
    - added ac patch (fixes install_sh define in makefiles)

 resource-agents-ac.patch   | 18 ++++++++++++++++++
 resource-agents-bash.patch |  8 ++++++++
 resource-agents.spec       | 15 +++++++++------
 3 files changed, 35 insertions(+), 6 deletions(-)
---
diff --git a/resource-agents.spec b/resource-agents.spec
index 6ec5bcb..d2e1276 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -1,16 +1,17 @@
 Summary:	Reusable cluster resource scripts
 Summary(pl.UTF-8):	Skrypty wielokrotnego użytku do obsługi zasobów klastrowych
 Name:		resource-agents
-Version:	3.9.3
+Version:	3.9.5
 Release:	1
 License:	GPL v2+, LGPL v2.1+
 Group:		Daemons
-Source0:	https://github.com/ClusterLabs/resource-agents/tarball/v3.9.3/%{name}-%{version}.tar.bz2
-# Source0-md5:	244cf2b90c94c6a0c5ed0747244eaa56
+Source0:	https://github.com/ClusterLabs/resource-agents/tarball/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	86ec112decf29906afb755016990f56f
 Source1:	ldirectord.init
 Source2:	%{name}.tmpfiles
 Patch0:		%{name}-no_header_parsing.patch
 Patch1:		%{name}-bash.patch
+Patch2:		%{name}-ac.patch
 URL:		http://www.linux-ha.org/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.10.1
@@ -68,16 +69,17 @@ usługi HTTP, HTTPS i FTP. ldirectord jest prosty do zainstalowania i
 współpracuje z kodem heartbeat (http://www.linux-ha.org/).
 
 %prep
-%setup -q -n ClusterLabs-%{name}-2fafa06
+%setup -q -n ClusterLabs-%{name}-ac806fd
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal}
+%{__autoconf}
 %{__autoheader}
 %{__automake}
-%{__autoconf}
 %configure \
 	FSCK=/sbin/fsck \
 	FUSER=/bin/fuser \
@@ -133,7 +135,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS doc/README.webapps heartbeat/ra-api-1.dtd
+%doc AUTHORS ChangeLog doc/README.webapps heartbeat/ra-api-1.dtd
 %attr(755,root,root) %{_sbindir}/ocf-tester
 %attr(755,root,root) %{_sbindir}/ocft
 %attr(755,root,root) %{_sbindir}/sfex_init
@@ -145,6 +147,7 @@ fi
 %{_sysconfdir}/ha.d/shellfuncs
 
 %attr(755,root,root) %{_libdir}/heartbeat/send_arp
+%attr(755,root,root) %{_libdir}/heartbeat/send_ua
 %attr(755,root,root) %{_libdir}/heartbeat/sfex_daemon
 %attr(755,root,root) %{_libdir}/heartbeat/findif
 %attr(755,root,root) %{_libdir}/heartbeat/tickle_tcp
diff --git a/resource-agents-ac.patch b/resource-agents-ac.patch
new file mode 100644
index 0000000..39723a9
--- /dev/null
+++ b/resource-agents-ac.patch
@@ -0,0 +1,18 @@
+--- ClusterLabs-resource-agents-ac806fd/configure.ac.orig	2013-09-07 15:50:34.699654985 +0200
++++ ClusterLabs-resource-agents-ac806fd/configure.ac	2013-09-07 15:50:52.606320896 +0200
+@@ -23,14 +23,13 @@
+ 	m4_esyscmd([make/git-version-gen .tarball-version]),
+ 	[to_be_defined at foobar.org])
+ 
+-AC_USE_SYSTEM_EXTENSIONS
+-
+ CRM_DTD_VERSION="1.0"
+ 
+ PKG_FEATURES=""
+ 
+ AC_CONFIG_AUX_DIR(.)
+ AC_CANONICAL_HOST
++AC_USE_SYSTEM_EXTENSIONS
+ 
+ dnl Where #defines go (e.g. `AC_CHECK_HEADERS' below)
+ dnl
diff --git a/resource-agents-bash.patch b/resource-agents-bash.patch
index dfcb224..a583bc9 100644
--- a/resource-agents-bash.patch
+++ b/resource-agents-bash.patch
@@ -52,3 +52,11 @@ diff -dur -x '*~' ClusterLabs-resource-agents-2fafa06.orig/heartbeat/nginx Clust
  #
  #	High-Availability nginx OCF resource agent
  # 
+--- ClusterLabs-resource-agents-ac806fd/heartbeat/tomcat.orig	2013-02-07 13:17:42.000000000 +0100
++++ ClusterLabs-resource-agents-ac806fd/heartbeat/tomcat	2013-09-07 15:05:43.176434602 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # Description:  Manages a Tomcat Server as an OCF High-Availability
+ #               resource under Heartbeat/LinuxHA control
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/resource-agents.git/commitdiff/a3f1a2a909d3ec48b970417070ecfb2c91aaaeec