Hello community, here is the log from the commit of package cluster-glue for openSUSE:Factory checked in at 2015-03-01 14:49:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old) and /work/SRC/openSUSE:Factory/.cluster-glue.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cluster-glue" Changes: -------- --- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes 2014-11-24 11:15:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes 2015-03-01 14:49:39.000000000 +0100 @@ -1,0 +2,28 @@ +Tue Feb 24 09:36:37 UTC 2015 - [email protected] + +- Add cluster-glue-gcc5.patch to fix gazillions of -Wformat=2 warnings + about signed/unsigned format vs. argument mismatches GCC 5 now emits. + Fixes build with GCC 5. + +------------------------------------------------------------------- +Wed Feb 18 12:20:56 UTC 2015 - [email protected] + +- buildrequire the systemd macros before using them - and all + the package wants is the macro anyway, so no need to buildrequire + systemd libraries + +------------------------------------------------------------------- +Wed Jan 21 11:18:45 UTC 2015 - [email protected] + +- undo: fix using hb_report script with non-bash shells due to + bad logic + * removed cluster-glue-fix-bashisms.patch + +------------------------------------------------------------------- +Sat Dec 27 18:46:00 UTC 2014 - Led <[email protected]> + +- fix using hb_report script with non-bash shells +- add patches: + + cluster-glue-fix-bashisms.patch + +------------------------------------------------------------------- New: ---- cluster-glue-gcc5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cluster-glue.spec ++++++ --- /var/tmp/diff_new_pack.hiMttV/_old 2015-03-01 14:49:40.000000000 +0100 +++ /var/tmp/diff_new_pack.hiMttV/_new 2015-03-01 14:49:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cluster-glue # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -52,6 +52,8 @@ Patch4: cluster-glue_droplrm.patch # PATCH-FIX-OPENSUSE: high: hb_report: Collect logs from journald (boo#900654) Patch5: 0001-high-hb_report-Collect-logs-from-journald-boo-900654.patch +# PATCH-FIX-OPENSUSE: fix build with GCC 5 +Patch6: cluster-glue-gcc5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: OpenIPMI-devel BuildRequires: asciidoc @@ -80,8 +82,8 @@ Requires(pre): %fillup_prereq -%if %{defined systemd_requires} -BuildRequires: pkgconfig(systemd) +%if 0%{?suse_version} > 1230 +BuildRequires: systemd-rpm-macros %{?systemd_requires} %endif Conflicts: pacemaker < 1.1.8 @@ -159,6 +161,7 @@ %patch2 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 ########################################################### %build ++++++ cluster-glue-gcc5.patch ++++++ Index: cluster-glue/lib/pils/pils.c =================================================================== --- cluster-glue.orig/lib/pils/pils.c 2014-10-31 15:43:17.000000000 +0100 +++ cluster-glue/lib/pils/pils.c 2015-02-24 09:54:15.334311067 +0100 @@ -898,7 +898,7 @@ DelPILInterfaceType(PILInterfaceType*ift gpointer key, iftype; if (DEBUGPLUGIN) { PILLog(PIL_DEBUG - , "DelPILInterfaceType(%s): table size (%d)" + , "DelPILInterfaceType(%s): table size (%u)" , ift->typename, g_hash_table_size(ift->interfaces)); } if (g_hash_table_lookup_extended(ift->interfaces @@ -1883,7 +1883,7 @@ so_select (const struct dirent *dire) if (DEBUGPLUGIN) { PILLog(PIL_DEBUG , "FILE %s Doesn't look like a plugin name [%s] " - "%zd %zd %s." + "%zu %zu %s." , dire->d_name, end , sizeof(obj_end), strlen(dire->d_name) , &dire->d_name[strlen(dire->d_name) @@ -2115,7 +2115,7 @@ PILValidateInterfaceUniv(gpointer key, g #define PRSTAT(type) { \ PILLog(PIL_INFO, "Plugin system objects (" #type "): " \ - "\tnew %ld free \%ld current %ld" \ + "\tnew %lu free \%lu current %lu" \ , PILstats.type.news \ , PILstats.type.frees \ , PILstats.type.news - PILstats.type.frees); \ Index: cluster-glue/lib/pils/test.c =================================================================== --- cluster-glue.orig/lib/pils/test.c 2014-10-31 15:43:17.000000000 +0100 +++ cluster-glue/lib/pils/test.c 2015-02-24 09:54:27.928451660 +0100 @@ -100,7 +100,7 @@ PIL_PLUGIN_INIT(PILPlugin*us, PILPluginI , &OurIf , (void*)&OurIfImports , NULL); - imports->log(PIL_INFO, "test init function: returning %d" + imports->log(PIL_INFO, "test init function: returning %u" , ret); return ret; Index: cluster-glue/lib/clplumbing/cl_msg.c =================================================================== --- cluster-glue.orig/lib/clplumbing/cl_msg.c 2014-10-31 15:43:17.000000000 +0100 +++ cluster-glue/lib/clplumbing/cl_msg.c 2015-02-24 09:56:29.054804261 +0100 @@ -1344,7 +1344,7 @@ cl_msg_add_list_str(struct ha_msg* msg, if (n <= 0 || buf == NULL|| name ==NULL ||msg == NULL){ cl_log(LOG_ERR, "%s:" "invalid parameter(%s)", - !n <= 0?"n is negative or zero": + n <= 0?"n is negative or zero": !buf?"buf is NULL": !name?"name is NULL": "msg is NULL",__FUNCTION__); @@ -1397,7 +1397,7 @@ cl_msg_add_list_int(struct ha_msg* msg, if (n <= 0 || buf == NULL|| name ==NULL ||msg == NULL){ cl_log(LOG_ERR, "cl_msg_add_list_int:" "invalid parameter(%s)", - !n <= 0?"n is negative or zero": + n <= 0?"n is negative or zero": !buf?"buf is NULL": !name?"name is NULL": "msg is NULL"); Index: cluster-glue/lib/clplumbing/cl_msg_types.c =================================================================== --- cluster-glue.orig/lib/clplumbing/cl_msg_types.c 2014-10-31 15:43:17.000000000 +0100 +++ cluster-glue/lib/clplumbing/cl_msg_types.c 2015-02-24 09:57:06.651224230 +0100 @@ -742,7 +742,7 @@ convert_nl_sym(char* s, int len, char sy if (s[i] == sym){ cl_log(LOG_ERR , "convert_nl_sym(): special symbol \'0x%x\' (%c) found" - " in string at %d (len=%d)", s[i], s[i], i, len); + " in string at %d (len=%d)", (unsigned)s[i], s[i], i, len); i -= 10; if(i < 0) { i = 0; Index: cluster-glue/lib/clplumbing/cl_log.c =================================================================== --- cluster-glue.orig/lib/clplumbing/cl_log.c 2014-10-31 15:43:17.000000000 +0100 +++ cluster-glue/lib/clplumbing/cl_log.c 2015-02-24 09:58:24.245091228 +0100 @@ -1149,7 +1149,7 @@ ChildLogIPCMessage(int priority, const c if (ch->msgpad > MAX_MSGPAD){ - cl_log(LOG_ERR, "ChildLogIPCMessage: invalid msgpad(%d)", + cl_log(LOG_ERR, "ChildLogIPCMessage: invalid msgpad(%u)", ch->msgpad); return NULL; } Index: cluster-glue/lib/clplumbing/cl_pidfile.c =================================================================== --- cluster-glue.orig/lib/clplumbing/cl_pidfile.c 2014-10-31 15:43:17.000000000 +0100 +++ cluster-glue/lib/clplumbing/cl_pidfile.c 2015-02-24 10:04:17.081057827 +0100 @@ -91,7 +91,7 @@ int IsRunning(long pid) #endif /* check to make sure pid hasn't been reused by another process */ - snprintf(proc_path, sizeof(proc_path), "/proc/%lu/exe", pid); + snprintf(proc_path, sizeof(proc_path), "/proc/%ld/exe", pid); rc = readlink(proc_path, exe_path, PATH_MAX-1); if(rc < 0) { @@ -102,7 +102,7 @@ int IsRunning(long pid) mypid = (unsigned long) getpid(); - snprintf(proc_path, sizeof(proc_path), "/proc/%lu/exe", mypid); + snprintf(proc_path, sizeof(proc_path), "/proc/%ld/exe", mypid); rc = readlink(proc_path, myexe_path, PATH_MAX-1); if(rc < 0) { cl_perror("Could not read from %s", proc_path); @@ -131,7 +131,7 @@ DoLock(const char *filename) snprintf(lf_name, sizeof(lf_name), "%s",filename); - snprintf(tf_name, sizeof(tf_name), "%s.%lu", + snprintf(tf_name, sizeof(tf_name), "%s.%ld", filename, mypid); if ((fd = open(lf_name, O_RDONLY)) >= 0) { @@ -147,7 +147,7 @@ DoLock(const char *filename) if (read(fd, buf, sizeof(buf)) < 1) { /* lockfile empty -> rm it and go on */; } else { - if (sscanf(buf, "%lu", &pid) < 1) { + if (sscanf(buf, "%ld", &pid) < 1) { /* lockfile screwed up -> rm it and go on */ } else { if (pid > 1 && (getpid() != pid) @@ -170,7 +170,7 @@ DoLock(const char *filename) } /* Slight overkill with the %*d format ;-) */ - snprintf(buf, sizeof(buf), "%*lu\n", LOCKSTRLEN-1, mypid); + snprintf(buf, sizeof(buf), "%*ld\n", LOCKSTRLEN-1, mypid); if (write(fd, buf, LOCKSTRLEN) != LOCKSTRLEN) { /* Again, nothing we can do about this */ @@ -250,7 +250,7 @@ cl_read_pidfile_no_checking(const char*f return -1; } - if (sscanf(buf, "%lu", &pid) <= 0) { + if (sscanf(buf, "%ld", &pid) <= 0) { close(fd); return -1; } Index: cluster-glue/lib/clplumbing/cl_poll.c =================================================================== --- cluster-glue.orig/lib/clplumbing/cl_poll.c 2014-10-31 15:43:17.000000000 +0100 +++ cluster-glue/lib/clplumbing/cl_poll.c 2015-02-24 10:01:58.750489375 +0100 @@ -282,7 +282,7 @@ cl_init_poll_sig(struct pollfd *fds, uns if (fds->events != 0 && debug) { cl_log(LOG_DEBUG , "Current event mask for fd [0] {%d} 0x%x" - , fds->fd, fds->events); + , fds->fd, (unsigned)fds->events); } /* * Examine each fd for the following things: @@ -329,15 +329,15 @@ cl_init_poll_sig(struct pollfd *fds, uns if (debug) { cl_log(LOG_DEBUG , "revents for fd %d: 0x%x" - , fds[j].fd, fds[j].revents); + , fds[j].fd, (unsigned)fds[j].revents); cl_log(LOG_DEBUG , "events for fd %d: 0x%x" - , fds[j].fd, fds[j].events); + , fds[j].fd, (unsigned)fds[j].events); } }else if (fds[j].events && debug) { cl_log(LOG_DEBUG , "pendevents for fd %d: 0x%x" - , fds[j].fd, moni->pendevents); + , fds[j].fd, (unsigned)moni->pendevents); } if (badfd) { cl_poll_ignore(fd); @@ -383,7 +383,7 @@ cl_real_poll_fd(int fd) if (debug) { cl_log(LOG_DEBUG , "Old news from poll(2) for fd %d: 0x%x" - , fd, pfd[0].revents); + , fd, (unsigned)pfd[0].revents); } }else{ if (fcntl(fd, F_GETFL) < 0) { @@ -690,14 +690,15 @@ dump_fd_info(struct pollfd *fds, unsigne cl_log(LOG_DEBUG, "fd %d flags: 0%o, signal: %d, events: 0x%x" ", revents: 0x%x, pendevents: 0x%x" - , fd, fcntl(fd, F_GETFL), moni->nsig - , fds[j].events, fds[j].revents, moni->pendevents); + , fd, (unsigned)fcntl(fd, F_GETFL), moni->nsig + , (unsigned)fds[j].events, (unsigned)fds[j].revents + , (unsigned)moni->pendevents); } for (j=SIGRTMIN; j < (unsigned)SIGRTMAX; ++j) { if (!sigismember(&SignalSet, j)) { continue; } - cl_log(LOG_DEBUG, "Currently monitoring RT signal %d", j); + cl_log(LOG_DEBUG, "Currently monitoring RT signal %u", j); } } @@ -727,19 +728,19 @@ check_fd_info(struct pollfd *fds, unsign } sig = fcntl(j, F_GETSIG); if (sig == 0) { - cl_log(LOG_ERR, "FD %d will get SIGIO", j); + cl_log(LOG_ERR, "FD %u will get SIGIO", j); } if (!sigismember(&SignalSet, sig)) { - cl_log(LOG_ERR, "FD %d (signal %d) is not in SignalSet" + cl_log(LOG_ERR, "FD %u (signal %d) is not in SignalSet" , j, sig); } if (sig < SIGRTMIN || sig >= SIGRTMAX) { - cl_log(LOG_ERR, "FD %d (signal %d) is not RealTime" + cl_log(LOG_ERR, "FD %u (signal %d) is not RealTime" , j, sig); } pid = fcntl(j, F_GETOWN); if (pid != getpid()) { - cl_log(LOG_ERR, "FD %d (signal %d) owner is pid %d" + cl_log(LOG_ERR, "FD %u (signal %d) owner is pid %d" , j, sig, pid); } } Index: cluster-glue/lib/clplumbing/GSource.c =================================================================== --- cluster-glue.orig/lib/clplumbing/GSource.c 2014-10-31 15:43:17.000000000 +0100 +++ cluster-glue/lib/clplumbing/GSource.c 2015-02-24 10:08:40.474080849 +0100 @@ -75,7 +75,7 @@ lc_fetch(char *ptr) { #define WARN_DELAY(ms, mx, input) cl_log(LOG_WARNING \ , "%s: Dispatch function for %s was delayed" \ " %lu ms (> %lu ms) before being called (GSource: 0x%lx)" \ - , __FUNCTION__, (input)->description, ms, mx \ + , __FUNCTION__, (input)->description, (unsigned long)ms, (unsigned long)mx \ , POINTER_TO_ULONG(input)) #define EXPLAINDELAY(started, detected) cl_log(LOG_INFO \ @@ -87,7 +87,7 @@ lc_fetch(char *ptr) { #define WARN_TOOLONG(ms, mx, input) cl_log(LOG_WARNING \ , "%s: Dispatch function for %s took too long to execute" \ ": %lu ms (> %lu ms) (GSource: 0x%lx)" \ - , __FUNCTION__, (input)->description, ms, mx \ + , __FUNCTION__, (input)->description, (unsigned long)ms, (unsigned long)mx \ , POINTER_TO_ULONG(input)) #define CHECK_DISPATCH_DELAY(i) { \ @@ -949,7 +949,7 @@ G_main_add_SignalHandler(int priority, i sig_src->description = "signal"; if (sig_src->gsourceid < 1) { cl_log(LOG_ERR - , "%s: Could not attach source for signal %d (%d)" + , "%s: Could not attach source for signal %d (%u)" , __FUNCTION__ , signal, sig_src->gsourceid); failed = TRUE; @@ -1298,7 +1298,7 @@ G_main_add_TriggerHandler(int priority, trig_src->gsourceid = g_source_attach(source, NULL); trig_src->description = "trigger"; if (trig_src->gsourceid < 1) { - cl_log(LOG_ERR, "G_main_add_TriggerHandler: Could not attach new source (%d)", + cl_log(LOG_ERR, "G_main_add_TriggerHandler: Could not attach new source (%u)", trig_src->gsourceid); failed = TRUE; } Index: cluster-glue/lib/clplumbing/coredumps.c =================================================================== --- cluster-glue.orig/lib/clplumbing/coredumps.c 2014-10-31 15:43:17.000000000 +0100 +++ cluster-glue/lib/clplumbing/coredumps.c 2015-02-24 10:10:18.328203497 +0100 @@ -89,7 +89,7 @@ cl_cdtocoredir(void) pwent = getpwuid(getuid()); if (pwent == NULL) { int errsave = errno; - cl_perror("Cannot get name for uid [%d]", getuid()); + cl_perror("Cannot get name for uid [%u]", getuid()); errno = errsave; return -1; } Index: cluster-glue/lib/clplumbing/ocf_ipc.c =================================================================== --- cluster-glue.orig/lib/clplumbing/ocf_ipc.c 2014-10-31 15:43:17.000000000 +0100 +++ cluster-glue/lib/clplumbing/ocf_ipc.c 2015-02-24 10:11:41.840161379 +0100 @@ -448,7 +448,7 @@ ipc_bufpool_update(struct ipc_bufpool* p "magic number in head does not match. " "Something very bad happened, farside pid =%d", ch->farside_pid); - cl_log(LOG_ERR, "magic=%x, expected value=%x", head->magic, HEADMAGIC); + cl_log(LOG_ERR, "magic=%x, expected value=%x", head->magic, (unsigned)HEADMAGIC); ipc_bufpool_display(pool); cl_log(LOG_INFO, "nmsgs=%d", nmsgs); /*print out the last message in queue*/ Index: cluster-glue/lib/clplumbing/ipcsocket.c =================================================================== --- cluster-glue.orig/lib/clplumbing/ipcsocket.c 2014-10-31 15:43:17.000000000 +0100 +++ cluster-glue/lib/clplumbing/ipcsocket.c 2015-02-24 10:15:09.317540398 +0100 @@ -1131,7 +1131,7 @@ socket_check_poll(struct IPC_CHANNEL * c } cl_log(LOG_ERR , "revents failure: fd %d, flags 0x%x" - , sockpoll->fd, sockpoll->revents); + , sockpoll->fd, (unsigned)sockpoll->revents); errno = EINVAL; return IPC_FAIL; } Index: cluster-glue/lib/clplumbing/realtime.c =================================================================== --- cluster-glue.orig/lib/clplumbing/realtime.c 2014-10-31 15:43:17.000000000 +0100 +++ cluster-glue/lib/clplumbing/realtime.c 2015-02-24 10:16:48.610678558 +0100 @@ -314,7 +314,7 @@ cl_realtime_malloc_check(void) post_rt_morecore_count - lastcount); cl_log(LOG_INFO, - "Total non-realtime malloc bytes: %ld", + "Total non-realtime malloc bytes: %lu", MALLOC_TOTALSIZE() - init_malloc_arena); oldarena = MALLOC_TOTALSIZE(); Index: cluster-glue/lib/clplumbing/ipctest.c =================================================================== --- cluster-glue.orig/lib/clplumbing/ipctest.c 2014-10-31 15:43:17.000000000 +0100 +++ cluster-glue/lib/clplumbing/ipctest.c 2015-02-24 10:20:51.936466739 +0100 @@ -1044,7 +1044,7 @@ asyn_echoclient(IPC_Channel* chan, int r if ((pf[0].revents & (POLLERR|POLLNVAL)) != 0) { cl_log(LOG_ERR , "Async echoclient: bad poll revents." - " revents: 0x%x iter %d", pf[0].revents, rdcount); + " revents: 0x%x iter %d", (unsigned)pf[0].revents, rdcount); ++errcount; continue; } @@ -1054,7 +1054,7 @@ asyn_echoclient(IPC_Channel* chan, int r && ((pf[0].revents&POLLIN) == 0)) { cl_log(LOG_ERR , "Async echoclient: premature pollhup." - " revents: 0x%x iter %d", pf[0].revents, rdcount); + " revents: 0x%x iter %d", (unsigned)pf[0].revents, rdcount); EOFcheck(chan); ++errcount; continue; @@ -1065,7 +1065,7 @@ asyn_echoclient(IPC_Channel* chan, int r && (pf[1].revents & (POLLERR|POLLNVAL)) != 0) { cl_log(LOG_ERR , "Async echoclient: bad poll revents[1]." - " revents: 0x%x iter %d", pf[1].revents, rdcount); + " revents: 0x%x iter %d", (unsigned)pf[1].revents, rdcount); ++errcount; continue; } @@ -1078,7 +1078,7 @@ asyn_echoclient(IPC_Channel* chan, int r /* Neither I nor O available... */ cl_log(LOG_ERR , "Async echoclient: bad events." - " revents: 0x%x iter %d", pf[0].revents, rdcount); + " revents: 0x%x iter %d", (unsigned)pf[0].revents, rdcount); ++errcount; } } Index: cluster-glue/lib/stonith/st_ttylock.c =================================================================== --- cluster-glue.orig/lib/stonith/st_ttylock.c 2014-10-31 15:43:17.000000000 +0100 +++ cluster-glue/lib/stonith/st_ttylock.c 2015-02-24 10:25:56.583923145 +0100 @@ -142,7 +142,7 @@ DoLock(const char * prefix, const char * snprintf(lf_name, sizeof(lf_name), "%s/%s%s" , HA_VARLOCKDIR, prefix, lockname); - snprintf(tf_name, sizeof(tf_name), "%s/tmp%lu-%s" + snprintf(tf_name, sizeof(tf_name), "%s/tmp%ld-%s" , HA_VARLOCKDIR, mypid, lockname); if ((fd = open(lf_name, O_RDONLY)) >= 0) { @@ -158,7 +158,7 @@ DoLock(const char * prefix, const char * if (read(fd, buf, sizeof(buf)) < 1) { /* lockfile empty -> rm it and go on */; } else { - if (sscanf(buf, "%lu", &pid) < 1) { + if (sscanf(buf, "%ld", &pid) < 1) { /* lockfile screwed up -> rm it and go on */ } else { if (pid > 1 && ((long)getpid() != pid) @@ -182,7 +182,7 @@ DoLock(const char * prefix, const char * } /* Slight overkill with the %*d format ;-) */ - snprintf(buf, sizeof(buf), "%*lu\n", LOCKSTRLEN-1, mypid); + snprintf(buf, sizeof(buf), "%*ld\n", LOCKSTRLEN-1, mypid); if (write(fd, buf, LOCKSTRLEN) != LOCKSTRLEN) { /* Again, nothing we can do about this */ Index: cluster-glue/lib/plugins/stonith/wti_mpc.c =================================================================== --- cluster-glue.orig/lib/plugins/stonith/wti_mpc.c 2014-10-31 15:43:17.000000000 +0100 +++ cluster-glue/lib/plugins/stonith/wti_mpc.c 2015-02-24 10:28:49.523866722 +0100 @@ -468,11 +468,11 @@ wti_mpc_hostlist(StonithPlugin * s) /* prepare objname */ switch (ad->mib_version) { case 3: - snprintf(objname,MAX_STRING,OID_GROUP_NAMES_V3,j+1); + snprintf(objname,MAX_STRING,OID_GROUP_NAMES_V3,(unsigned)j+1); break; case 1: default: - snprintf(objname,MAX_STRING,OID_GROUP_NAMES_V1,j+1); + snprintf(objname,MAX_STRING,OID_GROUP_NAMES_V1,(unsigned)j+1); break; } if (Debug) { @@ -549,11 +549,11 @@ wti_mpc_reset_req(StonithPlugin * s, int /* prepare objname */ switch (ad->mib_version) { case 3: - snprintf(objname,MAX_STRING,OID_GROUP_NAMES_V3,outlet); + snprintf(objname,MAX_STRING,OID_GROUP_NAMES_V3,(unsigned)outlet); break; case 1: default: - snprintf(objname,MAX_STRING,OID_GROUP_NAMES_V1,outlet); + snprintf(objname,MAX_STRING,OID_GROUP_NAMES_V1,(unsigned)outlet); break; } @@ -695,11 +695,11 @@ wti_mpc_set_config(StonithPlugin * s, St for (mo=1;mo<MAX_OUTLETS;mo++) { switch (sd->mib_version) { case 3: - snprintf(objname,MAX_STRING,OID_GROUP_NAMES_V3,mo); + snprintf(objname,MAX_STRING,OID_GROUP_NAMES_V3,(unsigned)mo); break; case 1: default: - snprintf(objname,MAX_STRING,OID_GROUP_NAMES_V1,mo); + snprintf(objname,MAX_STRING,OID_GROUP_NAMES_V1,(unsigned)mo); break; } Index: cluster-glue/lib/plugins/stonith/bladehpi.c =================================================================== --- cluster-glue.orig/lib/plugins/stonith/bladehpi.c 2014-10-31 15:43:17.000000000 +0100 +++ cluster-glue/lib/plugins/stonith/bladehpi.c 2015-02-24 10:34:32.278721283 +0100 @@ -861,7 +861,7 @@ get_resource_type(char *entityRoot, SaHp case SAHPI_ENT_SYSTEM_CHASSIS: snprintf(rootName, sizeof(rootName) , SYSTEM_CHASSIS_FMT - , ohep->Entry[i].EntityLocation); + , (int)ohep->Entry[i].EntityLocation); if (!strcmp(entityRoot, rootName)) { foundRoot = 1; } @@ -978,7 +978,7 @@ try_again: dev->ohdevid = ohRPT.ResourceId; if (Debug) { - LOG(PIL_DEBUG, "BladeCenter '%s' has id %d" + LOG(PIL_DEBUG, "BladeCenter '%s' has id %u" , (char*)ohRPT.ResourceTag.Data , dev->ohdevid); } @@ -994,8 +994,8 @@ try_again: if (Debug) { LOG(PIL_DEBUG - , "MgmtModule '%s' has id %d " - "with sensor #%d" + , "MgmtModule '%s' has id %u " + "with sensor #%u" , (char*)ohRPT.ResourceTag.Data , dev->ohsensid , dev->ohsensnum); @@ -1036,7 +1036,7 @@ try_again: dev->hostlist = g_list_append(dev->hostlist, bi); if (Debug) { - LOG(PIL_DEBUG, "Blade '%s' has id %d, caps %x" + LOG(PIL_DEBUG, "Blade '%s' has id %u, caps %x" , bi->name, bi->resourceId, bi->resourceCaps); } break; @@ -1055,7 +1055,7 @@ try_again: free_bladehpi_hostlist(dev); if(Debug){ LOG(PIL_DEBUG, "Looping through entries again," - " count changed from %d to %d" + " count changed from %u to %u" , ohupdate, ohdi.RptUpdateCount); } goto try_again; ++++++ cluster-glue.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/.hg_archival.txt new/cluster-glue/.hg_archival.txt --- old/cluster-glue/.hg_archival.txt 2014-07-14 17:49:05.000000000 +0200 +++ new/cluster-glue/.hg_archival.txt 2014-10-31 15:43:17.000000000 +0100 @@ -1,5 +1,5 @@ repo: e3ffdd7ae81c596b2be7e1e110d2c1255161340e -node: ec7802482c733072db57b46d4304f27040f81bcd +node: 6be50bc2ce61d9ac64e591c97609cace06ce3045 branch: default -latesttag: glue-1.0.12-rc1 -latesttagdistance: 27 +latesttag: glue-1.0.12 +latesttagdistance: 5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/.hgsigs new/cluster-glue/.hgsigs --- old/cluster-glue/.hgsigs 2014-07-14 17:49:05.000000000 +0200 +++ new/cluster-glue/.hgsigs 2014-10-31 15:43:17.000000000 +0100 @@ -1,3 +1,4 @@ b6dca003bb176978af803eeb33019b6aef3c58b0 0 iEYEABECAAYFAktnGJAACgkQWnQN9wr0w1ywBACghXYwYkv/70Xg5AQMzVjRWKZecIoAnjRUytRoYl+dhhqbhfdXSD+/Bfvw 6007185b487e3f2dc3b24674a9105761b2cde6ea 0 iEYEABECAAYFAktoWfsACgkQWnQN9wr0w1ySZwCfQILyC2VJrCnVEU2zvTIyI7ustDAAn37hhb9JM8JQVKLfPEbqIloz1m3m 979c4ffae287976631a30d10258903aea6fb28fa 0 iEYEABECAAYFAktoY38ACgkQWnQN9wr0w1wHxgCeMZyOt8ccxmIsvIHg4/y6KmqtTVAAn2jn7dOmFMjA8m4ju59YaQ1Bznhb +798645ead29e20b361af883fce695b85caf3392b 0 iEYEABECAAYFAlPJCM4ACgkQWnQN9wr0w1wv+QCeJQOjaYNXNJZA61n7Fu8f63CeVBEAnja4WqiYC+TS4HvmRJz6oNi6p48u diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/.hgtags new/cluster-glue/.hgtags --- old/cluster-glue/.hgtags 2014-07-14 17:49:05.000000000 +0200 +++ new/cluster-glue/.hgtags 2014-10-31 15:43:17.000000000 +0100 @@ -65,3 +65,4 @@ 12055ca2b025ab250a544701edaa1f5aaf63aef1 glue-1.0.10 02bdcf58f9a098b717784746308e199e12eeb005 glue-1.0.11 c64d6e96f20ad5ba245f7fb9e1295b14fa179e29 glue-1.0.12-rc1 +d05229decc34d66c4752536dc7c9d812d1e6d5ca glue-1.0.12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/ChangeLog new/cluster-glue/ChangeLog --- old/cluster-glue/ChangeLog 2014-07-14 17:49:05.000000000 +0200 +++ new/cluster-glue/ChangeLog 2014-10-31 15:43:17.000000000 +0100 @@ -1,3 +1,17 @@ +* Fri Jul 18 2014 Dejan Muhamedagic <[email protected]>, Lars Ellenberg <[email protected]>, and many others +- stable release 1.0.12 +- hb_report: add -Q option for quick runs +- hb_report: dot is not illegal in file names (bnc#884079, deb#715391) +- build: update spec files for systemd +- hb_report: update interface to zypper +- hb_report: support logs with varied timestamps +- stonith: external/vcenter: add parameter for SSL hostname + verification (bnc#851990) +- hb_report: fix ssh passwords again (bnc#867365) +- hb_report: Don't use deprecated corosync-fplay (bnc#870913) +- logd: Add systemd unit file for logd (bnc#863248) +- hb_report: Add support for xz compression (bnc#854060) + * Thu Sep 26 2013 Dejan Muhamedagic <[email protected]>, Lars Ellenberg <[email protected]>, and many others - release candidate 1.0.12-rc1 - clplumbing: increase listen backlog to 128 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/cluster-glue-fedora.spec new/cluster-glue/cluster-glue-fedora.spec --- old/cluster-glue/cluster-glue-fedora.spec 2014-07-14 17:49:05.000000000 +0200 +++ new/cluster-glue/cluster-glue-fedora.spec 2014-10-31 15:43:17.000000000 +0100 @@ -16,7 +16,7 @@ Name: cluster-glue Summary: Reusable cluster components Version: 1.0.12 -Release: 0.rc1%{?dist} +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Url: http://www.linux-ha.org/wiki/Cluster_Glue Group: System Environment/Base diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/cluster-glue-suse.spec new/cluster-glue/cluster-glue-suse.spec --- old/cluster-glue/cluster-glue-suse.spec 2014-07-14 17:49:05.000000000 +0200 +++ new/cluster-glue/cluster-glue-suse.spec 2014-10-31 15:43:17.000000000 +0100 @@ -30,7 +30,7 @@ Name: cluster-glue Summary: Reusable cluster components Version: 1.0.12 -Release: 0.rc1%{?dist} +Release: 1%{?dist} License: GPL v2 or later; LGPL v2.1 or later Url: http://www.linux-ha.org/wiki/Cluster_Glue Group: Productivity/Clustering/HA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/configure.ac new/cluster-glue/configure.ac --- old/cluster-glue/configure.ac 2014-07-14 17:49:05.000000000 +0200 +++ new/cluster-glue/configure.ac 2014-10-31 15:43:17.000000000 +0100 @@ -19,7 +19,7 @@ dnl checks for library functions dnl checks for system services -AC_INIT(cluster-glue, 1.0.12-rc1, [email protected]) +AC_INIT(cluster-glue, 1.0.12, [email protected]) FEATURES="" HB_PKG=heartbeat diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/include/clplumbing/cl_pidfile.h new/cluster-glue/include/clplumbing/cl_pidfile.h --- old/cluster-glue/include/clplumbing/cl_pidfile.h 2014-07-14 17:49:05.000000000 +0200 +++ new/cluster-glue/include/clplumbing/cl_pidfile.h 2014-10-31 15:43:17.000000000 +0100 @@ -21,5 +21,6 @@ int cl_read_pidfile_no_checking(const char *filename); int cl_lock_pidfile(const char *filename); int cl_unlock_pidfile(const char *filename); +int IsRunning(long pid); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/clplumbing/cl_log.c new/cluster-glue/lib/clplumbing/cl_log.c --- old/cluster-glue/lib/clplumbing/cl_log.c 2014-07-14 17:49:05.000000000 +0200 +++ new/cluster-glue/lib/clplumbing/cl_log.c 2014-10-31 15:43:17.000000000 +0100 @@ -719,12 +719,12 @@ } if (stderr_enabled) { - print_logline(stderr, cl_log_entity,cl_process_pid, + append_log(stderr, cl_log_entity,cl_process_pid, NULLTIME, prio2str(priority), buf); } if (stdout_enabled) { - print_logline(stdout, cl_log_entity,cl_process_pid, + append_log(stdout, cl_log_entity,cl_process_pid, NULLTIME, prio2str(priority), buf); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/clplumbing/cl_pidfile.c new/cluster-glue/lib/clplumbing/cl_pidfile.c --- old/cluster-glue/lib/clplumbing/cl_pidfile.c 2014-07-14 17:49:05.000000000 +0200 +++ new/cluster-glue/lib/clplumbing/cl_pidfile.c 2014-10-31 15:43:17.000000000 +0100 @@ -74,7 +74,7 @@ /* This is what the FHS standard specifies for the size of our lock file */ #define LOCKSTRLEN 11 #include <clplumbing/cl_log.h> -static int IsRunning(long pid) +int IsRunning(long pid) { int rc = 0; long mypid; @@ -224,7 +224,7 @@ pid = cl_read_pidfile_no_checking(filename); if (pid < 0){ - return - LSB_STATUS_STOPPED; + return -LSB_STATUS_STOPPED; } if (IsRunning(pid)){ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/clplumbing/ipcsocket.c new/cluster-glue/lib/clplumbing/ipcsocket.c --- old/cluster-glue/lib/clplumbing/ipcsocket.c 2014-07-14 17:49:05.000000000 +0200 +++ new/cluster-glue/lib/clplumbing/ipcsocket.c 2014-10-31 15:43:17.000000000 +0100 @@ -1388,8 +1388,15 @@ *nbytes = msg_len; nmsgs = ipc_bufpool_update(pool, ch, msg_len, ch->recv_queue) ; - SocketIPCStats.ninqueued += nmsgs; - + if (nmsgs < 0) { + /* we didn't like the other side */ + cl_log(LOG_ERR, "socket_resume_io_read: " + "disconnecting the other side"); + ch->ch_status = IPC_DISCONNECT; + retcode = IPC_FAIL; + } else { + SocketIPCStats.ninqueued += nmsgs; + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/clplumbing/ocf_ipc.c new/cluster-glue/lib/clplumbing/ocf_ipc.c --- old/cluster-glue/lib/clplumbing/ocf_ipc.c 2014-07-14 17:49:05.000000000 +0200 +++ new/cluster-glue/lib/clplumbing/ocf_ipc.c 2014-10-31 15:43:17.000000000 +0100 @@ -445,8 +445,8 @@ if (head->magic != HEADMAGIC) { GList* last = g_list_last(rqueue->queue); cl_log(LOG_ERR, "ipc_bufpool_update: " - "magic number in head does not match." - "Something very bad happened, abort now, farside pid =%d", + "magic number in head does not match. " + "Something very bad happened, farside pid =%d", ch->farside_pid); cl_log(LOG_ERR, "magic=%x, expected value=%x", head->magic, HEADMAGIC); ipc_bufpool_display(pool); @@ -456,7 +456,7 @@ IPC_Message* m = (IPC_Message*)last; ipcmsg_display(m); } - abort(); + return -1; } if ( head->msg_len > MAXMSG) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/logd/ha_logd.c new/cluster-glue/logd/ha_logd.c --- old/cluster-glue/logd/ha_logd.c 2014-07-14 17:49:05.000000000 +0200 +++ new/cluster-glue/logd/ha_logd.c 2014-10-31 15:43:17.000000000 +0100 @@ -590,20 +590,17 @@ alarm(0); do { sleep(1); - }while (kill((pid_t)running_logd_pid, 0) >= 0); - } - err = errno; - - if(errno == ESRCH) { - cl_log(LOG_INFO, "Pid %ld exited", running_logd_pid); - exit(LSB_EXIT_OK); - } else { + }while (IsRunning(running_logd_pid)); + } else if (errno != ESRCH) { + err = errno; cl_perror("Pid %ld not killed", running_logd_pid); exit((err == EPERM || err == EACCES) ? LSB_EXIT_EPERM : LSB_EXIT_GENERIC); } - + + cl_log(LOG_INFO, "Pid %ld exited", running_logd_pid); + exit(LSB_EXIT_OK); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
