diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..f9648ba --- /dev/null +++ b/_servicedata @@ -0,0 +1,6 @@ + + + git://github.com/ClusterLabs/pacemaker.git + 4864ed4348b39a1adc7c6863e1e9986587b77e72 + + diff --git a/fate-323526_pacemaker-pacemaker-configure-AM_PATH_PYTHON-python3.patch b/fate-323526_pacemaker-pacemaker-configure-AM_PATH_PYTHON-python3.patch new file mode 100644 index 0000000..efb4b0b --- /dev/null +++ b/fate-323526_pacemaker-pacemaker-configure-AM_PATH_PYTHON-python3.patch @@ -0,0 +1,13 @@ +Index: pacemaker-1.1.18+20180112.bd7115b8c/configure.ac +=================================================================== +--- pacemaker-1.1.18+20180112.bd7115b8c.orig/configure.ac ++++ pacemaker-1.1.18+20180112.bd7115b8c/configure.ac +@@ -493,7 +493,7 @@ dnl Replacing AC_PROG_LIBTOOL with AC_CH + dnl was NOT being expanded all the time thus causing things to fail. + AC_CHECK_PROGS(LIBTOOL, glibtool libtool libtool15 libtool13) + +-AM_PATH_PYTHON ++AM_PATH_PYTHON([3]) + AC_CHECK_PROGS(MAKE, gmake make) + AC_PATH_PROGS(HTML2TXT, lynx w3m) + AC_PATH_PROGS(HELP2MAN, help2man) diff --git a/pacemaker-1.1.18+20180104.7ba28d854.tar.xz b/pacemaker-1.1.18+20180104.7ba28d854.tar.xz deleted file mode 100644 index cbf5968..0000000 --- a/pacemaker-1.1.18+20180104.7ba28d854.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2d29a8935bc8b561a3903ae555cf7c867f24f4529cf57e46eec9ad2b4fb628d -size 3226060 diff --git a/pacemaker-1.1.18+20180118.9c3f7a49c.tar.xz b/pacemaker-1.1.18+20180118.9c3f7a49c.tar.xz new file mode 100644 index 0000000..de8e8b9 --- /dev/null +++ b/pacemaker-1.1.18+20180118.9c3f7a49c.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50b95c9997a289d7d20ffc80459ca5f577ef6c9c081fe6d5ef684503020c28b6 +size 3226688 diff --git a/pacemaker-Wno-format-signedness.patch b/pacemaker-Wno-format-signedness.patch index 7e686fe..d07de05 100644 --- a/pacemaker-Wno-format-signedness.patch +++ b/pacemaker-Wno-format-signedness.patch @@ -1,19 +1,17 @@ -Index: pacemaker-1.1.14+git20160503.9e38256/configure.ac +Index: pacemaker-1.1.18+20180118.9c3f7a49c/configure.ac =================================================================== ---- pacemaker-1.1.14+git20160503.9e38256.orig/configure.ac -+++ pacemaker-1.1.14+git20160503.9e38256/configure.ac -@@ -1792,12 +1792,12 @@ dnl otherwise none of both - AC_DEFINE([GCC_FORMAT_NONLITERAL_CHECKING_ENABLED], [], - [gcc can complain about nonliterals in format]) - EXTRA_FLAGS="$EXTRA_FLAGS -- -Wformat=2 -+ -Wformat=2 -Wno-format-signedness - -Wformat-nonliteral" - else - if test "x$gcc_format_nonliteral" = "xyes"; then - EXTRA_FLAGS="$EXTRA_FLAGS -- -Wformat=2" -+ -Wformat=2 -Wno-format-signedness" - fi +--- pacemaker-1.1.18+20180118.9c3f7a49c.orig/configure.ac ++++ pacemaker-1.1.18+20180118.9c3f7a49c/configure.ac +@@ -1416,10 +1416,11 @@ dnl otherwise none of both + [gcc can complain about nonliterals in format]) + EXTRA_FLAGS="$EXTRA_FLAGS + -Wformat=2 ++ -Wno-format-signedness + -Wformat-nonliteral" + else + if test "x$gcc_format_nonliteral" = "xyes"; then +- EXTRA_FLAGS="$EXTRA_FLAGS -Wformat=2" ++ EXTRA_FLAGS="$EXTRA_FLAGS -Wformat=2 -Wno-format-signedness" fi + fi diff --git a/pacemaker-cts-StartCmd.patch b/pacemaker-cts-StartCmd.patch new file mode 100644 index 0000000..403fc57 --- /dev/null +++ b/pacemaker-cts-StartCmd.patch @@ -0,0 +1,13 @@ +Index: pacemaker-1.1.18+20180104.7ba28d854/cts/patterns.py +=================================================================== +--- pacemaker-1.1.18+20180104.7ba28d854.orig/cts/patterns.py ++++ pacemaker-1.1.18+20180104.7ba28d854/cts/patterns.py +@@ -103,7 +103,7 @@ class crm_corosync(BasePatterns): + BasePatterns.__init__(self, name) + + self.commands.update({ +- "StartCmd" : "service corosync start && service pacemaker start", ++ "StartCmd" : "service pacemaker start", + "StopCmd" : "service pacemaker stop; [ ! -e /usr/sbin/pacemaker_remoted ] || service pacemaker_remote stop; service corosync stop", + + "EpochCmd" : "crm_node -e", diff --git a/pacemaker.changes b/pacemaker.changes index 80bc12b..5650011 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Fri Jan 19 00:23:32 UTC 2018 - ygao@suse.com + +- Update to version 1.1.18+20180118.9c3f7a49c: +- libcrmcommon: put exit/return handling in own source/header files +- bump build dependencies +- Rebase: + * pacemaker-Wno-format-signedness.patch + +------------------------------------------------------------------- +Thu Jan 18 13:28:17 UTC 2018 - ygao@suse.com + +- configure: Check for python3 with AM_PATH_PYTHON (fate#323526) + * fate-323526_pacemaker-pacemaker-configure-AM_PATH_PYTHON-python3.patch + +------------------------------------------------------------------- +Sat Jan 13 11:38:33 UTC 2018 - ygao@suse.com + +- Update to version 1.1.18+20180112.bd7115b8c: +- tools: improve help text +- libpe_status: deprecate restart-type and role_after_failure + +------------------------------------------------------------------- +Wed Jan 10 05:18:59 UTC 2018 - ygao@suse.com + +- Update to version 1.1.18+20180109.57d48a1b1: +- libcluster,libcrmcommon: improve BZ2 error messages +- all: use consistent exit status codes +- libcrmcommon,tools: improve XML write error handling +- stonithd,libcrmcommon: auto-calculate stonith-watchdog-timeout when requested (fate#324508) +- logrotate: switch user when rotating logs + +------------------------------------------------------------------- +Tue Jan 9 14:43:27 UTC 2018 - ygao@suse.com + +- cts: Operate pacemaker service on startup to prevent triggering StopWhenUnneeded of corosync service + * pacemaker-cts-StartCmd.patch + ------------------------------------------------------------------- Fri Jan 05 03:16:07 UTC 2018 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 11e2a4f..89e69b7 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -67,7 +67,7 @@ %endif Name: pacemaker -Version: 1.1.18+20180104.7ba28d854 +Version: 1.1.18+20180118.9c3f7a49c Release: 0 Summary: Scalable High-Availability cluster resource manager # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary @@ -89,6 +89,8 @@ Patch7: bug-943295_pacemaker-lrmd-log-notice.patch Patch8: bug-977201_pacemaker-controld-self-fencing.patch Patch9: bug-995365_pacemaker-cts-restart-systemd-journald.patch Patch10: fate-323526_pacemaker-tests-shebang-python3.patch +Patch11: pacemaker-cts-StartCmd.patch +Patch12: fate-323526_pacemaker-pacemaker-configure-AM_PATH_PYTHON-python3.patch # Required for core functionality BuildRequires: autoconf BuildRequires: automake @@ -109,15 +111,14 @@ BuildRequires: sed BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(corosync) BuildRequires: pkgconfig(dbus-1) -## version lower bound for: G_GNUC_INTERNAL -BuildRequires: pkgconfig(glib-2.0) >= 2.6 +BuildRequires: pkgconfig(glib-2.0) >= 2.16 BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(libexslt) # Pacemaker requires a minimum libqb functionality BuildRequires: pkgconfig(libqb) > 0.13.0 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) -# Pacemaker targets compatibility with python 2.6+ and 3.2+ +# Pacemaker targets compatibility with python 2.7 and 3.2+ BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(uuid) @@ -299,6 +300,8 @@ manager. %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 %build