From e14ffaa950057f6de6f7cccd305391b696fea0d6b638ca16dd74612bf53afcab Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Sat, 23 Dec 2017 15:19:10 +0000 Subject: [PATCH] Accepting request 559624 from home:yan_gao:branches:network:ha-clustering:Factory:Test - Update to version 1.1.18+20171221.c91a650ec: - cib,libcrmcommon: drop support for PCMK_legacy variable - crmd: drop support for DCs that don't support throttling - libcrmcommon: drop special handling of pre-1.1.4 migration history entries - libcrmcommon: drop special handling of pre-1.1.7 failed recurring op history - libcrmcluster: use crm_strdup_printf() instead of calloc() - attrd: avoid small memory leak at start-up - systemd unit files: restore DBus dependency - libcrmservice: avoid memory leak on DBus error - pengine: validate more function arguments - Upstream version cs: 098d557cc495944e1b6ebd9d05b819d6da74825e - libpe_status: drop support for "requires" operation meta-attribute (fate#324508) - tools: crm_resource --cleanup with no resource specified (bsc#1071503) - tools: crm_resource --cleanup (bsc#1071503) - crmd,libpe_status: drop support for legacy option aliases (fate#324508) - libstonithd,libpe_status: drop support for pcmk_poweroff_action (fate#324508) - libstonithd,libpe_status: drop support for pcmk_arg_map (fate#324508) - libstonithd,libpe_status: drop support for pcmk_*_cmd (fate#324508) - libpe_status,libpe_rules: drop support for default-action-timeout (fate#324508) - libpe_status: use correct default timeout for probes - libpe_status: drop support for operation meta-attributes in instance_attributes (fate#324508) - libpe_status: fix precedence of operation meta-attributes - libpe_status,libpe_rules: remove support for is-managed-default (fate#324508) - libpe_status,libpe_rules: drop support for default-resource-stickiness (fate#324508) - crmd: drop support for LRMD_MAX_CHILDREN environment variable (fate#324508) - tools: remove crm_mon SMTP support (fate#324508) - tools: remove crm_mon SNMP support (fate#324508) - lrmd: remove deprecated -r/--dummy command-line option (fate#324508) OBS-URL: https://build.opensuse.org/request/show/559624 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=287 --- _service | 9 ++-- pacemaker-1.1.18+20171129.407ded8de.tar.bz2 | 3 -- pacemaker-1.1.18+20171221.c91a650ec.tar.xz | 3 ++ pacemaker.changes | 59 ++++++++++++++++++--- pacemaker.spec | 42 ++++----------- 5 files changed, 69 insertions(+), 47 deletions(-) delete mode 100644 pacemaker-1.1.18+20171129.407ded8de.tar.bz2 create mode 100644 pacemaker-1.1.18+20171221.c91a650ec.tar.xz diff --git a/_service b/_service index ae910db..c37468a 100644 --- a/_service +++ b/_service @@ -10,13 +10,14 @@ 1.1.18 --> - 1.1.18+git%cd.%h - 407ded8de381543e71c5b94b3ade296fcfd2c828 + 1.1.18+%cd.%h + 2.0 + enable - *pacemaker*.tar - bz2 + pacemaker*.tar + xz diff --git a/pacemaker-1.1.18+20171129.407ded8de.tar.bz2 b/pacemaker-1.1.18+20171129.407ded8de.tar.bz2 deleted file mode 100644 index 4635bfc..0000000 --- a/pacemaker-1.1.18+20171129.407ded8de.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ccd0926b70c82150da11ae859bf8f7734b3675729a29e6f58c18512b3fcddcc -size 4144658 diff --git a/pacemaker-1.1.18+20171221.c91a650ec.tar.xz b/pacemaker-1.1.18+20171221.c91a650ec.tar.xz new file mode 100644 index 0000000..9a61968 --- /dev/null +++ b/pacemaker-1.1.18+20171221.c91a650ec.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:759e78a80c9d8f10fb3f0a9dfdd44b71747d3f4095919924b27b40f8ce52f062 +size 3227268 diff --git a/pacemaker.changes b/pacemaker.changes index 31ab2d6..37ebe61 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Sat Dec 23 12:03:19 UTC 2017 - ygao@suse.com + +- Update to version 1.1.18+20171221.c91a650ec: +- cib,libcrmcommon: drop support for PCMK_legacy variable +- crmd: drop support for DCs that don't support throttling +- libcrmcommon: drop special handling of pre-1.1.4 migration history entries +- libcrmcommon: drop special handling of pre-1.1.7 failed recurring op history + +------------------------------------------------------------------- +Fri Dec 22 05:15:12 UTC 2017 - ygao@suse.com + +- libcrmcluster: use crm_strdup_printf() instead of calloc() +- attrd: avoid small memory leak at start-up +- systemd unit files: restore DBus dependency +- libcrmservice: avoid memory leak on DBus error +- pengine: validate more function arguments +- Upstream version cs: 098d557cc495944e1b6ebd9d05b819d6da74825e + +------------------------------------------------------------------- +Mon Dec 18 13:22:27 UTC 2017 - ygao@suse.com + +- libpe_status: drop support for "requires" operation meta-attribute (fate#324508) +- tools: crm_resource --cleanup with no resource specified (bsc#1071503) +- tools: crm_resource --cleanup (bsc#1071503) +- crmd,libpe_status: drop support for legacy option aliases (fate#324508) +- libstonithd,libpe_status: drop support for pcmk_poweroff_action (fate#324508) +- libstonithd,libpe_status: drop support for pcmk_arg_map (fate#324508) +- libstonithd,libpe_status: drop support for pcmk_*_cmd (fate#324508) +- libpe_status,libpe_rules: drop support for default-action-timeout (fate#324508) +- libpe_status: use correct default timeout for probes +- libpe_status: drop support for operation meta-attributes in instance_attributes (fate#324508) +- libpe_status: fix precedence of operation meta-attributes +- libpe_status,libpe_rules: remove support for is-managed-default (fate#324508) +- libpe_status,libpe_rules: drop support for default-resource-stickiness (fate#324508) +- crmd: drop support for LRMD_MAX_CHILDREN environment variable (fate#324508) +- tools: remove crm_mon SMTP support (fate#324508) +- tools: remove crm_mon SNMP support (fate#324508) +- lrmd: remove deprecated -r/--dummy command-line option (fate#324508) +- tools: crm_resource --cleanup for non-primitive resources (bsc#1071503) +- pengine: unfence before probing or starting fence devices +- Upstream version cs: 4528eb3b726197ab077243ab923ed291473f0ed7 + ------------------------------------------------------------------- Thu Nov 30 15:50:43 UTC 2017 - ygao@suse.com @@ -7,11 +50,11 @@ Thu Nov 30 15:50:43 UTC 2017 - ygao@suse.com ------------------------------------------------------------------- Thu Nov 30 15:43:02 UTC 2017 - ygao@suse.com -- libpe_status: remove support for default-resource-failure-stickiness -- libpe_status: remove support for resource-failure-stickiness -- various: remove support for pre-Pacemaker-1.0 CIB XML -- libpe_status,tools: remove support for legacy ticket state entries -- various: remove isolation wrapper support +- libpe_status: remove support for default-resource-failure-stickiness (fate#324508) +- libpe_status: remove support for resource-failure-stickiness (fate#324508) +- various: remove support for pre-Pacemaker-1.0 CIB XML (fate#324508) +- libpe_status,tools: remove support for legacy ticket state entries (fate#324508) +- various: remove isolation wrapper support (fate#324508) - systemd unit files: enable TasksMax=infinity (bsc#1028138, bsc#1066710) * Drop obsolete bug-1028138_pacemaker-pacemaker.service-TasksMax.patch @@ -27,8 +70,8 @@ Wed Nov 29 12:31:43 UTC 2017 - ygao@suse.com ------------------------------------------------------------------- Wed Nov 29 12:05:00 UTC 2017 - ygao@suse.com -- crmd: default record-pending to TRUE -- tools: enable new crm_resource --cleanup/--refresh behavior +- crmd: default record-pending to TRUE (fate#324508) +- tools: enable new crm_resource --cleanup/--refresh behavior (fate#324508) - Upstream version cs: f36ad364748880815bf00151c516a1f2deae2fed ------------------------------------------------------------------- @@ -297,7 +340,7 @@ Mon Jul 31 09:40:31 UTC 2017 - ygao@suse.com - crmd: log correct feature set revision - PE: update start-failure-is-fatal help - cib: avoid unnecessary memory allocation -- stonith-ng: add pcmk_delay_base as static base-delay +- stonith-ng: add pcmk_delay_base as static base-delay (fate#324488) - XML: upgrade-1.3.xsl: be explicit about non 1:1 wrt. ACL @attributes - enable upgrade XSLTs to use meaningfully - Tools: Added option of --why/Y to crm_resource to inform the status of resources if running or not diff --git a/pacemaker.spec b/pacemaker.spec index e3de4e3..f1695b6 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -30,14 +30,10 @@ ## Where to install Pacemaker documentation %global pcmk_docdir %{_docdir}/%{name} -%global commit 1.1.18+20171129.407ded8de - ## Corosync version %define cs_version 2 %define with_nagios 1 -%define with_snmp 0 -%define with_esmtp 0 %define with_cibsecrets 1 %define enable_lib_cluster_pkg 0 %define enable_fatal_warnings 0 @@ -71,7 +67,7 @@ %endif Name: pacemaker -Version: 1.1.18 +Version: 1.1.18+20171221.c91a650ec Release: 0 Summary: Scalable High-Availability cluster resource manager # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary @@ -80,7 +76,7 @@ Group: Productivity/Clustering/HA Url: http://www.clusterlabs.org # Hint: use "spectool -s 0 pacemaker.spec" (rpmdevtools) to check the final URL: # https://github.com/ClusterLabs/pacemaker/archive/e91769e5a39f5cb2f7b097d3c612368f0530535e/pacemaker-e91769e.tar.gz -Source0: %{name}-%{commit}.tar.bz2 +Source0: %{name}-%{version}.tar.xz Source1: crm_report.in Source100: pacemaker.rpmlintrc Patch1: bug-806256_pacemaker-log-level-notice.patch @@ -162,12 +158,6 @@ BuildRequires: asciidoc BuildRequires: inkscape BuildRequires: publican %endif -%if %{with_snmp} -BuildRequires: net-snmp-devel -%endif -%if %{with_esmtp} -BuildRequires: libesmtp-devel -%endif %if %{with_regression_tests} BuildRequires: procps BuildRequires: python-curses @@ -176,7 +166,7 @@ BuildRequires: python-xml %description Pacemaker is an advanced, scalable High-Availability cluster resource -manager for Corosync, CMAN and/or Linux-HA. +manager. It supports more than 16 node clusters with significant capabilities for managing resources and dependencies. @@ -194,7 +184,7 @@ Requires: perl-TimeDate %description cli Pacemaker is an advanced, scalable High-Availability cluster resource -manager for Corosync, CMAN and/or Linux-HA. +manager. The %{name}-cli package contains command line tools that can be used to query and control the cluster from machines that may, or may not, @@ -206,7 +196,7 @@ Group: Productivity/Clustering/HA %description -n libpacemaker3 Pacemaker is an advanced, scalable High-Availability cluster resource -manager for Corosync, CMAN and/or Linux-HA. +manager. The libpacemaker3 package contains shared libraries needed for cluster nodes and those just running the CLI tools. @@ -219,7 +209,7 @@ Requires: libpacemaker3 = %{version}-%{release} %description -n libpacemaker3-cluster Pacemaker is an advanced, scalable High-Availability cluster resource -manager for Corosync, CMAN and/or Linux-HA. +manager. The libpacemaker3-cluster package contains cluster-aware shared libraries needed for nodes that will form part of the cluster nodes. @@ -235,7 +225,7 @@ Requires: resource-agents %description remote Pacemaker is an advanced, scalable High-Availability cluster resource -manager for Corosync, CMAN and/or Linux-HA. +manager. The %{name}-remote package contains the Pacemaker Remote daemon which is capable of extending pacemaker functionality to remote @@ -267,7 +257,7 @@ Requires: pacemaker %description -n libpacemaker-devel Pacemaker is an advanced, scalable High-Availability cluster resource -manager for Corosync, CMAN and/or Linux-HA. +manager. The libpacemaker-devel package contains headers and shared libraries for developing tools for Pacemaker. @@ -293,11 +283,11 @@ Group: Productivity/Clustering/HA Documentation for Pacemaker. Pacemaker is an advanced, scalable High-Availability cluster resource -manager for Corosync, CMAN and/or Linux-HA. +manager. %endif %prep -%setup -q -n %{name}-%{commit} +%setup -q -n %{name}-%{version} %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -332,18 +322,10 @@ autoreconf -fvi --docdir=%{_docdir}/%{name} \ --disable-static \ --disable-silent-rules \ - --without-cman \ - --without-heartbeat \ --with-acl=true \ %if %{with_nagios} --with-nagios=true \ %endif -%if %{with_snmp} - --with-snmp=true \ -%endif -%if %{with_esmtp} - --with-esmtp=true \ -%endif %if %{with_cibsecrets} --with-cibsecrets=true \ %endif @@ -382,9 +364,6 @@ rm -f %{buildroot}/%{_libdir}/service_crm.so rm -f %{buildroot}/%{_initddir}/pacemaker rm -f %{buildroot}/%{_initddir}/pacemaker_remote -# Don't ship fence_pcmk where it has no use -rm -f %{buildroot}/%{_sbindir}/fence_pcmk - %if %{with coverage} GCOV_BASE=%{buildroot}/%{_var}/lib/pacemaker/gcov mkdir -p $GCOV_BASE @@ -576,7 +555,6 @@ fi %exclude %{_mandir}/man7/ocf_pacemaker_remote.* %{_mandir}/man8/* %exclude %{_mandir}/man8/crm_node.* -%exclude %{_mandir}/man8/fence_pcmk.* %exclude %{_mandir}/man8/fence_legacy.* %exclude %{_mandir}/man8/pacemakerd.* %exclude %{_mandir}/man8/pacemaker_remoted.*