rpms/pacemaker
5
0
Fork 0
Code Issues Pull Requests Releases Activity

* Wed Jan 18 2023 Klaus Wenninger <kwenning@redhat.com> - 2.1.5-4

Browse Source 
- use enum fenced_target_by consistency to cope with increased
  pickiness of gcc
This commit is contained in:
Klaus Wenninger 2023-01-18 16:39:49 +01:00
parent 9e824c5ee9
commit 169f701faa
2 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
0001-Fix-fenced-use-enum-fenced_target_by-consistently.patch Normal file
View File

@ -0,0 +1,53 @@
From 404f80ecdb81b8caccc1d153b97555c9b19365bf Mon Sep 17 00:00:00 2001
From: Klaus Wenninger <klaus.wenninger@aon.at>
Date: Wed, 18 Jan 2023 14:10:26 +0100
Subject: [PATCH] Fix: fenced: use enum fenced_target_by consistently
---
daemons/fenced/fenced_commands.c | 4 ++--
daemons/fenced/pacemaker-fenced.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/daemons/fenced/fenced_commands.c b/daemons/fenced/fenced_commands.c
index d4b9a6fbc..82644bcdd 100644
--- a/daemons/fenced/fenced_commands.c
+++ b/daemons/fenced/fenced_commands.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2022 the Pacemaker project contributors
+ * Copyright 2009-2023 the Pacemaker project contributors
*
* The version control history for this file may have further details.
*
@@ -1603,7 +1603,7 @@ stonith_level_key(const xmlNode *level, enum fenced_target_by mode)
*
* \return How to identify target of \p level
*/
-static int
+static enum fenced_target_by
unpack_level_kind(const xmlNode *level)
{
if (crm_element_value(level, XML_ATTR_STONITH_TARGET) != NULL) {
diff --git a/daemons/fenced/pacemaker-fenced.h b/daemons/fenced/pacemaker-fenced.h
index 4852b9029..a3d2e17b5 100644
--- a/daemons/fenced/pacemaker-fenced.h
+++ b/daemons/fenced/pacemaker-fenced.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2022 the Pacemaker project contributors
+ * Copyright 2009-2023 the Pacemaker project contributors
*
* This source code is licensed under the GNU General Public License version 2
* or later (GPLv2+) WITHOUT ANY WARRANTY.
@@ -223,7 +223,7 @@ int stonith_device_register(xmlNode *msg, gboolean from_cib);
void stonith_device_remove(const char *id, bool from_cib);
-char *stonith_level_key(const xmlNode *msg, int mode);
+char *stonith_level_key(const xmlNode *msg, enum fenced_target_by);
void fenced_register_level(xmlNode *msg, char **desc,
pcmk__action_result_t *result);
void fenced_unregister_level(xmlNode *msg, char **desc,
--
2.39.0

7
pacemaker.spec
View File

@ -32,7 +32,7 @@
## can be incremented to build packages reliably considered "newer"
## than previously built packages with the same pcmkversion)
%global pcmkversion 2.1.5
%global specversion 3
%global specversion 4
## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
%global commit a3f44794f94e1571c6ba0042915ade369b4ce4b1
@ -207,6 +207,7 @@ Source0: https://codeload.github.com/%{github_owner}/%{name}/tar.gz/%{arch
Source1: https://codeload.github.com/%{github_owner}/%{nagios_name}/tar.gz/%{nagios_archive_github_url}
# upstream commits
Patch0: 0001-Fix-fenced-use-enum-fenced_target_by-consistently.patch
Requires: resource-agents
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
@ -798,6 +799,10 @@ exit 0
%license %{nagios_name}-%{nagios_hash}/COPYING
%changelog
* Wed Jan 18 2023 Klaus Wenninger <kwenning@redhat.com> - 2.1.5-4
- use enum fenced_target_by consistency to cope with increased
pickiness of gcc
* Thu Dec 8 2022 Klaus Wenninger <kwenning@redhat.com> - 2.1.5-3
- Update for new upstream release tarball: Pacemaker-2.1.5,
for full details, see included ChangeLog file or