From 68eff2f20bcf12790a6f6c90ab1a97fc11b89a13426e9976ed60c22684a2a400 Mon Sep 17 00:00:00 2001
From: Yan Gao <ygao@suse.com>
Date: Mon, 31 Jul 2017 15:14:51 +0000
Subject: [PATCH] Accepting request 513590 from
 home:yan_gao:branches:network:ha-clustering:Factory:Test

- logging: ensure blackbox gets generated on arithmetic error
- crm_mon: overcome crm_system_name no longer influenced with argv
- crm_mon: make CGI bail out on suspicious arguments
- crm_mon: make CGI bail out properly and w/o help screen
- crm_mon: canonical casing of Content-Type CGI header field
- libcrmcommon: handle schema versions properly
- attrd: don't reconnect to lrmd if already connected
- PE: Ensure nested container connections run on the same host
- crmd: send alerts via lrmd
- lrmd: execute alerts as cluster daemon user
- libservices: add ability to specify user to run an action
- libcrmcommon: improve user lookup messages
- extra: correct ClusterMon metadata
- attrd: avoid memory leak when disconnecting from lrmd
- attrd,tools: avoid memory leaks from use of crm_itoa()
- attrd: be consistent about attr/host logging
- attrd: delay lrmd connect until needed
- attrd: add timestamp to alert just when needed
- attrd: improve log messages
- libcrmcommon,libpe_rules: avoid crash when alerts section has comments
- libcrmcommon: add API call for next named XML child
- liblrmd: only set environment variables with a value
- attrd,liblrmd: handle adding env var at head of list
- lrmd: drain alerts at shutdown
- attrd,lrmd: generate alert sequence number in lrmd
- liblrmd: better trace message when creating command
- stonith-ng: avoid double-free of pending-ops in free_device
- crmd: log correct feature set revision
- PE: update start-failure-is-fatal help
- cib: avoid unnecessary memory allocation

OBS-URL: https://build.opensuse.org/request/show/513590
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=272
---
 _service                                    |  6 +-
 bug-806256_pacemaker-log-level-notice.patch | 24 +++---
 pacemaker-1.1.16+20170531.e47bd5bc7.tar.bz2 |  3 -
 pacemaker-1.1.17+20170727.d134f83b4.tar.bz2 |  3 +
 pacemaker.changes                           | 93 ++++++++++++++++++++-
 pacemaker.spec                              |  6 +-
 6 files changed, 111 insertions(+), 24 deletions(-)
 delete mode 100644 pacemaker-1.1.16+20170531.e47bd5bc7.tar.bz2
 create mode 100644 pacemaker-1.1.17+20170727.d134f83b4.tar.bz2

diff --git a/_service b/_service
index 26b30f7..53ef6ca 100644
--- a/_service
+++ b/_service
@@ -8,10 +8,10 @@
     To update to a new release, change "revision" to the desired
     git commit hash and bump "version" if necessary
 
-    <param name="version">1.1.16</param>
+    <param name="version">1.1.17</param>
 -->
-    <param name="versionformat">1.1.16+git%cd.%h</param>
-    <param name="revision">e47bd5bc77a3d1b38589b3716f5112ed39329e7b</param>
+    <param name="versionformat">1.1.17+git%cd.%h</param>
+    <param name="revision">d134f83b4f0188f6d7cd381c8cdda1a2a7c38bd5</param>
   </service>
 
   <service name="recompress" mode="disabled">
