![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory checked in at 2014-06-18 07:47:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-05-22 20:39:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes 2014-06-18 07:47:46.000000000 +0200
@@ -1,0 +2,14 @@
+Thu Jun 12 14:38:50 UTC 2014 - dmuhamedagic@suse.com
+
+- hb_report: fix interface to gdb and zypper
+- upstream cs: 45e21bc9795d
+
+-------------------------------------------------------------------
+Fri Jun 6 13:30:57 UTC 2014 - dmuhamedagic@suse.com
+
+- hb_report: update interface to zypper
+- hb_report: support logs with varied timestamps
+- upstream cs: b7d3393f5431
+ * removed obsolete cluster-glue-configure-statedir.patch
+
+-------------------------------------------------------------------
Old:
----
cluster-glue-configure-statedir.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cluster-glue.spec ++++++
--- /var/tmp/diff_new_pack.OMxhrY/_old 2014-06-18 07:47:47.000000000 +0200
+++ /var/tmp/diff_new_pack.OMxhrY/_new 2014-06-18 07:47:47.000000000 +0200
@@ -50,8 +50,6 @@
Patch2: bnc662816_cluster-glue_hb_report_abspath.patch
# PATCH-FIX-OPENSUSE: drop lrm as it's not used anymore by pacemaker
Patch4: cluster-glue_droplrm.patch
-# PATCH-FIX-OPENSUSE: use _rundir macro and define GLUE_STATE_DIR accordingly
-Patch5: cluster-glue-configure-statedir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: asciidoc
@@ -158,7 +156,6 @@
%patch1 -p1
%patch2 -p1
%patch4 -p1
-%patch5 -p1
###########################################################
%build
@@ -211,7 +208,7 @@
then
: OK group haclient already present
else
- /usr/sbin/groupadd -o -r -g %{uid} %{gname} 2>/dev/null || :
+ /usr/sbin/groupadd -o -r -g %{uid} %{gname} 2>/dev/null
fi
if
getent passwd %{uname} >/dev/null
@@ -220,7 +217,7 @@
else
/usr/sbin/useradd -r -g %{gname} -c "heartbeat processes" \
-d %{_var}/lib/heartbeat/cores/%{uname} -o -u %{uid} \
- %{uname} 2>/dev/null || :
+ %{uname} 2>/dev/null
fi
%if %{defined _unitdir}
%service_add_pre logd.service
++++++ 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-05-02 17:18:58.000000000 +0200
+++ new/cluster-glue/.hg_archival.txt 2014-06-12 12:28:59.000000000 +0200
@@ -1,5 +1,5 @@
repo: e3ffdd7ae81c596b2be7e1e110d2c1255161340e
-node: b44fe9e0c67ec6d0a958147bab14f75324e16691
+node: 45e21bc9795d70b86ecc3825b91ef6424db178d8
branch: default
latesttag: glue-1.0.12-rc1
-latesttagdistance: 12
+latesttagdistance: 19
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-05-02 17:18:58.000000000 +0200
+++ new/cluster-glue/cluster-glue-suse.spec 2014-06-12 12:28:59.000000000 +0200
@@ -112,6 +112,7 @@
--with-package-name=%{name} \
--with-daemon-group=%{gname} \
--with-daemon-user=%{uname} \
+ --with-rundir=%{_rundir} \
--docdir=%{glue_docdir}
%endif
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-05-02 17:18:58.000000000 +0200
+++ new/cluster-glue/configure.ac 2014-06-12 12:28:59.000000000 +0200
@@ -177,6 +177,15 @@
[ GLUE_DAEMON_USER="hacluster" ],
)
+
+AC_ARG_WITH(
+ rundir,
+ [ --with-rundir=DIR
+ directory to store state information [default=localstatedir/run] ],
+ [ GLUE_STATE_DIR="$withval" ],
+ [ GLUE_STATE_DIR="${localstatedir}/run" ],
+ )
+
dnl ===============================================
dnl General Processing
dnl ===============================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/hb_report/hb_report.in new/cluster-glue/hb_report/hb_report.in
--- old/cluster-glue/hb_report/hb_report.in 2014-05-02 17:18:58.000000000 +0200
+++ new/cluster-glue/hb_report/hb_report.in 2014-06-12 12:28:59.000000000 +0200
@@ -1059,7 +1059,7 @@
}
# get the right part of the log
getlog() {
- local getstampproc cnt
+ local cnt
local outf
outf=$WORKDIR/$HALOG_F
@@ -1109,7 +1109,7 @@
# get all other info (config, stats, etc)
#
collect_info() {
- local getstampproc l
+ local l
sys_info > $WORKDIR/$SYSINFO_F 2>&1 &
sys_stats > $WORKDIR/$SYSSTATS_F 2>&1 &
getconfig $WORKDIR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/hb_report/utillib.sh new/cluster-glue/hb_report/utillib.sh
--- old/cluster-glue/hb_report/utillib.sh 2014-05-02 17:18:58.000000000 +0200
+++ new/cluster-glue/hb_report/utillib.sh 2014-06-12 12:28:59.000000000 +0200
@@ -175,10 +175,21 @@
getstamp_rfc5424() {
awk '{print $1}'
}
+get_ts() {
+ local l="$1" ts
+ ts=$(str2time `echo "$l" | $getstampproc`)
+ if [ -z "$ts" ]; then
+ local fmt
+ for fmt in rfc5424 syslog legacy; do
+ [ "getstamp_$fmt" = "$getstampproc" ] && continue
+ ts=$(str2time `echo "$l" | getstamp_$fmt`)
+ [ -n "$ts" ] && break
+ done
+ fi
+ echo $ts
+}
linetime() {
- local l
- l=`tail -n +$2 $1 | head -1 | $getstampproc`
- str2time "$l"
+ get_ts "`tail -n +$2 $1 | head -1`"
}
find_getstampproc() {
local t l func trycnt
@@ -210,7 +221,7 @@
find_first_ts() {
local l ts
while read l; do
- ts=$(str2time "`echo $l | $getstampproc`")
+ ts=`get_ts "$l"`
[ "$ts" ] && break
warning "cannot extract time: |$l|; will try the next one"
done
@@ -355,24 +366,30 @@
# regex pkg_mgr
# no spaces allowed in regex
cat<