- rediffed

diff --git a/pacemaker-automake.patch b/pacemaker-automake.patch
index 736ccc15ca8ddfcbf678cddc40b790ed3a557e6d..4b1c57dd463fa899e5d0fba76481a19a08794673 100644 (file)
--- a/pacemaker-automake.patch
+++ b/pacemaker-automake.patch
@@ -1,7 +1,6 @@
-diff -dur pacemaker-Pacemaker-1.1.9.orig/configure.ac pacemaker-Pacemaker-1.1.9/configure.ac
---- pacemaker-Pacemaker-1.1.9.orig/configure.ac        2013-03-08 11:48:01.000000000 +0100
-+++ pacemaker-Pacemaker-1.1.9/configure.ac     2013-06-21 20:48:16.759547334 +0200
-@@ -42,7 +42,7 @@
+--- pacemaker-Pacemaker-1.1.24/configure.ac.orig       2022-02-08 21:41:43.127983960 +0100
++++ pacemaker-Pacemaker-1.1.24/configure.ac    2022-02-08 21:45:16.809058080 +0100
+@@ -47,7 +47,7 @@ dnl   - Manually edit include/crm_config
  dnl     new defines
  dnl   - Should not include HAVE_* defines
  dnl   - Safe to include anywhere
@@ -9,4 +8,4 @@ diff -dur pacemaker-Pacemaker-1.1.9.orig/configure.ac pacemaker-Pacemaker-1.1.9/
 +AC_CONFIG_HEADERS(include/config.h include/crm_config.h)
  ALL_LINGUAS="en fr"
  
- AC_ARG_WITH(version,
+ dnl Older distros may need: AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)

diff --git a/pacemaker-libs.patch b/pacemaker-libs.patch
index 6c13756c420fa4720817c56f99d24b56cfa42756..3c6b0b3aa7396bba860535c79cd97353acfb95dc 100644 (file)
--- a/pacemaker-libs.patch
+++ b/pacemaker-libs.patch
@@ -115,17 +115,17 @@
  # libcib for get_object_root()
  #             $(top_builddir)/lib/hbclient/libhbclient.la
  pengine_SOURCES       = main.c
---- pacemaker-Pacemaker-1.1.19/lib/common/Makefile.am.orig     2018-09-02 14:46:36.066795934 +0200
-+++ pacemaker-Pacemaker-1.1.19/lib/common/Makefile.am  2018-09-02 14:48:38.040127875 +0200
-@@ -35,7 +35,7 @@
+--- pacemaker-Pacemaker-1.1.24/lib/common/Makefile.am.orig     2022-02-08 21:47:15.161859798 +0100
++++ pacemaker-Pacemaker-1.1.24/lib/common/Makefile.am  2022-02-08 21:49:50.566582176 +0100
+@@ -40,7 +40,7 @@ libcrmcommon_la_LDFLAGS      = -version-info
  libcrmcommon_la_CFLAGS        = $(CFLAGS_HARDENED_LIB)
  libcrmcommon_la_LDFLAGS       += $(LDFLAGS_HARDENED_LIB)
  
 -libcrmcommon_la_LIBADD        = @LIBADD_DL@ $(GNUTLSLIBS)
 +libcrmcommon_la_LIBADD        = @LIBADD_DL@ $(LIBPLUMB) $(GNUTLSLIBS) $(LIBXML2) $(LIBXSLT) $(libqb_LIBS) $(LIBBZ2) $(LIBUUID) -lm
  
- libcrmcommon_la_SOURCES       = compat.c digest.c ipc.c io.c procfs.c utils.c xml.c   \
-                         iso8601.c remote.c mainloop.c logging.c watchdog.c    \
+ # Use += rather than backlashed continuation lines for parsing by bumplibs.sh
+ libcrmcommon_la_SOURCES        =
 --- pacemaker-Pacemaker-1.1.16/lib/cib/Makefile.am.orig        2017-04-16 07:34:31.132737427 +0200
 +++ pacemaker-Pacemaker-1.1.16/lib/cib/Makefile.am     2017-04-16 07:39:18.802734141 +0200
 @@ -30,7 +30,7 @@

diff --git a/pacemaker-update.patch b/pacemaker-update.patch
index 9c62ff67fba6dfd3c99c6524862f216ee391f656..99aedb462d188b2e56630149d7900a6e7fb02c01 100644 (file)
--- a/pacemaker-update.patch
+++ b/pacemaker-update.patch
@@ -1,8 +1,8 @@
---- pacemaker-Pacemaker-1.1.10/tools/notifyServicelogEvent.c.orig      2013-07-26 02:02:31.000000000 +0200
-+++ pacemaker-Pacemaker-1.1.10/tools/notifyServicelogEvent.c   2013-09-07 22:08:44.162036132 +0200
-@@ -31,13 +31,13 @@
+--- pacemaker-Pacemaker-1.1.24/tools/notifyServicelogEvent.c.orig      2020-12-03 16:37:50.000000000 +0100
++++ pacemaker-Pacemaker-1.1.24/tools/notifyServicelogEvent.c   2022-02-08 21:46:52.110664895 +0100
+@@ -23,13 +23,13 @@
  #include <crm/common/util.h>
- #include <crm_internal.h>
+ #include <crm/attrd.h>
  
 -typedef enum { STATUS_GREEN = 1, STATUS_YELLOW, STATUS_RED } STATUS;
 +typedef enum { STATUS_GREEN = 1, STATUS_YELLOW, STATUS_RED } STATUS_T;
@@ -18,7 +18,7 @@
  {
      switch (status) {
          default:
-@@ -50,10 +50,10 @@
+@@ -42,10 +42,10 @@ status2char(STATUS status)
      }
  }
  
@@ -31,7 +31,7 @@
  
      crm_debug("Severity = %d, Disposition = %d", event->severity, event->disposition);
  
-@@ -153,7 +153,7 @@
+@@ -145,7 +145,7 @@ main(int argc, char *argv[])
      }
  
      if (rc == 0) {