public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/pacemaker] rawhide: * Wed Jun 3 2026 Klaus Wenninger <kwenning@redhat.com> - 3.0.2-1
@ 2026-06-03 22:52 Klaus Wenninger
0 siblings, 0 replies; only message in thread
From: Klaus Wenninger @ 2026-06-03 22:52 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/pacemaker
Branch : rawhide
Commit : 50d3f0a992cb5d93641343fb578523f823973c2a
Author : Klaus Wenninger <klaus.wenninger@aon.at>
Date : 2026-06-04T00:07:51+02:00
Stats : +9/-555 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/pacemaker/c/50d3f0a992cb5d93641343fb578523f823973c2a?branch=rawhide
Log:
* Wed Jun 3 2026 Klaus Wenninger <kwenning@redhat.com> - 3.0.2-1
- Update for new upstream release tarball: Pacemaker-3.0.2,
for full details, see included ChangeLog.md file or
https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-3.0.2
---
diff --git a/0001-Low-various-Use-const-for-a-few-string-pointer-varia.patch b/0001-Low-various-Use-const-for-a-few-string-pointer-varia.patch
deleted file mode 100644
index 8cdbba3..0000000
--- a/0001-Low-various-Use-const-for-a-few-string-pointer-varia.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 12dff988989a0851b62a3b27b60632eec412b5ea Mon Sep 17 00:00:00 2001
-From: Reid Wahl <nrwahl@protonmail.com>
-Date: Sun, 30 Nov 2025 11:34:29 -0800
-Subject: [PATCH] Low: various: Use const for a few string pointer variables
-
-Pacemaker failed to compile on Fedora Rawhide because of this.
-
-Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
----
- lib/common/agents.c | 2 +-
- lib/common/iso8601.c | 2 +-
- lib/common/xpath.c | 6 +++---
- lib/pacemaker/pcmk_fence.c | 18 ++++++++++++------
- 4 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/lib/common/agents.c b/lib/common/agents.c
-index 2dda50e1c0..351fa3b334 100644
---- a/lib/common/agents.c
-+++ b/lib/common/agents.c
-@@ -119,7 +119,7 @@ int
- crm_parse_agent_spec(const char *spec, char **standard, char **provider,
- char **type)
- {
-- char *colon;
-+ const char *colon = NULL;
-
- CRM_CHECK(spec && standard && provider && type, return -EINVAL);
- *standard = NULL;
-diff --git a/lib/common/iso8601.c b/lib/common/iso8601.c
-index 48964e599d..d5130b14a2 100644
---- a/lib/common/iso8601.c
-+++ b/lib/common/iso8601.c
-@@ -834,7 +834,7 @@ static bool
- crm_time_parse(const char *time_str, crm_time_t *a_time)
- {
- uint32_t h, m, s;
-- char *offset_s = NULL;
-+ const char *offset_s = NULL;
-
- tzset();
-
-diff --git a/lib/common/xpath.c b/lib/common/xpath.c
-index 317114c1b1..6b7b809ed5 100644
---- a/lib/common/xpath.c
-+++ b/lib/common/xpath.c
-@@ -325,8 +325,8 @@ pcmk__xpath_node_id(const char *xpath, const char *node)
- {
- char *retval = NULL;
- char *patt = NULL;
-- char *start = NULL;
-- char *end = NULL;
-+ const char *start = NULL;
-+ const char *end = NULL;
-
- if (node == NULL || xpath == NULL) {
- return retval;
-@@ -343,7 +343,7 @@ pcmk__xpath_node_id(const char *xpath, const char *node)
- start += strlen(patt);
- start++;
-
-- end = strstr(start, "\'");
-+ end = strchr(start, '\'');
- pcmk__assert(end != NULL);
- retval = strndup(start, end-start);
-
-diff --git a/lib/pacemaker/pcmk_fence.c b/lib/pacemaker/pcmk_fence.c
-index 703c414fb5..611d86d143 100644
---- a/lib/pacemaker/pcmk_fence.c
-+++ b/lib/pacemaker/pcmk_fence.c
-@@ -42,8 +42,10 @@ handle_level(stonith_t *st, const char *target, int fence_level, GList *devices,
- {
- const char *node = NULL;
- const char *pattern = NULL;
-- const char *name = NULL;
-- char *value = NULL;
-+
-+ gchar **name_value = NULL;
-+ const gchar *name = NULL;
-+ const gchar *value = NULL;
- int rc = pcmk_rc_ok;
-
- if (target == NULL) {
-@@ -52,12 +54,15 @@ handle_level(stonith_t *st, const char *target, int fence_level, GList *devices,
- }
-
- /* Determine if targeting by attribute, node name pattern or node name */
-- value = strchr(target, '=');
-- if (value != NULL) {
-- name = target;
-- *value++ = '\0';
-+ name_value = g_strsplit(target, "=", 2);
-+
-+ if (g_strv_length(name_value) == 2) {
-+ name = name_value[0];
-+ value = name_value[1];
-+
- } else if (*target == '@') {
- pattern = target + 1;
-+
- } else {
- node = target;
- }
-@@ -78,6 +83,7 @@ handle_level(stonith_t *st, const char *target, int fence_level, GList *devices,
- name, value, fence_level);
- }
-
-+ g_strfreev(name_value);
- return pcmk_legacy2rc(rc);
- }
-
---
-2.52.0
-
diff --git a/0002-Fix-build-Handle-CMocka-deprecations.patch b/0002-Fix-build-Handle-CMocka-deprecations.patch
deleted file mode 100644
index 9db15f9..0000000
--- a/0002-Fix-build-Handle-CMocka-deprecations.patch
+++ /dev/null
@@ -1,436 +0,0 @@
-From 068bc038d347497891faed2b18a25e0122a6f1dd Mon Sep 17 00:00:00 2001
-From: Reid Wahl <nrwahl@protonmail.com>
-Date: Mon, 29 Dec 2025 00:47:11 -0800
-Subject: [PATCH] Fix: build: Handle CMocka deprecations
-
-This caused CI failures in newer builders.
-
-The check_expected_*() definitions could go in mock.c instead of
-unittest_internal.h. It's unlikely that they'll ever be used in any
-other .c file. However, it seems reasonable to collect everything in one
-place.
-
-Amusingly, CMocka provides macros to check the current CMocka version,
-but they're not available until CMocka 2.0.0.
-
-Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
----
- include/crm/common/unittest_internal.h | 25 +++++++++++++++++++
- lib/common/mock.c | 12 ++++-----
- .../cmdline/pcmk__new_common_args_test.c | 6 ++---
- .../tests/options/pcmk__set_env_option_test.c | 14 +++++------
- .../tests/output/pcmk__output_new_test.c | 6 ++---
- .../procfs/pcmk__procfs_has_pids_false_test.c | 2 +-
- .../procfs/pcmk__procfs_has_pids_true_test.c | 2 +-
- .../tests/procfs/pcmk__procfs_pid2path_test.c | 6 ++---
- .../tests/scheduler/pcmk_new_scheduler_test.c | 6 ++---
- .../tests/strings/pcmk__compress_test.c | 7 +++---
- lib/common/tests/utils/crm_user_lookup_test.c | 14 +++++------
- lib/common/tests/utils/pcmk__realloc_test.c | 4 +--
- .../tests/utils/pcmk_daemon_user_test.c | 6 ++---
- 13 files changed, 68 insertions(+), 42 deletions(-)
-
-diff --git a/include/crm/common/unittest_internal.h b/include/crm/common/unittest_internal.h
-index a877a94f13..d60ba5a3d6 100644
---- a/include/crm/common/unittest_internal.h
-+++ b/include/crm/common/unittest_internal.h
-@@ -38,5 +38,30 @@ extern "C" {
-
- /* internal unit testing related utilities */
-
-+/* @COMPAT CMocka 2.0.0:
-+ * - Deprecated check_expected() in favor of the new check_expected_int() and
-+ * check_expected_uint() (commit ba5b1970).
-+ * - Deprecated expect_value() (commit cac1c1d2) in favor of the new
-+ * expect_int_value() and expect_uint_value() (commit bd47d6dd).
-+ */
-+
-+#ifndef check_expected_int
-+#define check_expected_int(parameter) check_expected(parameter)
-+#endif // ifndef check_expected_int
-+
-+#ifndef check_expected_uint
-+#define check_expected_uint(parameter) check_expected(parameter)
-+#endif // ifndef check_expected_uint
-+
-+#ifndef expect_int_value
-+#define expect_int_value(function, parameter, value) \
-+ expect_value(function, parameter, value)
-+#endif // ifndef expect_int_value
-+
-+#ifndef expect_uint_value
-+#define expect_uint_value(function, parameter, value) \
-+ expect_value(function, parameter, value)
-+#endif // ifndef expect_uint_value
-+
- #if (PCMK__WITH_COVERAGE == 1)
- /* This function isn't exposed anywhere. The following prototype was taken from
-diff --git a/lib/common/mock.c b/lib/common/mock.c
-index c51c350657..88773d7387 100644
---- a/lib/common/mock.c
-+++ b/lib/common/mock.c
-@@ -95,8 +95,8 @@ __wrap_calloc(size_t nmemb, size_t size)
- if (!pcmk__mock_calloc) {
- return __real_calloc(nmemb, size);
- }
-- check_expected(nmemb);
-- check_expected(size);
-+ check_expected_uint(nmemb);
-+ check_expected_uint(size);
- return NULL;
- }
-
-@@ -145,7 +145,7 @@ __wrap_realloc(void *ptr, size_t size)
- return __real_realloc(ptr, size);
- }
- check_expected_ptr(ptr);
-- check_expected(size);
-+ check_expected_uint(size);
- return NULL;
- }
-
-@@ -174,7 +174,7 @@ __wrap_setenv(const char *name, const char *value, int overwrite)
- }
- check_expected_ptr(name);
- check_expected_ptr(value);
-- check_expected(overwrite);
-+ check_expected_int(overwrite);
- errno = mock_type(int);
- return (errno == 0)? 0 : -1;
- }
-@@ -385,7 +385,7 @@ __wrap_getpwnam_r(const char *name, struct passwd *pwd, char *buf,
- check_expected_ptr(name);
- check_expected_ptr(pwd);
- check_expected_ptr(buf);
-- check_expected(buflen);
-+ check_expected_uint(buflen);
- check_expected_ptr(result);
- *result = mock_ptr_type(struct passwd *);
- return retval;
-@@ -419,8 +419,7 @@ __wrap_readlink(const char *restrict path, char *restrict buf,
- const char *contents = NULL;
-
- check_expected_ptr(path);
-- check_expected(buf);
-- check_expected(bufsize);
-+ check_expected_uint(bufsize);
- errno = mock_type(int);
- contents = mock_ptr_type(const char *);
-
-diff --git a/lib/common/tests/cmdline/pcmk__new_common_args_test.c b/lib/common/tests/cmdline/pcmk__new_common_args_test.c
-index 6b70465629..11d3d8a315 100644
---- a/lib/common/tests/cmdline/pcmk__new_common_args_test.c
-+++ b/lib/common/tests/cmdline/pcmk__new_common_args_test.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2023 the Pacemaker project contributors
-+ * Copyright 2023-2026 the Pacemaker project contributors
- *
- * The version control history for this file may have further details.
- *
-@@ -22,8 +22,8 @@ calloc_fails(void **state)
- pcmk__assert_exits(CRM_EX_OSERR,
- {
- pcmk__mock_calloc = true; // calloc() will return NULL
-- expect_value(__wrap_calloc, nmemb, 1);
-- expect_value(__wrap_calloc, size, sizeof(pcmk__common_args_t));
-+ expect_uint_value(__wrap_calloc, nmemb, 1);
-+ expect_uint_value(__wrap_calloc, size, sizeof(pcmk__common_args_t));
- pcmk__new_common_args("boring summary");
- pcmk__mock_calloc = false; // Use real calloc()
- }
-diff --git a/lib/common/tests/options/pcmk__set_env_option_test.c b/lib/common/tests/options/pcmk__set_env_option_test.c
-index 22fd795052..dc345c26ec 100644
---- a/lib/common/tests/options/pcmk__set_env_option_test.c
-+++ b/lib/common/tests/options/pcmk__set_env_option_test.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2022-2023 the Pacemaker project contributors
-+ * Copyright 2022-2026 the Pacemaker project contributors
- *
- * The version control history for this file may have further details.
- *
-@@ -85,7 +85,7 @@ input_too_long_for_pcmk(void **state)
-
- expect_string(__wrap_setenv, name, buf);
- expect_string(__wrap_setenv, value, "new_value");
-- expect_value(__wrap_setenv, overwrite, 1);
-+ expect_int_value(__wrap_setenv, overwrite, 1);
- will_return(__wrap_setenv, 0);
- pcmk__set_env_option(long_opt, "new_value", true);
-
-@@ -109,22 +109,22 @@ valid_inputs_set(void **state)
-
- expect_string(__wrap_setenv, name, "PCMK_env_var");
- expect_string(__wrap_setenv, value, "new_value");
-- expect_value(__wrap_setenv, overwrite, 1);
-+ expect_int_value(__wrap_setenv, overwrite, 1);
- will_return(__wrap_setenv, 0);
- expect_string(__wrap_setenv, name, "HA_env_var");
- expect_string(__wrap_setenv, value, "new_value");
-- expect_value(__wrap_setenv, overwrite, 1);
-+ expect_int_value(__wrap_setenv, overwrite, 1);
- will_return(__wrap_setenv, 0);
- pcmk__set_env_option("env_var", "new_value", true);
-
- // Empty string is also a valid value
- expect_string(__wrap_setenv, name, "PCMK_env_var");
- expect_string(__wrap_setenv, value, "");
-- expect_value(__wrap_setenv, overwrite, 1);
-+ expect_int_value(__wrap_setenv, overwrite, 1);
- will_return(__wrap_setenv, 0);
- expect_string(__wrap_setenv, name, "HA_env_var");
- expect_string(__wrap_setenv, value, "");
-- expect_value(__wrap_setenv, overwrite, 1);
-+ expect_int_value(__wrap_setenv, overwrite, 1);
- will_return(__wrap_setenv, 0);
- pcmk__set_env_option("env_var", "", true);
-
-@@ -154,7 +154,7 @@ disable_compat(void **state)
-
- expect_string(__wrap_setenv, name, "PCMK_env_var");
- expect_string(__wrap_setenv, value, "new_value");
-- expect_value(__wrap_setenv, overwrite, 1);
-+ expect_int_value(__wrap_setenv, overwrite, 1);
- will_return(__wrap_setenv, 0);
- pcmk__set_env_option("env_var", "new_value", false);
-
-diff --git a/lib/common/tests/output/pcmk__output_new_test.c b/lib/common/tests/output/pcmk__output_new_test.c
-index a05d9a715f..3f8bf7f996 100644
---- a/lib/common/tests/output/pcmk__output_new_test.c
-+++ b/lib/common/tests/output/pcmk__output_new_test.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2022-2023 the Pacemaker project contributors
-+ * Copyright 2022-2026 the Pacemaker project contributors
- *
- * The version control history for this file may have further details.
- *
-@@ -83,8 +83,8 @@ create_fails(void **state) {
-
- pcmk__mock_calloc = true; // calloc() will return NULL
-
-- expect_value(__wrap_calloc, nmemb, 1);
-- expect_value(__wrap_calloc, size, sizeof(pcmk__output_t));
-+ expect_uint_value(__wrap_calloc, nmemb, 1);
-+ expect_uint_value(__wrap_calloc, size, sizeof(pcmk__output_t));
- assert_int_equal(pcmk__output_new(&out, "text", NULL, NULL), ENOMEM);
-
- pcmk__mock_calloc = false; // Use real calloc()
-diff --git a/lib/common/tests/procfs/pcmk__procfs_has_pids_false_test.c b/lib/common/tests/procfs/pcmk__procfs_has_pids_false_test.c
-index f6cdee3348..f69a427f00 100644
---- a/lib/common/tests/procfs/pcmk__procfs_has_pids_false_test.c
-+++ b/lib/common/tests/procfs/pcmk__procfs_has_pids_false_test.c
-@@ -29,8 +29,7 @@ no_pids(void **state)
- pcmk__mock_readlink = true;
-
- expect_string(__wrap_readlink, path, path);
-- expect_any(__wrap_readlink, buf);
-- expect_value(__wrap_readlink, bufsize, PATH_MAX - 1);
-+ expect_uint_value(__wrap_readlink, bufsize, PATH_MAX - 1);
- will_return(__wrap_readlink, ENOENT);
- will_return(__wrap_readlink, NULL);
-
-diff --git a/lib/common/tests/procfs/pcmk__procfs_has_pids_true_test.c b/lib/common/tests/procfs/pcmk__procfs_has_pids_true_test.c
-index 4d907da4ec..7888436666 100644
---- a/lib/common/tests/procfs/pcmk__procfs_has_pids_true_test.c
-+++ b/lib/common/tests/procfs/pcmk__procfs_has_pids_true_test.c
-@@ -28,8 +28,7 @@ has_pids(void **state)
- pcmk__mock_readlink = true;
-
- expect_string(__wrap_readlink, path, path);
-- expect_any(__wrap_readlink, buf);
-- expect_value(__wrap_readlink, bufsize, PATH_MAX - 1);
-+ expect_uint_value(__wrap_readlink, bufsize, PATH_MAX - 1);
- will_return(__wrap_readlink, 0);
- will_return(__wrap_readlink, "/ok");
-
-diff --git a/lib/common/tests/procfs/pcmk__procfs_pid2path_test.c b/lib/common/tests/procfs/pcmk__procfs_pid2path_test.c
-index 1cea2a353d..d3b3f8acb2 100644
---- a/lib/common/tests/procfs/pcmk__procfs_pid2path_test.c
-+++ b/lib/common/tests/procfs/pcmk__procfs_pid2path_test.c
-@@ -27,8 +27,7 @@ no_exe_file(void **state)
- pcmk__mock_readlink = true;
-
- expect_string(__wrap_readlink, path, "/proc/1000/exe");
-- expect_value(__wrap_readlink, buf, path);
-- expect_value(__wrap_readlink, bufsize, len - 1);
-+ expect_uint_value(__wrap_readlink, bufsize, len - 1);
- will_return(__wrap_readlink, ENOENT);
- will_return(__wrap_readlink, NULL);
-
-@@ -48,8 +48,7 @@ contents_too_long(void **state)
- pcmk__mock_readlink = true;
-
- expect_string(__wrap_readlink, path, "/proc/1000/exe");
-- expect_value(__wrap_readlink, buf, path);
-- expect_value(__wrap_readlink, bufsize, len - 1);
-+ expect_uint_value(__wrap_readlink, bufsize, len - 1);
- will_return(__wrap_readlink, 0);
- will_return(__wrap_readlink, "/more/than/10/characters");
-
-@@ -70,8 +70,7 @@ contents_ok(void **state)
- pcmk__mock_readlink = true;
-
- expect_string(__wrap_readlink, path, "/proc/1000/exe");
-- expect_value(__wrap_readlink, buf, path);
-- expect_value(__wrap_readlink, bufsize, len - 1);
-+ expect_uint_value(__wrap_readlink, bufsize, len - 1);
- will_return(__wrap_readlink, 0);
- will_return(__wrap_readlink, "/ok");
-
-diff --git a/lib/common/tests/scheduler/pcmk_new_scheduler_test.c b/lib/common/tests/scheduler/pcmk_new_scheduler_test.c
-index e7545df762..51218bcfef 100644
---- a/lib/common/tests/scheduler/pcmk_new_scheduler_test.c
-+++ b/lib/common/tests/scheduler/pcmk_new_scheduler_test.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2022-2024 the Pacemaker project contributors
-+ * Copyright 2022-2026 the Pacemaker project contributors
- *
- * The version control history for this file may have further details.
- *
-@@ -19,8 +19,8 @@ calloc_fails(void **state)
- {
- pcmk__mock_calloc = true; // calloc() will return NULL
-
-- expect_value(__wrap_calloc, nmemb, 1);
-- expect_value(__wrap_calloc, size, sizeof(pcmk_scheduler_t));
-+ expect_uint_value(__wrap_calloc, nmemb, 1);
-+ expect_uint_value(__wrap_calloc, size, sizeof(pcmk_scheduler_t));
- assert_null(pcmk_new_scheduler());
-
- pcmk__mock_calloc = false; // Use real calloc()
-diff --git a/lib/common/tests/strings/pcmk__compress_test.c b/lib/common/tests/strings/pcmk__compress_test.c
-index 813bcdbeb1..0dd2fcdc79 100644
---- a/lib/common/tests/strings/pcmk__compress_test.c
-+++ b/lib/common/tests/strings/pcmk__compress_test.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2022-2024 the Pacemaker project contributors
-+ * Copyright 2022-2026 the Pacemaker project contributors
- *
- * The version control history for this file may have further details.
- *
-@@ -45,8 +45,9 @@ calloc_fails(void **state) {
- CRM_EX_OSERR,
- {
- pcmk__mock_calloc = true; // calloc() will return NULL
-- expect_value(__wrap_calloc, nmemb, (size_t) ((40 * 1.01) + 601));
-- expect_value(__wrap_calloc, size, sizeof(char));
-+ expect_uint_value(__wrap_calloc, nmemb,
-+ (size_t) ((40 * 1.01) + 601));
-+ expect_uint_value(__wrap_calloc, size, sizeof(char));
- pcmk__compress(SIMPLE_DATA, 40, 0, &result, &len);
- pcmk__mock_calloc = false; // Use the real calloc()
- }
-diff --git a/lib/common/tests/utils/crm_user_lookup_test.c b/lib/common/tests/utils/crm_user_lookup_test.c
-index 5842ec5027..e9df74f6e2 100644
---- a/lib/common/tests/utils/crm_user_lookup_test.c
-+++ b/lib/common/tests/utils/crm_user_lookup_test.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2022 the Pacemaker project contributors
-+ * Copyright 2022-2026 the Pacemaker project contributors
- *
- * The version control history for this file may have further details.
- *
-@@ -25,8 +25,8 @@ calloc_fails(void **state)
-
- pcmk__mock_calloc = true; // calloc() will return NULL
-
-- expect_value(__wrap_calloc, nmemb, 1);
-- expect_value(__wrap_calloc, size, PCMK__PW_BUFFER_LEN);
-+ expect_uint_value(__wrap_calloc, nmemb, 1);
-+ expect_uint_value(__wrap_calloc, size, PCMK__PW_BUFFER_LEN);
- assert_int_equal(crm_user_lookup("hauser", &uid, &gid), -ENOMEM);
-
- pcmk__mock_calloc = false; // Use real calloc()
-@@ -44,7 +44,7 @@ getpwnam_r_fails(void **state)
- expect_string(__wrap_getpwnam_r, name, "hauser");
- expect_any(__wrap_getpwnam_r, pwd);
- expect_any(__wrap_getpwnam_r, buf);
-- expect_value(__wrap_getpwnam_r, buflen, PCMK__PW_BUFFER_LEN);
-+ expect_uint_value(__wrap_getpwnam_r, buflen, PCMK__PW_BUFFER_LEN);
- expect_any(__wrap_getpwnam_r, result);
- will_return(__wrap_getpwnam_r, EIO);
- will_return(__wrap_getpwnam_r, NULL);
-@@ -66,7 +66,7 @@ no_matching_pwent(void **state)
- expect_string(__wrap_getpwnam_r, name, "hauser");
- expect_any(__wrap_getpwnam_r, pwd);
- expect_any(__wrap_getpwnam_r, buf);
-- expect_value(__wrap_getpwnam_r, buflen, PCMK__PW_BUFFER_LEN);
-+ expect_uint_value(__wrap_getpwnam_r, buflen, PCMK__PW_BUFFER_LEN);
- expect_any(__wrap_getpwnam_r, result);
- will_return(__wrap_getpwnam_r, 0);
- will_return(__wrap_getpwnam_r, NULL);
-@@ -95,7 +95,7 @@ entry_found(void **state)
- expect_string(__wrap_getpwnam_r, name, "hauser");
- expect_any(__wrap_getpwnam_r, pwd);
- expect_any(__wrap_getpwnam_r, buf);
-- expect_value(__wrap_getpwnam_r, buflen, PCMK__PW_BUFFER_LEN);
-+ expect_uint_value(__wrap_getpwnam_r, buflen, PCMK__PW_BUFFER_LEN);
- expect_any(__wrap_getpwnam_r, result);
- will_return(__wrap_getpwnam_r, 0);
- will_return(__wrap_getpwnam_r, &returned_ent);
-@@ -108,7 +108,7 @@ entry_found(void **state)
- expect_string(__wrap_getpwnam_r, name, "hauser");
- expect_any(__wrap_getpwnam_r, pwd);
- expect_any(__wrap_getpwnam_r, buf);
-- expect_value(__wrap_getpwnam_r, buflen, PCMK__PW_BUFFER_LEN);
-+ expect_uint_value(__wrap_getpwnam_r, buflen, PCMK__PW_BUFFER_LEN);
- expect_any(__wrap_getpwnam_r, result);
- will_return(__wrap_getpwnam_r, 0);
- will_return(__wrap_getpwnam_r, &returned_ent);
-diff --git a/lib/common/tests/utils/pcmk__realloc_test.c b/lib/common/tests/utils/pcmk__realloc_test.c
-index 62d51df1f6..7efd884fdc 100644
---- a/lib/common/tests/utils/pcmk__realloc_test.c
-+++ b/lib/common/tests/utils/pcmk__realloc_test.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2024 the Pacemaker project contributors
-+ * Copyright 2024-2026 the Pacemaker project contributors
- *
- * The version control history for this file may have further details.
- *
-@@ -30,7 +30,7 @@ realloc_fails(void **state)
- {
- pcmk__mock_realloc = true; // realloc() will return NULL
- expect_any(__wrap_realloc, ptr);
-- expect_value(__wrap_realloc, size, 1000);
-+ expect_uint_value(__wrap_realloc, size, 1000);
- pcmk__realloc(ptr, 1000);
- pcmk__mock_realloc = false; // Use real realloc()
- }
-diff --git a/lib/common/tests/utils/pcmk_daemon_user_test.c b/lib/common/tests/utils/pcmk_daemon_user_test.c
-index a63ca73735..3c54c2d430 100644
---- a/lib/common/tests/utils/pcmk_daemon_user_test.c
-+++ b/lib/common/tests/utils/pcmk_daemon_user_test.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2022 the Pacemaker project contributors
-+ * Copyright 2022-2026 the Pacemaker project contributors
- *
- * The version control history for this file may have further details.
- *
-@@ -29,7 +29,7 @@ no_matching_pwent(void **state)
- expect_string(__wrap_getpwnam_r, name, "hacluster");
- expect_any(__wrap_getpwnam_r, pwd);
- expect_any(__wrap_getpwnam_r, buf);
-- expect_value(__wrap_getpwnam_r, buflen, PCMK__PW_BUFFER_LEN);
-+ expect_uint_value(__wrap_getpwnam_r, buflen, PCMK__PW_BUFFER_LEN);
- expect_any(__wrap_getpwnam_r, result);
- will_return(__wrap_getpwnam_r, ENOENT);
- will_return(__wrap_getpwnam_r, NULL);
-@@ -58,7 +58,7 @@ entry_found(void **state)
- expect_string(__wrap_getpwnam_r, name, "hacluster");
- expect_any(__wrap_getpwnam_r, pwd);
- expect_any(__wrap_getpwnam_r, buf);
-- expect_value(__wrap_getpwnam_r, buflen, PCMK__PW_BUFFER_LEN);
-+ expect_uint_value(__wrap_getpwnam_r, buflen, PCMK__PW_BUFFER_LEN);
- expect_any(__wrap_getpwnam_r, result);
- will_return(__wrap_getpwnam_r, 0);
- will_return(__wrap_getpwnam_r, &returned_ent);
---
-2.52.0
-
diff --git a/pacemaker.spec b/pacemaker.spec
index 0bfc602..fc11a89 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -40,11 +40,11 @@
## Upstream pacemaker version, and its package version (baserelease
## can be incremented to build packages reliably considered "newer"
## than previously built packages with the same pcmkversion)
-%global pcmkversion 3.0.1
-%global baserelease 16
+%global pcmkversion 3.0.2
+%global baserelease 1
## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
-%global commit 16e74fc4da93a08514e1ec320fa9530b6c3d9fd5
+%global commit c75e25851c05c6b0ff48caeaa15854d5868ce428
## Since git v2.11, the extent of abbreviation is autoscaled by default
## (used to be constant of 7), so we need to convey it for non-tags, too.
@@ -193,8 +193,6 @@ Source0: https://codeload.github.com/%{github_owner}/%{name}/tar.gz/%{arch
Source1: pacemaker.sysusers
# upstream commits
-Patch0: 0001-Low-various-Use-const-for-a-few-string-pointer-varia.patch
-Patch1: 0002-Fix-build-Handle-CMocka-deprecations.patch
Requires: resource-agents
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
@@ -766,6 +764,11 @@ fi
%{_datadir}/pkgconfig/pacemaker-schemas.pc
%changelog
+* Wed Jun 3 2026 Klaus Wenninger <kwenning@redhat.com> - 3.0.2-1
+- Update for new upstream release tarball: Pacemaker-3.0.2,
+ for full details, see included ChangeLog.md file or
+ https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-3.0.2
+
* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 3.0.1-16
- Rebuilt for Python 3.15
diff --git a/sources b/sources
index fbc52ff..d7cf2bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pacemaker-16e74fc4d.tar.gz) = 6aba8eedaf8f0a51b89344db50999123d89fa58393bde9201e2dfd2f01489481e9e910986d84cf92000818ea56ee223faa40f84187ebef26b9cbda1f6888ac70
+SHA512 (pacemaker-c75e25851.tar.gz) = ca24cbb39ba5ba4393c6064462069612ea6888ca089da277ab3d5714526fa0bb7b194747b5f5541abc32305c868473e95860ccef4a51ad71e6eb1d68a9f3dd47
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-03 22:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-03 22:52 [rpms/pacemaker] rawhide: * Wed Jun 3 2026 Klaus Wenninger <kwenning@redhat.com> - 3.0.2-1 Klaus Wenninger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox