Hello community, here is the log from the commit of package cluster-glue for openSUSE:Factory checked in at 2011-12-25 17:33:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old) and /work/SRC/openSUSE:Factory/.cluster-glue.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cluster-glue", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes 2011-09-23 01:53:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes 2011-12-25 17:33:38.000000000 +0100 @@ -1,0 +2,55 @@ +Mon Dec 12 13:24:22 UTC 2011 - [email protected] + +- hb_report: set back the default destination to current directory +- stonith: don't complain if rhcs plugins are not installed +- update release to 1.0.9 +- Upstream version cs: ce78649ed7ea + +------------------------------------------------------------------- +Fri Nov 25 11:46:50 UTC 2011 - [email protected] + +- LRM: lrmd: set op status to cancelled for running monitor operations +- stonith: add CRM stonith resource name to log messages +- stonith: external/ipmi: add the priv parameter (ipmitool -L) +- stonith: external/ipmi: add missing double quote +- ha_log: increase MAXENTITY size to accommodate long stonith strings +- Upstream version cs: 7583026c6ace + +------------------------------------------------------------------- +Mon Nov 7 13:48:37 UTC 2011 - [email protected] + +- hb_report: improve destination directory handling (bnc#727295) +- Upstream version cs: 4b08977bece3 + +------------------------------------------------------------------- +Mon Oct 24 13:12:38 UTC 2011 - [email protected] + +- hb_report: add StrictHostKeyChecking=no to ssh options +- hb_report: better handling of corrupt logs +- hb_report: don't ssh to nodes which are unreachable +- Upstream version cs: 3b800f73ba59 + +------------------------------------------------------------------- +Thu Oct 20 11:19:31 UTC 2011 - [email protected] + +- stonith: load libplumb symbols manually (fixes ipmilan) (bnc#694243) +- hb_report: use absolute path when invoking slaves (bnc#662816) +- clplumbing: fix for cl_times() wraparound and subsequent crash + with 32bit clock_t on 64bit systems (lf#2596) +- set release to 1.0.8 +- Upstream version cs: 5ea7e344a633 (1.0.8) + +------------------------------------------------------------------- +Mon Oct 10 13:42:55 UTC 2011 - [email protected] + +- Upstream version cs: f1d722d9cef1 + +------------------------------------------------------------------- +Mon Oct 10 13:28:50 UTC 2011 - [email protected] + +- LRM: cibsecret: add StrictHostKeyChecking=no to ssh options +- LRM: cibsecret: allow set if the parameter is already stashed +- LRM: cibsecret: better handling of ssh failures +- stonith: external/ipmi: add parameter to specify ipmitool location + +------------------------------------------------------------------- Old: ---- cluster-glue-1.0.7.tar.bz2 New: ---- bnc662816_cluster-glue_hb_report_abspath.patch bug-694243_cluster-glue_symbol-conflict.patch bug-728579_glue-stonith-dev-id.patch cluster-glue-1.0.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cluster-glue.spec ++++++ --- /var/tmp/diff_new_pack.JUAEnD/_old 2011-12-25 17:33:39.000000000 +0100 +++ /var/tmp/diff_new_pack.JUAEnD/_new 2011-12-25 17:33:39.000000000 +0100 @@ -35,19 +35,33 @@ Name: cluster-glue Summary: The Heartbeat Subsystem for High-Availability Linux -Version: 1.0.7 -Release: 8 License: GPL-2.0 ; LGPL-2.1+ -Url: http://linux-ha.org/ Group: Productivity/Clustering/HA +Version: 1.0.9 +Release: 0 +Url: http://linux-ha.org/ Source: cluster-glue-%{version}.tar.bz2 Source2: baselibs.conf Patch0: fix-runlevels.diff +Patch1: bug-694243_cluster-glue_symbol-conflict.patch +Patch2: bnc662816_cluster-glue_hb_report_abspath.patch +Patch4: bug-728579_glue-stonith-dev-id.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf automake e2fsprogs-devel glib2-devel libtool libxml2-devel pkgconfig python-devel -BuildRequires: OpenIPMI-devel net-snmp-devel openhpi-devel -BuildRequires: docbook-xsl-stylesheets docbook_4 libxslt +BuildRequires: OpenIPMI-devel +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: docbook-xsl-stylesheets +BuildRequires: docbook_4 +BuildRequires: e2fsprogs-devel +BuildRequires: glib2-devel BuildRequires: help2man +BuildRequires: libtool +BuildRequires: libxml2-devel +BuildRequires: libxslt +BuildRequires: net-snmp-devel +BuildRequires: openhpi-devel +BuildRequires: pkgconfig +BuildRequires: python-devel %if 0%{?suse_version} > 1130 BuildRequires: libnet-devel PreReq: sysvinit(network) sysvinit(syslog) @@ -88,9 +102,7 @@ - IPv4 "ping" pseudo-cluster members. %package -n libglue2 -License: GPL-2.0 ; LGPL-2.1+ Summary: The Pacemaker scalable High-Availability cluster resource manager -Group: Productivity/Clustering/HA Obsoletes: libheartbeat2 < 3.0.2 Conflicts: libheartbeat2 < 3.0.2 Requires: %{name} = %{version}-%{release} @@ -100,9 +112,7 @@ such as Pacemaker. %package -n libglue-devel -License: GPL-2.0 ; LGPL-2.1+ Summary: The Heartbeat Subsystem for High-Availability Linux -Group: Productivity/Clustering/HA Requires: %{name} = %{version}-%{release} Requires: libglue2 = %{version}-%{release} Conflicts: libheartbeat-devel < 3.0.2 @@ -134,6 +144,9 @@ ########################################################### %setup -n cluster-glue -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch4 -p1 ########################################################### %build ++++++ bnc662816_cluster-glue_hb_report_abspath.patch ++++++ # HG changeset patch # Parent 4b08977bece328dd582ba23e9d92a7aa728133fd Low: hb_report: use absolute path when invoking slaves (bnc#662816) diff -r 4b08977bece3 hb_report/hb_report.in --- a/hb_report/hb_report.in Fri Nov 04 17:59:44 2011 +0100 +++ b/hb_report/hb_report.in Mon Nov 07 14:55:48 2011 +0100 @@ -27,6 +27,13 @@ unset LANG export LC_ALL=POSIX PROG=`basename $0` +PROGDIR=`dirname $0` +echo "$PROGDIR" | grep -qs '^/' || { + test -f @sbindir@/$PROG && + PROGDIR=@sbindir@ + test -f $HA_NOARCHBIN/$PROG && + PROGDIR=$HA_NOARCHBIN +} # the default syslog facility is not (yet) exported by heartbeat # to shell scripts @@ -461,7 +468,7 @@ start_slave_collector() { $SUDO hb_report __slave else ssh $SSH_OPTS_AUTH $node \ - "$SUDO hb_report __slave" + "$SUDO $PROGDIR/hb_report __slave" fi | (cd $WORKDIR && tar xf -) & SLAVEPIDS="$SLAVEPIDS $!" ++++++ bug-694243_cluster-glue_symbol-conflict.patch ++++++ # HG changeset patch # User Dejan Muhamedagic <[email protected]> # Date 1305833626 -7200 # Node ID f269e32b7ee47428535471bcf1de9c68b8569467 # Parent b3ab6686445b5267a18a37d1a1404170693306db Medium: stonith: load libplumb symbols manually (thanks to lge) (bnc#694243) Index: cluster-glue/lib/stonith/Makefile.am =================================================================== --- cluster-glue.orig/lib/stonith/Makefile.am +++ cluster-glue/lib/stonith/Makefile.am @@ -33,9 +33,7 @@ endif stonith_SOURCES = main.c -stonith_LDADD = libstonith.la $(top_builddir)/lib/pils/libpils.la $(GLIBLIB) \ - $(top_builddir)/lib/clplumbing/libplumb.la \ - $(top_builddir)/lib/clplumbing/libplumbgpl.la +stonith_LDADD = libstonith.la $(top_builddir)/lib/pils/libpils.la $(GLIBLIB) stonith_LDFLAGS = @LIBADD_DL@ @LIBLTDL@ -export-dynamic @DLOPEN_FORCE_FLAGS@ @LIBADD_INTL@ meatclient_SOURCES = meatclient.c Index: cluster-glue/lib/stonith/main.c =================================================================== --- cluster-glue.orig/lib/stonith/main.c +++ cluster-glue/lib/stonith/main.c @@ -26,9 +26,9 @@ #include <unistd.h> #include <string.h> #include <syslog.h> +#include <dlfcn.h> #include <stonith/stonith.h> #include <pils/plugin.h> -#include <clplumbing/cl_log.h> #include <glib.h> #include <libxml/entities.h> @@ -43,6 +43,7 @@ static int debug = 0; #define LOG_TERMINAL 0 #define LOG_CLLOG 1 static int log_destination = LOG_TERMINAL; +static void (*logfun)(int, const char *, ...) G_GNUC_PRINTF(2,3); static const char META_TEMPLATE[] = "<?xml version=\"1.0\"?>\n" @@ -73,9 +74,11 @@ void print_stonith_meta(Stonith * stonit void print_types(void); void print_confignames(Stonith *s); +const char *prio2str(int priority); void log_buf(int severity, char *buf); void log_msg(int severity, const char * fmt, ...)G_GNUC_PRINTF(2,3); void trans_log(int priority, const char * fmt, ...)G_GNUC_PRINTF(2,3); +void setup_cl_log(void); static int pil_loglevel_to_syslog_severity[] = { /* Indices: <none>=0, PIL_FATAL=1, PIL_CRIT=2, PIL_WARN=3, @@ -297,6 +300,7 @@ print_stonith_meta(Stonith * stonith_obj } #define MAXNVARG 50 +#define MAXLINE (512*10) void print_types() @@ -331,6 +335,27 @@ print_confignames(Stonith *s) printf("\n"); } +const char * +prio2str(int priority) +{ + static const char *log_prio[8] = { + "EMERG", + "ALERT", + "CRIT", + "ERROR", + "WARN", + "notice", + "info", + "debug" + }; + int logpri; + + logpri = LOG_PRI(priority); + + return (logpri < 0 || logpri >= DIMOF(log_prio)) ? + "(undef)" : log_prio[logpri]; +} + void log_buf(int severity, char *buf) { @@ -339,7 +364,11 @@ log_buf(int severity, char *buf) fprintf(stderr, "%s: %s\n", prio2str(severity),buf); } } else { - cl_log(severity, "%s", buf); + if (logfun) { + (*logfun)(severity, "%s", buf); + } else { + syslog(severity, "%s", buf); + } } } @@ -370,6 +399,40 @@ trans_log(int priority, const char * fmt log_buf(severity, buf); } +/* + * due to possible symbol conflict with other system libraries + * (in particular HMAC, MD5, and base64*) we just pick the + * symbols we need here + */ + +void +setup_cl_log(void) +{ + void *ldhandle; + void (*set_entity)(const char *); + void (*enable_stderr)(int); + void (*set_facility)(int); + void (*inherit_logging_environment)(int); + + ldhandle = dlopen("libplumb.so", RTLD_LAZY); + if (!ldhandle) { + return; + } + + *(void **) (&set_entity) = dlsym(ldhandle, "cl_log_set_entity"); + *(void **) (&enable_stderr) = dlsym(ldhandle, "cl_log_enable_stderr"); + *(void **) (&set_facility) = dlsym(ldhandle, "cl_log_set_facility"); + *(void **) (&inherit_logging_environment) = dlsym(ldhandle, "cl_inherit_logging_environment"); + *(void **) (&logfun) = dlsym(ldhandle, "cl_log"); + + (*set_entity)("stonith"); + (*enable_stderr)(debug?TRUE:FALSE); + (*set_facility)(HA_LOG_FACILITY); + + /* Use logd if it's enabled by heartbeat */ + (*inherit_logging_environment)(0); +} + int main(int argc, char** argv) { @@ -491,12 +554,7 @@ main(int argc, char** argv) /* if we're invoked by stonithd, log through cl_log */ if (!isatty(fileno(stdin))) { log_destination = LOG_CLLOG; - cl_log_set_entity("stonith"); - cl_log_enable_stderr(debug?TRUE:FALSE); - cl_log_set_facility(HA_LOG_FACILITY); - - /* Use logd if it's enabled by heartbeat */ - cl_inherit_logging_environment(0); + setup_cl_log(); } if (help && !errors) { ++++++ bug-728579_glue-stonith-dev-id.patch ++++++ # HG changeset patch # Parent 4b08977bece328dd582ba23e9d92a7aa728133fd Low: stonith: add CRM stonith resource name to log messages diff -r 4b08977bece3 -r 118235d7af04 lib/stonith/ha_log.sh --- a/lib/stonith/ha_log.sh Fri Nov 04 17:59:44 2011 +0100 +++ b/lib/stonith/ha_log.sh Thu Nov 10 10:50:40 2011 +0100 @@ -54,16 +54,24 @@ level_pres() { esac } +set_logtag() { + # add parent pid to the logtag + if [ "$HA_LOGTAG" ]; then + if [ -n "$CRM_st_device_id" ]; then + HA_LOGTAG="$HA_LOGTAG($CRM_st_device_id)[$PPID]" + else + HA_LOGTAG="$HA_LOGTAG[$PPID]" + fi + fi +} + ha_log() { loglevel=$1 shift prn_level=`level_pres $loglevel` msg="$prn_level: $@" - # add parent pid to the logtag - if [ "$HA_LOGTAG" ]; then - HA_LOGTAG="$HA_LOGTAG[$PPID]" - fi + set_logtag # if we're connected to a tty, then output to stderr if tty >/dev/null; then ++++++ cluster-glue-1.0.7.tar.bz2 -> cluster-glue-1.0.9.tar.bz2 ++++++ ++++ 2543 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
