diff --git a/_servicedata b/_servicedata index bb73cd1..ffb1772 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ git://github.com/ClusterLabs/pacemaker.git - 633845120c493da6853b4f61138582ba820a7a0e + 224e03bb1a842db796283054eb27eee6f00f1a7c \ No newline at end of file diff --git a/bug-977201_pacemaker-controld-self-fencing.patch b/bug-977201_pacemaker-controld-self-fencing.patch index beb15fa..8f0ad44 100644 --- a/bug-977201_pacemaker-controld-self-fencing.patch +++ b/bug-977201_pacemaker-controld-self-fencing.patch @@ -4,16 +4,16 @@ Date: Mon Jun 13 17:26:27 2016 +0200 Fix: controld: Prevent unwanted self-fencing if "stateful_merge_wait" state of dlm is not available -diff --git a/extra/resources/controld b/extra/resources/controld -index ddb514a..37d5c62 100644 ---- a/extra/resources/controld -+++ b/extra/resources/controld -@@ -232,10 +232,6 @@ controld_monitor() { +Index: pacemaker-1.1.18+20180427.a34ccd926/extra/resources/controld +=================================================================== +--- pacemaker-1.1.18+20180427.a34ccd926.orig/extra/resources/controld ++++ pacemaker-1.1.18+20180427.a34ccd926/extra/resources/controld +@@ -227,10 +227,6 @@ controld_monitor() { if [ -n "$smw" ] && [ $smw -eq 1 ]; then ocf_log err "DLM status is: stateful_merge_wait" rc=$OCF_ERR_GENERIC - elif [ -z "$smw" ] && dlm_tool ls | grep -q "wait fencing" && \ -- ! stonith_admin -H '*' -V | grep -q "wishes to"; then +- ! stonith_admin -H '*' -V | grep -q "wishes to"; then - ocf_log err "DLM status is: wait fencing" - rc=$OCF_ERR_GENERIC else diff --git a/fate-323526_pacemaker-tests-shebang-python3.patch b/fate-323526_pacemaker-tests-shebang-python3.patch deleted file mode 100644 index ceb9cb7..0000000 --- a/fate-323526_pacemaker-tests-shebang-python3.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: pacemaker-1.1.18+20180129.c801ab11e/cts/CIB.py -=================================================================== ---- pacemaker-1.1.18+20180129.c801ab11e.orig/cts/CIB.py -+++ pacemaker-1.1.18+20180129.c801ab11e/cts/CIB.py -@@ -403,7 +403,7 @@ Description=Dummy resource that takes a - - [Service] - Type=notify --ExecStart=/usr/bin/python -c 'import time, systemd.daemon; time.sleep(10); systemd.daemon.notify("READY=1"); time.sleep(86400)' -+ExecStart=/usr/bin/python3 -c 'import time, systemd.daemon; time.sleep(10); systemd.daemon.notify("READY=1"); time.sleep(86400)' - ExecStop=/bin/sh -c 'sleep 10; [ -n "\$MAINPID" ] && kill -s KILL \$MAINPID' - """ - diff --git a/pacemaker-1.1.18+20180406.633845120.tar.xz b/pacemaker-1.1.18+20180406.633845120.tar.xz deleted file mode 100644 index e38a21c..0000000 --- a/pacemaker-1.1.18+20180406.633845120.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a8dcf20edf5c7d01201771b805e2a2cec5c8fa65558a261ee3b9bb2330b2eb1 -size 3260056 diff --git a/pacemaker-1.1.18+20180430.b12c320f5.tar.xz b/pacemaker-1.1.18+20180430.b12c320f5.tar.xz new file mode 100644 index 0000000..bd16b47 --- /dev/null +++ b/pacemaker-1.1.18+20180430.b12c320f5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:527dc034a5ab7c2a20c17aa10b3679debcd7d11eeabf2a736591e589fbb3f650 +size 3279084 diff --git a/pacemaker.changes b/pacemaker.changes index 7c86839..1763652 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,52 @@ +------------------------------------------------------------------- +Wed May 2 12:48:53 UTC 2018 - ygao@suse.com + +- Update to version 1.1.18+20180430.b12c320f5: + * XML: upgrade-2.10.xsl: fix "mark space" issue (bsc#1091661) + +------------------------------------------------------------------- +Sat Apr 28 21:07:31 UTC 2018 - ygao@suse.com + +- Update to version 1.1.18+20180427.a34ccd926: +- crmd: avoid double free after ACL rejection of resource delete +- lib: Changed to lowercase comparison. +- all: correct misspellings +- controld: remove deprecated configdir parameter +- controld: deprecate and ignore configdir parameter +- controld: consistently indent with spaces instead of tabs +- libcrmcommon: don't record pending notify actions as completed +- crmd: improve messages when a node is unexpectedly lost +- cib: improve shutdown messages +- cts-regression: allow specifying to run multiple tests again (bsc#1091360) + +------------------------------------------------------------------- +Wed Apr 18 15:36:43 UTC 2018 - ygao@suse.com + +- Update to version 1.1.18+20180417.24df451b5: +- alerts: Delete redundant code. +- liblrmd: cast time_t to long long when printing + +- cts: separate dummy systemd service into separate files + * Drop obsolete fate-323526_pacemaker-tests-shebang-python3.patch + +- crm_diff: rhbz#1561617 - Ignore attribute placement when comparing in 'cib' mode +- spec: remove reference to long-gone file +- spec: mark -cts & -doc packages as noarch +- spec: fix malformed conditional macros for systemd-less cases +- alerts: Change timestamp of Alert of snmp. + +------------------------------------------------------------------- +Thu Apr 12 08:30:58 UTC 2018 - ygao@suse.com + +- Update to version 1.1.18+20180411.2f77f4922: +- libcrmcommon: free signal triggers when cleaning up mainloop +- libcrmcommon: fix memory leak in schema workaround +- fencing: avoid memory leaks when freeing remote operation +- fencing: free dynamic memory at stonithd shutdown +- crmd: delete resource from lrmd when appropriate +- Test: rhbz#1565187 - Ensure failures that cause fencing are not removed until after fencing completes +- rhbz#1565187 - Ensure failures that cause fencing are not removed until after fencing completes + ------------------------------------------------------------------- Mon Apr 9 09:19:28 UTC 2018 - ygao@suse.com @@ -33,7 +82,7 @@ Fri Apr 6 14:49:31 UTC 2018 - ygao@suse.com - Update to version 1.1.18+20180406.18fe1cc2b: - XML: upgrade-2.10.xsl: add transform for automatic upgrades to latest schema - Log: establish correct character string literals also with qb_logt sink -- pengine: fix swapped warning message arguments leading to segfault +- pengine: fix swapped warning message arguments leading to segfault (bsc#1090538) - cts-pengine: add regression test for notifications for unrunnable actions - cts-pengine: update regression tests for notification changes - rhbz#1545449 - Do not perform notifications for events we know wont be executed diff --git a/pacemaker.spec b/pacemaker.spec index af69244..e237f15 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -71,7 +71,7 @@ %endif Name: pacemaker -Version: 1.1.18+20180406.633845120 +Version: 1.1.18+20180430.b12c320f5 Release: 0 Summary: Scalable High-Availability cluster resource manager # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary @@ -91,8 +91,7 @@ Patch5: pacemaker-Wno-format-signedness.patch Patch6: bug-943295_pacemaker-lrmd-log-notice.patch Patch7: bug-977201_pacemaker-controld-self-fencing.patch Patch8: bug-995365_pacemaker-cts-restart-systemd-journald.patch -Patch9: fate-323526_pacemaker-tests-shebang-python3.patch -Patch10: pacemaker-cts-StartCmd.patch +Patch9: pacemaker-cts-StartCmd.patch # Required for core functionality BuildRequires: autoconf BuildRequires: automake @@ -114,7 +113,7 @@ BuildRequires: openssh BuildRequires: procps %endif BuildRequires: pkgconfig(bzip2) -BuildRequires: pkgconfig(corosync) +BuildRequires: pkgconfig(corosync) >= 2.0.0 BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(glib-2.0) >= 2.16 BuildRequires: pkgconfig(gnutls) @@ -247,7 +246,7 @@ Requires: libpacemaker3 = %{version}-%{release} Requires: libtool-ltdl-devel Requires: pkgconfig Requires: pkgconfig(bzip2) -Requires: pkgconfig(corosync) +Requires: pkgconfig(corosync) >= 2.0.0 Requires: pkgconfig(glib-2.0) Requires: pkgconfig(libqb) Requires: pkgconfig(libxml-2.0) @@ -275,6 +274,7 @@ Summary: Test framework for cluster-related technologies Group: Productivity/Clustering/HA Requires: libpacemaker3 = %{version}-%{release} Requires: python3 +BuildArch: noarch #Requires: python3-systemd Recommends: python3-systemd @@ -285,6 +285,7 @@ Test framework for cluster-related technologies like Pacemaker %package doc Summary: Documentation for Pacemaker Group: Productivity/Clustering/HA +BuildArch: noarch %description doc Documentation for Pacemaker. @@ -304,11 +305,10 @@ manager. %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 %build -export systemdunitdir=%{?_unitdir}%{?!_unitdir:no} +export systemdunitdir=%{?_unitdir}%{!?_unitdir:no} %if %{with hardening} # prefer distro-provided hardening flags in case they are defined @@ -353,7 +353,7 @@ make %{?_smp_mflags} all %make_install install -d -m755 %{buildroot}%{_fillupdir} -install -m 644 mcp/pacemaker.sysconfig %{buildroot}%{_fillupdir}/sysconfig.pacemaker +install -m 644 daemons/pacemakerd/pacemaker.sysconfig %{buildroot}%{_fillupdir}/sysconfig.pacemaker install -m 644 tools/crm_mon.sysconfig %{buildroot}%{_fillupdir}/sysconfig.crm_mon # These are not actually scripts @@ -363,9 +363,6 @@ find %{buildroot} -name '*.xml' -type f -print0 | xargs -0 chmod a-x find %{buildroot} -type f -name "*.a" -delete -print find %{buildroot} -type f -name "*.la" -delete -print -# Do not package these either -rm -f %{buildroot}/%{_libdir}/service_crm.so - # Don't ship init scripts for systemd based platforms rm -f %{buildroot}/%{_initddir}/pacemaker rm -f %{buildroot}/%{_initddir}/pacemaker_remote @@ -439,6 +436,15 @@ fi %postun cli %service_del_postun crm_mon.service +%post cts +%service_add_post pacemaker-cts-dummyd@.service + +%preun cts +%service_del_preun pacemaker-cts-dummyd@.service + +%postun cts +%service_del_postun pacemaker-cts-dummyd@.service + %pre -n libpacemaker3 getent group %{gname} >/dev/null || groupadd -r %{gname} -g 189 getent passwd %{uname} >/dev/null || useradd -r -g %{gname} -u 189 -s /sbin/nologin -c "cluster user" %{uname} @@ -623,6 +629,7 @@ fi %defattr(-,root,root) %{python3_sitelib}/cts %{_datadir}/pacemaker/tests +%{_unitdir}/pacemaker-cts-dummyd@.service #%license licenses/GPLv2 %doc COPYING ChangeLog