pool/pacemaker
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 221419 from network:ha-clustering:Factory

Browse Source 
- ipc: Convince clang that our casting is intended (bnc#845525)
  * Drop pacemaker-Wno-cast-align.patch which has been merged upstream
- cib: Use the correctly typed enum value during initialization
- Build: Add dbus as an rpm dependancy
- Fix: Bug rhbz#1057697 - Use native DBus library for systemd async support to avoid problematic use of threads
- remote: Fail remote-node connection rsc monitor ops early on unexpected disconnect
- tools: Return error when attempting to delete an unspecified attribute
- remote: Allow baremetal remote-node connection resources to migrate
- lrmd: Send event alerting estabilished clients that a new client connection is created.
- Fix: Bug rhbz#1057697 - Use native DBus library for systemd support to avoid problematic use of threads
- xml: Fix segfault in find_entity()
- Upstream version cs: 6290953f2b035a92a8f093973b94c5cf38b79cd9

- pengine: Free memory allocated by find_actions()
- cib: Fix remote cib based on TLS
- Upstream version cs: f3eeaf49d1fb7bca713ecbbc819aef51650d26ef

- stonith: Drop the severity of log for recoverable condition (bnc#857779)
  * Update bug-812269_pacemaker-fencing-device-register-messages.patch

OBS-URL: https://build.opensuse.org/request/show/221419
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pacemaker?expand=0&rev=66
This commit is contained in:
Stephan Kulow 2014-02-11 10:46:40 +00:00 committed by Git OBS Bridge
commit f0b6ef871b
7 changed files with 52 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -11,7 +11,7 @@
<param name="version">1.1.10</param>
-->
<param name="versionformat">1.1.10+git%cd.%h</param>
<param name="revision">96cd1941308be48fdf1e827b88ebd9410cf2010a</param>
<param name="revision">6290953f2b035a92a8f093973b94c5cf38b79cd9</param>
</service>
<service name="recompress" mode="disabled">

17
bug-812269_pacemaker-fencing-device-register-messages.patch
View File

@ -8,7 +8,7 @@ Index: pacemaker/fencing/commands.c
===================================================================
--- pacemaker.orig/fencing/commands.c
+++ pacemaker/fencing/commands.c
@@ -816,7 +816,7 @@ stonith_device_register(xmlNode * msg, c
@@ -817,7 +817,7 @@ stonith_device_register(xmlNode * msg, c
dup = device_has_duplicate(device);
if (dup) {
@ -17,7 +17,7 @@ Index: pacemaker/fencing/commands.c
g_hash_table_size(device_list));
free_device(device);
device = dup;
@@ -839,7 +839,7 @@ stonith_device_register(xmlNode * msg, c
@@ -840,7 +840,7 @@ stonith_device_register(xmlNode * msg, c
}
g_hash_table_replace(device_list, device->id, device);
@ -26,3 +26,16 @@ Index: pacemaker/fencing/commands.c
g_hash_table_size(device_list));
}
if (desc) {
Index: pacemaker/fencing/main.c
===================================================================
--- pacemaker.orig/fencing/main.c
+++ pacemaker/fencing/main.c
@@ -878,7 +878,7 @@ update_cib_cache_cb(const char *event, x
switch (rc) {
case -pcmk_err_diff_resync:
case -pcmk_err_diff_failed:
- crm_notice("[%s] Patch aborted: %s (%d)", event, pcmk_strerror(rc), rc);
+ crm_info("[%s] Patch aborted: %s (%d)", event, pcmk_strerror(rc), rc);
case pcmk_ok:
break;
default:

3
pacemaker-1.1.10+git20140124.96cd194.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d9a2ba6bb2dece3d5ac383ce62fd1e9559493ea6cec9e62f2ce4443e855fe1a3
size 9350450

3
pacemaker-1.1.10+git20140207.6290953.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ee508a203e095214c139a1a3a6e5024eb5e7f6a73a4616592c159a0fde416085
size 9321667

102
pacemaker-Wno-cast-align.patch
View File

@ -1,102 +0,0 @@
commit 5e0e36364e242029717ef5bd2061344b8e38e7d2
Author: Gao,Yan <ygao@suse.com>
Date: Sat Jan 25 14:30:25 2014 +0800
Build: Suppress -Wcast-align warnings/errors on arm and ppc64le
diff --git a/lib/common/ipc.c b/lib/common/ipc.c
index 3d34706..d7b525f 100644
--- a/lib/common/ipc.c
+++ b/lib/common/ipc.c
@@ -894,7 +894,7 @@ crm_ipc_ready(crm_ipc_t * client)
static int
crm_ipc_decompress(crm_ipc_t * client)
{
- struct crm_ipc_response_header *header = (struct crm_ipc_response_header *)client->buffer;
+ struct crm_ipc_response_header *header = (struct crm_ipc_response_header *)(void *)client->buffer;
if (header->size_compressed) {
int rc = 0;
@@ -926,7 +926,7 @@ crm_ipc_decompress(crm_ipc_t * client)
CRM_ASSERT(size_u == header->size_uncompressed);
memcpy(uncompressed, client->buffer, hdr_offset); /* Preserve the header */
- header = (struct crm_ipc_response_header *)uncompressed;
+ header = (struct crm_ipc_response_header *)(void *)uncompressed;
free(client->buffer);
client->buf_size = new_buf_size;
@@ -957,7 +957,7 @@ crm_ipc_read(crm_ipc_t * client)
return rc;
}
- header = (struct crm_ipc_response_header *)client->buffer;
+ header = (struct crm_ipc_response_header *)(void *)client->buffer;
if(header->version > PCMK_IPC_VERSION) {
crm_err("Filtering incompatible v%d IPC message, we only support versions <= %d",
header->version, PCMK_IPC_VERSION);
@@ -1044,7 +1044,7 @@ internal_ipc_get_reply(crm_ipc_t * client, int request_id, int ms_timeout)
return rc;
}
- hdr = (struct crm_ipc_response_header *)client->buffer;
+ hdr = (struct crm_ipc_response_header *)(void *)client->buffer;
if (hdr->qb.id == request_id) {
/* Got it */
break;
@@ -1173,7 +1173,7 @@ crm_ipc_send(crm_ipc_t * client, xmlNode * message, enum crm_ipc_flags flags, in
}
if (rc > 0) {
- struct crm_ipc_response_header *hdr = (struct crm_ipc_response_header *)client->buffer;
+ struct crm_ipc_response_header *hdr = (struct crm_ipc_response_header *)(void *)client->buffer;
crm_trace("Received response %d, size=%d, rc=%ld, text: %.200s", hdr->qb.id, hdr->qb.size,
rc, crm_ipc_buffer(client));
diff --git a/lib/common/remote.c b/lib/common/remote.c
index acffccb..02099e6 100644
--- a/lib/common/remote.c
+++ b/lib/common/remote.c
@@ -353,7 +353,7 @@ crm_remote_send(crm_remote_t * remote, xmlNode * msg)
header->size_total = iov[0].iov_len + iov[1].iov_len;
crm_trace("Sending len[0]=%d, start=%x\n",
- (int)iov[0].iov_len, *(int*)xml_text);
+ (int)iov[0].iov_len, *(int*)(void *)xml_text);
rc = crm_remote_sendv(remote, iov, 2);
if (rc < 0) {
crm_err("Failed to send remote msg, rc = %d", rc);
@@ -861,13 +861,13 @@ crm_remote_tcp_connect_async(const char *host, int port, int timeout, /*ms */
memset(buffer, 0, DIMOF(buffer));
if (addr->sa_family == AF_INET6) {
- struct sockaddr_in6 *addr_in = (struct sockaddr_in6 *)addr;
+ struct sockaddr_in6 *addr_in = (struct sockaddr_in6 *)(void *)addr;
addr_in->sin6_port = htons(port);
inet_ntop(addr->sa_family, &addr_in->sin6_addr, buffer, DIMOF(buffer));
} else {
- struct sockaddr_in *addr_in = (struct sockaddr_in *)addr;
+ struct sockaddr_in *addr_in = (struct sockaddr_in *)(void *)addr;
addr_in->sin_port = htons(port);
inet_ntop(addr->sa_family, &addr_in->sin_addr, buffer, DIMOF(buffer));
diff --git a/lrmd/tls_backend.c b/lrmd/tls_backend.c
index 1600353..32d761f 100644
--- a/lrmd/tls_backend.c
+++ b/lrmd/tls_backend.c
@@ -264,11 +264,11 @@ bind_and_listen(struct addrinfo *addr)
char buffer[256] = { 0, };
if (addr->ai_family == AF_INET6) {
- struct sockaddr_in6 *addr_in = (struct sockaddr_in6 *)addr->ai_addr;
+ struct sockaddr_in6 *addr_in = (struct sockaddr_in6 *)(void *)addr->ai_addr;
inet_ntop(addr->ai_family, &addr_in->sin6_addr, buffer, DIMOF(buffer));
} else {
- struct sockaddr_in *addr_in = (struct sockaddr_in *)addr->ai_addr;
+ struct sockaddr_in *addr_in = (struct sockaddr_in *)(void *)addr->ai_addr;
inet_ntop(addr->ai_family, &addr_in->sin_addr, buffer, DIMOF(buffer));
}

29
pacemaker.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Sat Feb 8 14:00:23 UTC 2014 - ygao@suse.com
- ipc: Convince clang that our casting is intended (bnc#845525)
* Drop pacemaker-Wno-cast-align.patch which has been merged upstream
- cib: Use the correctly typed enum value during initialization
- Build: Add dbus as an rpm dependancy
- Fix: Bug rhbz#1057697 - Use native DBus library for systemd async support to avoid problematic use of threads
- remote: Fail remote-node connection rsc monitor ops early on unexpected disconnect
- tools: Return error when attempting to delete an unspecified attribute
- remote: Allow baremetal remote-node connection resources to migrate
- lrmd: Send event alerting estabilished clients that a new client connection is created.
- Fix: Bug rhbz#1057697 - Use native DBus library for systemd support to avoid problematic use of threads
- xml: Fix segfault in find_entity()
- Upstream version cs: 6290953f2b035a92a8f093973b94c5cf38b79cd9
-------------------------------------------------------------------
Tue Jan 28 04:00:43 UTC 2014 - ygao@suse.com
- pengine: Free memory allocated by find_actions()
- cib: Fix remote cib based on TLS
- Upstream version cs: f3eeaf49d1fb7bca713ecbbc819aef51650d26ef
-------------------------------------------------------------------
Tue Jan 28 03:47:02 UTC 2014 - ygao@suse.com
- stonith: Drop the severity of log for recoverable condition (bnc#857779)
* Update bug-812269_pacemaker-fencing-device-register-messages.patch
-------------------------------------------------------------------
Sat Jan 25 06:22:21 UTC 2014 - ygao@suse.com

9
pacemaker.spec
View File

@ -95,7 +95,7 @@ Name: pacemaker
Summary: Scalable High-Availability cluster resource manager
License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Clustering/HA
Version: 1.1.10+git20140124.96cd194
Version: 1.1.10+git20140207.6290953
Release: 0
#Release: %{pcmk_release}%{?dist}
Url: http://www.clusterlabs.org
@ -112,9 +112,8 @@ Patch5: pacemaker-colocated-utilization.patch
Patch6: pacemaker-cibsecret-tool-temp-disabled.patch
Patch7: pacemaker-nagios-plugin-dir.patch
Patch8: bug-812269_pacemaker-fencing-device-register-messages.patch
Patch9: pacemaker-Wno-cast-align.patch
Patch10: pacemaker-display-pending-ops.patch
Patch11: pacemaker-crm_mon-brief.patch
Patch9: pacemaker-display-pending-ops.patch
Patch10: pacemaker-crm_mon-brief.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: pacemaker-ticket-support = 2.0
Conflicts: heartbeat < 3.0
@ -173,6 +172,7 @@ Requires: libqb > 0.11.0
# Enables optional functionality
BuildRequires: bison
BuildRequires: byacc
BuildRequires: dbus-1-devel
%if 0%{?suse_version} > 1100
BuildRequires: docbook-xsl-stylesheets
@ -401,7 +401,6 @@ manager for Corosync, CMAN and/or Linux-HA.
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
# Force the local time
#