From f813a15ec26ec765f245c1d03903909b49ff6be1ab6283c7804ad79ed2b5c8a2 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Tue, 20 Feb 2024 21:49:26 +0000 Subject: [PATCH] Accepting request 1148355 from home:yan_gao:branches:network:ha-clustering:Factory - Update to version 2.1.7+20240220.d4f389e48: - libcrmcommon: avoid file descriptor leak in IPC client with async connection (bsc#1219323, gh#ClusterLabs/pacemaker#3351) - Update to version 2.1.7+20240219.a586196f1: - libcrmservice: Revert single quotes to double quotes in metadata - libcrmcommon: Always output request= in XML output. (gh#ClusterLabs/pacemaker#3362) - scheduler: improve date specification argument validation - libcrmcommon: Properly handle UTF-8 characters when escaping XML - libcrmcommon: Don't include "" as an attribute value - tools: Drop newline from crm_rule errors - libcrmcommon: Escape XML text content when adding it - libcrmcommon: Escape XML text content when dumping XML as string - libcrmcommon: crm_xml_escape() shouldn't stop on Unicode characters (gh#ClusterLabs/pacemaker#3323) - libcrmcommon: Always use XML substitutions - tools: crm_simulate output should match its schema - Rebase: * bug-728579_pacemaker-stonith-dev-id.patch OBS-URL: https://build.opensuse.org/request/show/1148355 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=392 --- _service | 2 +- _servicedata | 2 +- bug-728579_pacemaker-stonith-dev-id.patch | 34 +++++++++++------------ pacemaker-2.1.7+20240130.4f595be2b.tar.xz | 3 -- pacemaker-2.1.7+20240220.d4f389e48.tar.xz | 3 ++ pacemaker.changes | 25 +++++++++++++++++ pacemaker.spec | 2 +- 7 files changed, 48 insertions(+), 23 deletions(-) delete mode 100644 pacemaker-2.1.7+20240130.4f595be2b.tar.xz create mode 100644 pacemaker-2.1.7+20240220.d4f389e48.tar.xz diff --git a/_service b/_service index fe2e7b3..fa83b7b 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 2.1.7 --> 2.1.7+%cd.%h - 4f595be2b + d4f389e48 enable diff --git a/_servicedata b/_servicedata index 999529f..eeffbd4 100644 --- a/_servicedata +++ b/_servicedata @@ -5,4 +5,4 @@ https://github.com/ClusterLabs/pacemaker.git - 9c13ce6fe95812308443c188ace8f897e6bce942 \ No newline at end of file + 0ca251f040ee6a1d33c317cd86377d94b71303ed \ No newline at end of file diff --git a/bug-728579_pacemaker-stonith-dev-id.patch b/bug-728579_pacemaker-stonith-dev-id.patch index 6caff1c..e6ee711 100644 --- a/bug-728579_pacemaker-stonith-dev-id.patch +++ b/bug-728579_pacemaker-stonith-dev-id.patch @@ -4,22 +4,22 @@ Date: Thu Sep 6 15:14:58 2012 +0800 Medium: stonith: Expose IDs of stonith resources to stonith agents through "$CRM_meta_st_device_id" environment variable -Index: pacemaker-2.1.4+20220928.4690461db/daemons/fenced/fenced_commands.c +Index: pacemaker-2.1.7+20240208.bc5596299/daemons/fenced/fenced_commands.c =================================================================== ---- pacemaker-2.1.4+20220928.4690461db.orig/daemons/fenced/fenced_commands.c -+++ pacemaker-2.1.4+20220928.4690461db/daemons/fenced/fenced_commands.c -@@ -1096,6 +1096,7 @@ build_device_from_xml(xmlNode *dev) +--- pacemaker-2.1.7+20240208.bc5596299.orig/daemons/fenced/fenced_commands.c ++++ pacemaker-2.1.7+20240208.bc5596299/daemons/fenced/fenced_commands.c +@@ -1151,6 +1151,7 @@ build_device_from_xml(xmlNode *dev) (const char *) device->on_target_actions->str); } -+ g_hash_table_insert(device->params, strdup(CRM_META "_" F_STONITH_DEVICE), strdup(device->id)); ++ g_hash_table_insert(device->params, strdup(CRM_META "_" PCMK__XE_ST_DEVICE_ID), strdup(device->id)); device->work = mainloop_add_trigger(G_PRIORITY_HIGH, stonith_device_dispatch, device); /* TODO: Hook up priority */ -Index: pacemaker-2.1.4+20220928.4690461db/lib/fencing/st_actions.c +Index: pacemaker-2.1.7+20240208.bc5596299/lib/fencing/st_actions.c =================================================================== ---- pacemaker-2.1.4+20220928.4690461db.orig/lib/fencing/st_actions.c -+++ pacemaker-2.1.4+20220928.4690461db/lib/fencing/st_actions.c +--- pacemaker-2.1.7+20240208.bc5596299.orig/lib/fencing/st_actions.c ++++ pacemaker-2.1.7+20240208.bc5596299/lib/fencing/st_actions.c @@ -31,6 +31,7 @@ struct stonith_action_s { char *agent; char *action; @@ -28,7 +28,7 @@ Index: pacemaker-2.1.4+20220928.4690461db/lib/fencing/st_actions.c int timeout; bool async; void *userdata; -@@ -226,6 +227,7 @@ stonith__destroy_action(stonith_action_t +@@ -224,6 +225,7 @@ stonith__destroy_action(stonith_action_t services_action_free(action->svc_action); } pcmk__reset_result(&(action->result)); @@ -36,16 +36,16 @@ Index: pacemaker-2.1.4+20220928.4690461db/lib/fencing/st_actions.c free(action); } } -@@ -286,6 +288,8 @@ stonith__action_create(const char *agent +@@ -284,6 +286,8 @@ stonith__action_create(const char *agent if (device_args) { char buffer[512]; const char *value = NULL; -+ const char *st_dev_id_key = CRM_META "_" F_STONITH_DEVICE; ++ const char *st_dev_id_key = CRM_META "_" PCMK__XE_ST_DEVICE_ID; + const char *st_dev_id_value = NULL; snprintf(buffer, sizeof(buffer), "pcmk_%s_retries", action_name); value = g_hash_table_lookup(device_args, buffer); -@@ -293,6 +297,11 @@ stonith__action_create(const char *agent +@@ -291,6 +295,11 @@ stonith__action_create(const char *agent if (value) { action->max_retries = atoi(value); } @@ -57,7 +57,7 @@ Index: pacemaker-2.1.4+20220928.4690461db/lib/fencing/st_actions.c } return action; -@@ -630,6 +639,10 @@ internal_stonith_action_execute(stonith_ +@@ -628,6 +637,10 @@ internal_stonith_action_execute(stonith_ SVC_ACTION_NON_BLOCKED, "SVC_ACTION_NON_BLOCKED"); @@ -68,10 +68,10 @@ Index: pacemaker-2.1.4+20220928.4690461db/lib/fencing/st_actions.c /* keep retries from executing out of control and free previous results */ if (is_retry) { pcmk__reset_result(&(action->result)); -Index: pacemaker-2.1.4+20220928.4690461db/lib/services/services_linux.c +Index: pacemaker-2.1.7+20240208.bc5596299/lib/services/services_linux.c =================================================================== ---- pacemaker-2.1.4+20220928.4690461db.orig/lib/services/services_linux.c -+++ pacemaker-2.1.4+20220928.4690461db/lib/services/services_linux.c +--- pacemaker-2.1.7+20240208.bc5596299.orig/lib/services/services_linux.c ++++ pacemaker-2.1.7+20240208.bc5596299/lib/services/services_linux.c @@ -29,6 +29,9 @@ #include "crm/services.h" #include "crm/services_internal.h" @@ -90,7 +90,7 @@ Index: pacemaker-2.1.4+20220928.4690461db/lib/services/services_linux.c + if (pcmk__str_eq(op->standard, PCMK_RESOURCE_CLASS_STONITH, pcmk__str_casei) + && pcmk__str_eq(op->agent, "fence_legacy", pcmk__str_casei) + && op->rsc != NULL) { -+ const char *st_dev_id_key = CRM_META "_" F_STONITH_DEVICE; ++ const char *st_dev_id_key = CRM_META "_" PCMK__XE_ST_DEVICE_ID; + + setenv(st_dev_id_key, op->rsc, 1); + } diff --git a/pacemaker-2.1.7+20240130.4f595be2b.tar.xz b/pacemaker-2.1.7+20240130.4f595be2b.tar.xz deleted file mode 100644 index 9ea4ace..0000000 --- a/pacemaker-2.1.7+20240130.4f595be2b.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7de229823546f2045ba048fe47f2211519d4f3dccf1268cbb788c782fdd7d404 -size 4310328 diff --git a/pacemaker-2.1.7+20240220.d4f389e48.tar.xz b/pacemaker-2.1.7+20240220.d4f389e48.tar.xz new file mode 100644 index 0000000..cc923a4 --- /dev/null +++ b/pacemaker-2.1.7+20240220.d4f389e48.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:958b41613606d4acd94358b2ae37246b93af0df8cbca35dad4f732cff6a45f3c +size 4319684 diff --git a/pacemaker.changes b/pacemaker.changes index 6893460..fae7e1b 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Tue Feb 20 19:51:03 UTC 2024 - Yan Gao + +- Update to version 2.1.7+20240220.d4f389e48: +- libcrmcommon: avoid file descriptor leak in IPC client with async connection (bsc#1219323, gh#ClusterLabs/pacemaker#3351) + +------------------------------------------------------------------- +Tue Feb 20 07:21:52 UTC 2024 - Yan Gao + +- Update to version 2.1.7+20240219.a586196f1: +- libcrmservice: Revert single quotes to double quotes in metadata +- libcrmcommon: Always output request= in XML output. (gh#ClusterLabs/pacemaker#3362) +- scheduler: improve date specification argument validation +- libcrmcommon: Properly handle UTF-8 characters when escaping XML +- libcrmcommon: Don't include "" as an attribute value +- tools: Drop newline from crm_rule errors +- libcrmcommon: Escape XML text content when adding it +- libcrmcommon: Escape XML text content when dumping XML as string +- libcrmcommon: crm_xml_escape() shouldn't stop on Unicode characters (gh#ClusterLabs/pacemaker#3323) +- libcrmcommon: Always use XML substitutions +- tools: crm_simulate output should match its schema + +- Rebase: + * bug-728579_pacemaker-stonith-dev-id.patch + ------------------------------------------------------------------- Tue Feb 06 11:07:06 UTC 2024 - Yan Gao diff --git a/pacemaker.spec b/pacemaker.spec index 2c8df1b..2444631 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -129,7 +129,7 @@ %define with_regression_tests 0 Name: pacemaker -Version: 2.1.7+20240130.4f595be2b +Version: 2.1.7+20240220.d4f389e48 Release: 0 Summary: Scalable High-Availability cluster resource manager # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary