- rediffed

diff --git a/resource-agents-ac.patch b/resource-agents-ac.patch
index 739ed87263a1aa16d56f962d34b0c5fa0bf37edf..14f015a32bd2e4b6af0a5c539e0d9757c521524e 100644 (file)
--- a/resource-agents-ac.patch
+++ b/resource-agents-ac.patch
@@ -1,6 +1,6 @@
---- resource-agents-4.5.0/configure.ac.orig    2020-05-01 15:46:08.451797734 +0200
-+++ resource-agents-4.5.0/configure.ac 2020-05-01 15:51:52.173268968 +0200
-@@ -23,8 +23,6 @@
+--- resource-agents-4.10.0/configure.ac.orig   2021-11-03 10:12:01.000000000 +0100
++++ resource-agents-4.10.0/configure.ac        2022-02-07 20:11:41.207130114 +0100
+@@ -23,14 +23,13 @@ AC_INIT([resource-agents],
        m4_esyscmd([make/git-version-gen .tarball-version]),
        [developers@clusterlabs.org])
  
@@ -8,8 +8,7 @@
 -
  CRM_DTD_VERSION="1.0"
  
- PKG_FEATURES=""
-@@ -33,6 +31,7 @@
+ AC_CONFIG_AUX_DIR(.)
  AC_CONFIG_MACRO_DIR([m4])
  
  AC_CANONICAL_HOST

diff --git a/resource-agents-bash.patch b/resource-agents-bash.patch
index 2ec6666801ff94a16937c234ad94bd7a1ecff696..4ab53df318e71f54bc656b4f36b876783eb54b0c 100644 (file)
--- a/resource-agents-bash.patch
+++ b/resource-agents-bash.patch
@@ -52,12 +52,11 @@ diff -dur resource-agents-3.9.7.orig/heartbeat/tomcat resource-agents-3.9.7/hear
  #
  # Description:  Manages a Tomcat Server as an OCF High-Availability
  #               resource under Heartbeat/LinuxHA control
-diff -dur resource-agents-3.9.7.orig/heartbeat/Xen resource-agents-3.9.7/heartbeat/Xen
---- resource-agents-3.9.7.orig/heartbeat/Xen   2016-02-03 11:57:55.000000000 +0100
-+++ resource-agents-3.9.7/heartbeat/Xen        2016-11-28 10:10:14.000000000 +0100
+--- resource-agents-4.10.0/heartbeat/Xen.orig  2022-02-07 19:20:50.915366997 +0100
++++ resource-agents-4.10.0/heartbeat/Xen       2022-02-07 19:20:53.738846971 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  #
  #
- # Support:      linux-ha@lists.linux-ha.org
+ # Support:      users@clusterlabs.org