diff --git a/bug-806256_pacemaker-log-level-notice.patch b/bug-806256_pacemaker-log-level-notice.patch
index 82ddd43..e33ee69 100644
--- a/bug-806256_pacemaker-log-level-notice.patch
+++ b/bug-806256_pacemaker-log-level-notice.patch
@@ -4,11 +4,11 @@ Date:   Thu Mar 14 09:41:53 2013 +0800
 
     Log: Change some messages to notice level (bnc#806256)
 
-Index: pacemaker-1.1.14+git20160209.8d93feb/crmd/membership.c
+Index: pacemaker-1.1.17+20170727.d134f83b4/crmd/membership.c
 ===================================================================
---- pacemaker-1.1.14+git20160209.8d93feb.orig/crmd/membership.c
-+++ pacemaker-1.1.14+git20160209.8d93feb/crmd/membership.c
-@@ -425,7 +425,7 @@ crm_update_quorum(gboolean quorum, gbool
+--- pacemaker-1.1.17+20170727.d134f83b4.orig/crmd/membership.c
++++ pacemaker-1.1.17+20170727.d134f83b4/crmd/membership.c
+@@ -434,7 +434,7 @@ crm_update_quorum(gboolean quorum, gbool
          crm_xml_add(update, XML_ATTR_DC_UUID, fsa_our_uuid);
  
          fsa_cib_update(XML_TAG_CIB, update, call_options, call_id, NULL);
@@ -16,11 +16,11 @@ Index: pacemaker-1.1.14+git20160209.8d93feb/crmd/membership.c
 +        crm_notice("Updating quorum status to %s (call=%d)", quorum ? "true" : "false", call_id);
          fsa_register_cib_callback(call_id, FALSE, NULL, cib_quorum_update_complete);
          free_xml(update);
-     }
-Index: pacemaker-1.1.14+git20160209.8d93feb/crmd/tengine.c
+ 
+Index: pacemaker-1.1.17+20170727.d134f83b4/crmd/tengine.c
 ===================================================================
---- pacemaker-1.1.14+git20160209.8d93feb.orig/crmd/tengine.c
-+++ pacemaker-1.1.14+git20160209.8d93feb/crmd/tengine.c
+--- pacemaker-1.1.17+20170727.d134f83b4.orig/crmd/tengine.c
++++ pacemaker-1.1.17+20170727.d134f83b4/crmd/tengine.c
 @@ -214,7 +214,7 @@ do_te_invoke(long long action,
          destroy_graph(transition_graph);
          transition_graph = unpack_graph(graph_data, graph_input);
@@ -30,11 +30,11 @@ Index: pacemaker-1.1.14+git20160209.8d93feb/crmd/tengine.c
                   graph_input);
  
          te_reset_job_counts();
-Index: pacemaker-1.1.14+git20160209.8d93feb/fencing/remote.c
+Index: pacemaker-1.1.17+20170727.d134f83b4/fencing/remote.c
 ===================================================================
---- pacemaker-1.1.14+git20160209.8d93feb.orig/fencing/remote.c
-+++ pacemaker-1.1.14+git20160209.8d93feb/fencing/remote.c
-@@ -574,7 +574,7 @@ remote_op_timeout(gpointer userdata)
+--- pacemaker-1.1.17+20170727.d134f83b4.orig/fencing/remote.c
++++ pacemaker-1.1.17+20170727.d134f83b4/fencing/remote.c
+@@ -576,7 +576,7 @@ remote_op_timeout(gpointer userdata)
          return FALSE;
      }
  
diff --git a/pacemaker-1.1.16+20170531.e47bd5bc7.tar.bz2 b/pacemaker-1.1.16+20170531.e47bd5bc7.tar.bz2
deleted file mode 100644
index b17f81d..0000000
--- a/pacemaker-1.1.16+20170531.e47bd5bc7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b19eeab04a456a70e94cd134caed4d6f39d548f189b4c71bae68099f4d313e7
-size 4046915
diff --git a/pacemaker-1.1.17+20170727.d134f83b4.tar.bz2 b/pacemaker-1.1.17+20170727.d134f83b4.tar.bz2
new file mode 100644
index 0000000..8dc3bfd
--- /dev/null
+++ b/pacemaker-1.1.17+20170727.d134f83b4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9686739823302e3719d9de86b688b3ff63ad2c8a24d3f59027ade03a3ddebd1f
+size 4165820
diff --git a/pacemaker.changes b/pacemaker.changes
index 442a0f7..d8d0a65 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,90 @@
+-------------------------------------------------------------------
+Mon Jul 31 09:40:31 UTC 2017 - ygao@suse.com
+
+- logging: ensure blackbox gets generated on arithmetic error
+- crm_mon: overcome crm_system_name no longer influenced with argv
+- crm_mon: make CGI bail out on suspicious arguments
+- crm_mon: make CGI bail out properly and w/o help screen
+- crm_mon: canonical casing of Content-Type CGI header field
+- libcrmcommon: handle schema versions properly
+- attrd: don't reconnect to lrmd if already connected
+- PE: Ensure nested container connections run on the same host
+- crmd: send alerts via lrmd
+- lrmd: execute alerts as cluster daemon user
+- libservices: add ability to specify user to run an action
+- libcrmcommon: improve user lookup messages
+- extra: correct ClusterMon metadata
+- attrd: avoid memory leak when disconnecting from lrmd
+- attrd,tools: avoid memory leaks from use of crm_itoa()
+- attrd: be consistent about attr/host logging
+- attrd: delay lrmd connect until needed
+- attrd: add timestamp to alert just when needed
+- attrd: improve log messages
+- libcrmcommon,libpe_rules: avoid crash when alerts section has comments
+- libcrmcommon: add API call for next named XML child
+- liblrmd: only set environment variables with a value
+- attrd,liblrmd: handle adding env var at head of list
+- lrmd: drain alerts at shutdown
+- attrd,lrmd: generate alert sequence number in lrmd
+- liblrmd: better trace message when creating command
+- stonith-ng: avoid double-free of pending-ops in free_device
+- 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
+- XML: upgrade-1.3.xsl: be explicit about non 1:1 wrt. ACL @attributes
+- enable upgrade XSLTs to use <xsl:message> meaningfully
+- Tools: Added option of --why/Y to crm_resource to inform the status of resources if running or not
+- various: fix spelling in messages and comments
+- cib: reword trace message
+- PE: Prevent use-after-free when creating bundle constraints
+- add versioned operations support
+- TE: don't bump counters when action or synapse is invalid
+- obtain metadata in CRMd via async call
+- tools: add version options for cibsecret
+- alerts: Support of meta attributes(kind, attribute_name).
+- attrd,lrmd,lib: Addition of the transmission function of the attribute alert to attrd.
+- extra: Change alert_xxx.sh.sample for attribute alerts.
+- extra: Change PCMK-MIB.txt for attribute alerts.
+- XML: upgrade-1.3.xsl: simplify branching
+- XML: upgrade-1.3.xsl: drop superfluous branching
+- XML: upgrade-1.3.xsl: simplify "weak identity" transform rules
+- XML: upgrade-1.3.xsl: easy simplifications + redundant declarations drop
+- re-enable versioned attributes
+- Upstream version cs: d134f83b4f0188f6d7cd381c8cdda1a2a7c38bd5
+
+-------------------------------------------------------------------
+Wed Jul 19 14:06:09 UTC 2017 - ygao@suse.com
+
+- Update to version 1.1.17
+- PE: Ensure unrecoverable remote nodes are fenced even if no resources can run on them
+- iso8601: strftime needs fully populated struct tm
+- crmd: abort transition whenever we lose quorum
+- PE: Ensure bundle nodes and child resources are correctly cleaned up
+- PE: Generic ordering for anything with bundles
+- PE: Default to non-interleaved bundle ordering for safety
+- PE: Functional inter-bundle ordering when either side has no child
+- PE: Basic inter-bundle ordering when both sides have children
+- PE: Implement bundle ordering
+- libpe_status: properly disallow other resources from bundle nodes
+- libcib: get remoteness correctly from node status
+- libpe_status: avoid memory leaks when creating bundle remote resource
+- libpe_status: disallow resources on bundle nodes
+- pengine: make checks a little safer
+- PE: Clones within bundles may also have notifications enabled
+- PE: Correctly implement pe_order_implies_first_printed
+- PE: Do not re-add a node's default score for each location constraint
+- PE: Bundle location constraints should only apply to the IP and docker resources
+- PE: Bundles: Allow clones to be colocated with bundles
+- PE: Bundles: Implement colocation of primitives and groups with bundles
+- cib,libcib: support option for IPC eviction threshold
+- libcib: correctly search for v2 patchset changes
+- libcib: always use current values when unpacking config
+- libcrmcluster: fix spelling error in error message
+- crmd: DC should update stonith fail count before aborting transition
+- cib: Broadcasts of cib changes should always pass ACLs check (bsc#1042054)
+- Upstream version cs: b36b869ca8fe74caa077c286304f653f0be117ef (Pacemaker-1.1.17)
+
 -------------------------------------------------------------------
 Fri Jun  2 12:58:32 UTC 2017 - ygao@suse.com
 
@@ -124,7 +211,7 @@ Mon May 15 12:41:35 UTC 2017 - ygao@suse.com
 - PE: Basic allocation of containers
 - Core: Track the line number of callers of crm_(set|clear)_bit
 - xml: Correctly find the first child element
-- PE: Basic container parsing and expansion
+- PE: Basic container parsing and expansion (fate#323415)
 - PE: Correctly test for clone functionality
 - Improve recovery when demote fails with OCF_NOT_RUNNING
 - Upstream version cs: ce86684f5d0672791e9fd3043a84f0931cdd97ea
@@ -168,7 +255,7 @@ Fri Mar 17 11:07:49 UTC 2017 - ygao@suse.com
 -------------------------------------------------------------------
 Thu Mar 16 14:25:19 UTC 2017 - ygao@suse.com
 
-- crmd: new cluster option stonith-max-attempts with default value 10
+- crmd: new cluster option stonith-max-attempts with default value 10 (fate#323417)
 - crmd: Change of the log level and addition of uuid.
 - crmd: use new attrd op to clear fail counts
 - tools: crm_resource -C should clear last-failure
@@ -237,7 +324,7 @@ Mon Mar  6 22:58:46 UTC 2017 - ygao@suse.com
 - crmd: be more resilient when checking an LRM command's "from"
 - crmd: improve crmd's LRM-related log messages
 - tools: properly ignore version with crm_diff --no-version (bsc#888726)
-- Ability to start node in standby
+- Ability to start node in standby (fate#323416)
 - Upstream version cs: a7825f4f0a8db272d1ce0b1f93e8044cbcaa5144
 
 -------------------------------------------------------------------
diff --git a/pacemaker.spec b/pacemaker.spec
index e692836..db1903b 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -25,7 +25,7 @@
 ## Where to install Pacemaker documentation
 %global pcmk_docdir %{_docdir}/%{name}
 
-%global commit 1.1.16+20170531.e47bd5bc7
+%global commit 1.1.17+20170727.d134f83b4
 
 ## Corosync version
 %define cs_version 2
@@ -66,12 +66,12 @@
 %endif
 
 Name:           pacemaker
-Version:        1.1.16
+Version:        1.1.17
 Release:        0
 Summary:        Scalable High-Availability cluster resource manager
+# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary
 License:        GPL-2.0 and GPL-2.0+ and LGPL-2.1+
 Group:          Productivity/Clustering/HA
-# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary
 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