commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2020-04-29 20:41:58
Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old)
and /work/SRC/openSUSE:Factory/.cluster-glue.new.2738 (New)
Package is "cluster-glue"
Wed Apr 29 20:41:58 2020 rev:68 rq:798302
version:1.0.12+v1.git.1587474580.a5fda2bc
Changes:
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes
2019-06-24 21:49:32.543928162 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new.2738/cluster-glue.changes
2020-04-29 20:42:23.691644599 +0200
@@ -1,0 +2,6 @@
+Mon Apr 27 12:56:01 UTC 2020 - xarb...@suse.com
+
+- Update to version 1.0.12+v1.git.1587474580.a5fda2bc:
+ * Fix EC2 stonith plugin (bsc#1169784)
+
+---
Old:
cluster-glue-1.0.12+v1.git.1560323319.fd5a3bef.tar.bz2
New:
cluster-glue-1.0.12+v1.git.1587474580.a5fda2bc.tar.bz2
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.RBsnxX/_old 2020-04-29 20:42:24.363646351 +0200
+++ /var/tmp/diff_new_pack.RBsnxX/_new 2020-04-29 20:42:24.367646361 +0200
@@ -23,7 +23,7 @@
# Directory where we install documentation
%global glue_docdir %{_defaultdocdir}/%{name}
Name: cluster-glue
-Version:1.0.12+v1.git.1560323319.fd5a3bef
+Version:1.0.12+v1.git.1587474580.a5fda2bc
Release:0
Summary:Reusable cluster components
License:GPL-2.0-only AND LGPL-2.1-or-later
++ _servicedata ++
--- /var/tmp/diff_new_pack.RBsnxX/_old 2020-04-29 20:42:24.415646486 +0200
+++ /var/tmp/diff_new_pack.RBsnxX/_new 2020-04-29 20:42:24.415646486 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/cluster-glue.git
- 26acc098f0fce9e109b91b4b0d307e83e8fa1dd1
\ No newline at end of file
+ 7c84a6ae8cab29a8eb1270b8c1de0cb346210df2
\ No newline at end of file
++ cluster-glue-1.0.12+v1.git.1560323319.fd5a3bef.tar.bz2 ->
cluster-glue-1.0.12+v1.git.1587474580.a5fda2bc.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cluster-glue-1.0.12+v1.git.1560323319.fd5a3bef/lib/plugins/stonith/external/ec2
new/cluster-glue-1.0.12+v1.git.1587474580.a5fda2bc/lib/plugins/stonith/external/ec2
---
old/cluster-glue-1.0.12+v1.git.1560323319.fd5a3bef/lib/plugins/stonith/external/ec2
2019-06-12 09:08:39.0 +0200
+++
new/cluster-glue-1.0.12+v1.git.1587474580.a5fda2bc/lib/plugins/stonith/external/ec2
2020-04-21 15:09:40.0 +0200
@@ -53,15 +53,20 @@
instance_not_found=0
unknown_are_stopped=0
-action_default="reset" # Default fence action
-ec2_tag_default="Name"# EC2 Tag containing the instance's uname
+action_default="reset" # Default fence action
+ec2_tag_default="Name" # EC2 Tag containing the instance's uname
+ec2_profile_default="default" # EC2 Profile containing the AWS's profile
sleep_time="1"
+# Set the correct value for the tag
[ -n "$tag" ] && ec2_tag="$tag"
-
: ${ec2_tag=${ec2_tag_default}}
+# Set the correct value for the profile
+[ -n "$profile" ] && ec2_profile="$profile"
+: ${ec2_profile=${ec2_profile_default}}
+
# Always invoke aws command with UTF-8 locale
# to avoid issues when the tag contains non-ASCII
# characters (bsc#1059171)
@@ -299,12 +304,7 @@
[ -n "$1" ] && action=$1
[ -n "$2" ] && node_to_fence=$2
-if [ -z "$ec2_profile"]; then
- options="--output text --profile default"
-else
- options="--output text --profile $ec2_profile "
-fi
-
+options="--output text --profile $ec2_profile"
action=`echo $action | tr 'A-Z' 'a-z'`
case $action in
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2019-06-24 21:49:32
Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old)
and /work/SRC/openSUSE:Factory/.cluster-glue.new.4615 (New)
Package is "cluster-glue"
Mon Jun 24 21:49:32 2019 rev:67 rq:709337
version:1.0.12+v1.git.1560323319.fd5a3bef
Changes:
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes
2018-08-27 13:46:55.612344147 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new.4615/cluster-glue.changes
2019-06-24 21:49:32.543928162 +0200
@@ -1,0 +2,11 @@
+Wed Jun 12 07:20:49 UTC 2019 - kgronl...@suse.com
+
+- Update to version 1.0.12+v1.git.1560323319.fd5a3bef:
+ * ibmhmc: Create /var/run/heartbeat/rsctmp if it doesn't exist (bsc#1131545)
+
+---
+Mon Jun 10 09:24:00 UTC 2019 - kgronl...@suse.com
+
+- Create /var/run/heartbeat/rsctmp directory (bsc#1131545)
+
+---
Old:
cluster-glue-1.0.12+v1.git.1534346580.be86a9f2.tar.bz2
New:
cluster-glue-1.0.12+v1.git.1560323319.fd5a3bef.tar.bz2
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.gOCk6B/_old 2019-06-24 21:49:33.143928625 +0200
+++ /var/tmp/diff_new_pack.gOCk6B/_new 2019-06-24 21:49:33.147928629 +0200
@@ -1,7 +1,7 @@
#
# spec file for package cluster-glue
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -23,7 +23,7 @@
# Directory where we install documentation
%global glue_docdir %{_defaultdocdir}/%{name}
Name: cluster-glue
-Version:1.0.12+v1.git.1534346580.be86a9f2
+Version:1.0.12+v1.git.1560323319.fd5a3bef
Release:0
Summary:Reusable cluster components
License:GPL-2.0-only AND LGPL-2.1-or-later
@@ -141,6 +141,7 @@
%post
%service_add_post logd.service
+mkdir -p %{_var}/run/heartbeat/rsctmp
%preun
%service_del_preun logd.service
++ _servicedata ++
--- /var/tmp/diff_new_pack.gOCk6B/_old 2019-06-24 21:49:33.183928656 +0200
+++ /var/tmp/diff_new_pack.gOCk6B/_new 2019-06-24 21:49:33.183928656 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/cluster-glue.git
- be86a9f22546e7d765b71ec0faebdabcc3a7c988
\ No newline at end of file
+ 26acc098f0fce9e109b91b4b0d307e83e8fa1dd1
\ No newline at end of file
++ cluster-glue-1.0.12+v1.git.1534346580.be86a9f2.tar.bz2 ->
cluster-glue-1.0.12+v1.git.1560323319.fd5a3bef.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cluster-glue-1.0.12+v1.git.1534346580.be86a9f2/lib/plugins/stonith/ibmhmc.c
new/cluster-glue-1.0.12+v1.git.1560323319.fd5a3bef/lib/plugins/stonith/ibmhmc.c
---
old/cluster-glue-1.0.12+v1.git.1534346580.be86a9f2/lib/plugins/stonith/ibmhmc.c
2018-08-15 17:23:00.0 +0200
+++
new/cluster-glue-1.0.12+v1.git.1560323319.fd5a3bef/lib/plugins/stonith/ibmhmc.c
2019-06-12 09:08:39.0 +0200
@@ -1135,7 +1135,7 @@
snprintf(cmd_password, MAX_CMD_LEN
,"umask 077;"
"if [ ! -d " HA_VARRUNDIR "/heartbeat/rsctmp/ibmhmc ];"
-"then mkdir " HA_VARRUNDIR "/heartbeat/rsctmp/ibmhmc
2>/dev/null;"
+"then mkdir -p " HA_VARRUNDIR "/heartbeat/rsctmp/ibmhmc
2>/dev/null;"
"fi;"
"export ibmhmc_tmp=`mktemp -p " HA_VARRUNDIR
"/heartbeat/rsctmp/ibmhmc/`;"
"echo \"echo '%s'\">$ibmhmc_tmp;"
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2018-08-27 13:46:47
Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old)
and /work/SRC/openSUSE:Factory/.cluster-glue.new (New)
Package is "cluster-glue"
Mon Aug 27 13:46:47 2018 rev:66 rq:629574
version:1.0.12+v1.git.1534346580.be86a9f2
Changes:
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes
2018-04-17 11:08:38.647364784 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2018-08-27 13:46:55.612344147 +0200
@@ -1,0 +2,8 @@
+Thu Aug 16 07:31:33 UTC 2018 - kgronl...@suse.com
+
+- Update to version 1.0.12+v1.git.1534346580.be86a9f2:
+ * Fix: stonith:ibmhmc: Add "managedsyspat" and "password" as supported
parameters (bsc#1098758)
+- Remove obsolete patch:
+ * Remove 0001-Medium-external-ec2-Mitigate-fence-race-bsc-1088656.patch
+
+---
Old:
0001-Medium-external-ec2-Mitigate-fence-race-bsc-1088656.patch
cluster-glue-1.0.12+v1.git.1523280117.43b22d15.tar.bz2
New:
cluster-glue-1.0.12+v1.git.1534346580.be86a9f2.tar.bz2
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.Zi9SI3/_old 2018-08-27 13:46:56.368345228 +0200
+++ /var/tmp/diff_new_pack.Zi9SI3/_new 2018-08-27 13:46:56.368345228 +0200
@@ -23,7 +23,7 @@
# Directory where we install documentation
%global glue_docdir %{_defaultdocdir}/%{name}
Name: cluster-glue
-Version:1.0.12+v1.git.1523280117.43b22d15
+Version:1.0.12+v1.git.1534346580.be86a9f2
Release:0
Summary:Reusable cluster components
License:GPL-2.0-only AND LGPL-2.1-or-later
@@ -39,8 +39,6 @@
# PATCH-FIX-UPSTREAM: fix warnings seen by GCC7
# PATCH-FIX-OPENSUSE: Port scripts to Python 3
Patch5: 0001-Port-scripts-to-Python-3.patch
-# PATCH-FIX-UPSTREAM: Medium: external/ec2: Mitigate fence race (bsc#1088656)
-Patch6: 0001-Medium-external-ec2-Mitigate-fence-race-bsc-1088656.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -108,7 +106,6 @@
%patch1 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
%build
export CFLAGS="${CFLAGS} %{optflags}"
++ _servicedata ++
--- /var/tmp/diff_new_pack.Zi9SI3/_old 2018-08-27 13:46:56.404345279 +0200
+++ /var/tmp/diff_new_pack.Zi9SI3/_new 2018-08-27 13:46:56.408345285 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/cluster-glue.git
- 6734e0d0f6c20e44f31ab3f6664569adb3109dfd
\ No newline at end of file
+ be86a9f22546e7d765b71ec0faebdabcc3a7c988
\ No newline at end of file
++ cluster-glue-1.0.12+v1.git.1523280117.43b22d15.tar.bz2 ->
cluster-glue-1.0.12+v1.git.1534346580.be86a9f2.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cluster-glue-1.0.12+v1.git.1523280117.43b22d15/lib/plugins/stonith/external/ec2
new/cluster-glue-1.0.12+v1.git.1534346580.be86a9f2/lib/plugins/stonith/external/ec2
---
old/cluster-glue-1.0.12+v1.git.1523280117.43b22d15/lib/plugins/stonith/external/ec2
2018-04-09 15:21:57.0 +0200
+++
new/cluster-glue-1.0.12+v1.git.1534346580.be86a9f2/lib/plugins/stonith/external/ec2
2018-08-15 17:23:00.0 +0200
@@ -170,6 +170,33 @@
exit 0;
}
+function is_instance_running()
+{
+ local myinstance
+ local mystatus
+
+ # get my instance id
+ myinstance="$(curl http://169.254.169.254/latest/meta-data/instance-id)"
+
+ # check my status.
+ # When the EC2 instance be stopped by the "aws ec2 stop-instances" ,
the stop processing of the OS is executed.
+ # While the OS stop processing, Pacemaker can execute the STONITH
processing.
+ # So, If my status is not "running", it determined that I was already
fenced. And to prevent fencing each other
+ # in split-brain, I don't fence other node.
+ if [ -z "$myinstance" ]; then
+ ha_log.sh err "Failed to get Instance ID. Unable to check
instance status."
+ return 1
+ fi
+
+ mystatus="$(instance_status $myinstance)"
+
+ if [ "$mystatus" != "running" ]; then #do not fence
+ ha_log.sh warn "Already fenced (Instance status = $mystatus).
Aborting fence attempt."
+ return 1
+ fi
+ return 0
+}
+
function instance_for_port()
{
local port=$1
@@ -312,24 +339,6 @@
;;
esac
-# get my instance id
-myinstance=`curl http://169.254.169.254/latest/meta-data/instance-id`
-
-# check my status.
-# When the EC2 instance be stopped by the "aws ec2 stop-instances" , the stop
processing of the OS is executed.
-# While the OS stop
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2018-04-17 11:08:35
Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old)
and /work/SRC/openSUSE:Factory/.cluster-glue.new (New)
Package is "cluster-glue"
Tue Apr 17 11:08:35 2018 rev:65 rq:595783
version:1.0.12+v1.git.1523280117.43b22d15
Changes:
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes
2018-02-25 12:16:21.144613115 +0100
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2018-04-17 11:08:38.647364784 +0200
@@ -1,0 +2,8 @@
+Wed Apr 11 20:13:03 UTC 2018 - kgronl...@suse.com
+
+- Update to version 1.0.12+v1.git.1523280117.43b22d15:
+ * High: external/ec2: Avoid unicode errors and improve performance
(bsc#1088656)
+- Medium: external/ec2: Mitigate fence race (bsc#1088656)
+ * Add 0001-Medium-external-ec2-Mitigate-fence-race-bsc-1088656.patch
+
+---
Old:
cluster-glue-1.0.12+v1.git.1511436818.71ae59fa.tar.bz2
New:
0001-Medium-external-ec2-Mitigate-fence-race-bsc-1088656.patch
cluster-glue-1.0.12+v1.git.1523280117.43b22d15.tar.bz2
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.diF3kw/_old 2018-04-17 11:08:39.207338676 +0200
+++ /var/tmp/diff_new_pack.diF3kw/_new 2018-04-17 11:08:39.211338490 +0200
@@ -23,10 +23,10 @@
# Directory where we install documentation
%global glue_docdir %{_defaultdocdir}/%{name}
Name: cluster-glue
-Version:1.0.12+v1.git.1511436818.71ae59fa
+Version:1.0.12+v1.git.1523280117.43b22d15
Release:0
Summary:Reusable cluster components
-License:GPL-2.0 AND LGPL-2.1+
+License:GPL-2.0-only AND LGPL-2.1-or-later
Group: Productivity/Clustering/HA
Url:https://github.com/ClusterLabs/cluster-glue.git
Source: %{name}-%{version}.tar.bz2
@@ -39,6 +39,9 @@
# PATCH-FIX-UPSTREAM: fix warnings seen by GCC7
# PATCH-FIX-OPENSUSE: Port scripts to Python 3
Patch5: 0001-Port-scripts-to-Python-3.patch
+# PATCH-FIX-UPSTREAM: Medium: external/ec2: Mitigate fence race (bsc#1088656)
+Patch6: 0001-Medium-external-ec2-Mitigate-fence-race-bsc-1088656.patch
+
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
@@ -105,6 +108,7 @@
%patch1 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
export CFLAGS="${CFLAGS} %{optflags}"
++ 0001-Medium-external-ec2-Mitigate-fence-race-bsc-1088656.patch ++
>From 76138dfb642cae548f2aa48c0a9caaa16509b319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?=
Date: Wed, 11 Apr 2018 10:19:00 +0200
Subject: [PATCH] Medium: external/ec2: Mitigate fence race (bsc#1088656)
Minimize risk of fence race by performing instance status check
after instance_for_port lookup.
---
lib/plugins/stonith/external/ec2 | 47 +---
1 file changed, 29 insertions(+), 18 deletions(-)
diff --git a/lib/plugins/stonith/external/ec2 b/lib/plugins/stonith/external/ec2
index 7ff4b512..8e6798a1 100755
--- a/lib/plugins/stonith/external/ec2
+++ b/lib/plugins/stonith/external/ec2
@@ -170,6 +170,33 @@ EOF
exit 0;
}
+function is_instance_running()
+{
+ local myinstance
+ local mystatus
+
+ # get my instance id
+ myinstance="$(curl http://169.254.169.254/latest/meta-data/instance-id)"
+
+ # check my status.
+ # When the EC2 instance be stopped by the "aws ec2 stop-instances" ,
the stop processing of the OS is executed.
+ # While the OS stop processing, Pacemaker can execute the STONITH
processing.
+ # So, If my status is not "running", it determined that I was already
fenced. And to prevent fencing each other
+ # in split-brain, I don't fence other node.
+ if [ -z "$myinstance" ]; then
+ ha_log.sh err "Failed to get Instance ID. Unable to check
instance status."
+ return 1
+ fi
+
+ mystatus="$(instance_status $myinstance)"
+
+ if [ "$mystatus" != "running" ]; then #do not fence
+ ha_log.sh warn "Already fenced (Instance status = $mystatus).
Aborting fence attempt."
+ return 1
+ fi
+ return 0
+}
+
function instance_for_port()
{
local port=$1
@@ -312,24 +339,6 @@ case $action in
;;
esac
-# get my instance id
-myinstance=`curl http://169.254.169.254/latest/meta-data/instance-id`
-
-# check my status.
-# When the EC2 instance be stopped by the "aws ec2 stop-instances" , the stop
processing of the OS is executed.
-# While the OS stop processing, Pacemaker can execute the STONITH
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2018-02-25 12:16:14
Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old)
and /work/SRC/openSUSE:Factory/.cluster-glue.new (New)
Package is "cluster-glue"
Sun Feb 25 12:16:14 2018 rev:64 rq:579245
version:1.0.12+v1.git.1511436818.71ae59fa
Changes:
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes
2018-02-05 10:49:16.306807732 +0100
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2018-02-25 12:16:21.144613115 +0100
@@ -1,0 +2,5 @@
+Fri Feb 23 04:28:37 UTC 2018 - y...@suse.com
+
+- Build: Ship cibsecret by pacemaker instead of cluster-glue (bsc#1082456)
+
+---
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.G0ffx0/_old 2018-02-25 12:16:23.788517201 +0100
+++ /var/tmp/diff_new_pack.G0ffx0/_new 2018-02-25 12:16:23.792517056 +0100
@@ -172,7 +172,6 @@
%{_datadir}/%{name}/ha_log.sh
%{_sbindir}/ha_logger
%{_sbindir}/hb_report
-%{_sbindir}/cibsecret
%{_sbindir}/meatclient
%{_sbindir}/stonith
%{_unitdir}/logd.service
++ cluster-glue_droplrm.patch ++
--- /var/tmp/diff_new_pack.G0ffx0/_old 2018-02-25 12:16:23.928512122 +0100
+++ /var/tmp/diff_new_pack.G0ffx0/_new 2018-02-25 12:16:23.928512122 +0100
@@ -23,13 +23,13 @@
diff -r 54ec848c439e lrm/admin/Makefile.am
--- a/lrm/admin/Makefile.amFri Feb 01 11:54:20 2013 +0100
+++ b/lrm/admin/Makefile.amFri Feb 01 13:15:55 2013 +0100
-@@ -23,18 +23,4 @@ INCLUDES=
-I$(top_builddir)/include
+@@ -23,18 +23,3 @@ INCLUDES=
-I$(top_builddir)/include
halibdir = $(libdir)/@HB_PKG@
COMMONLIBS=
$(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB)
-LRM_DIR = lrm
-sbin_PROGRAMS = lrmadmin
- sbin_SCRIPTS = cibsecret
+-sbin_SCRIPTS = cibsecret
-lrmadmin_SOURCES = lrmadmin.c
-lrmadmin_LDFLAGS = $(COMMONLIBS)
-lrmadmin_LDADD = $(top_builddir)/lib/$(LRM_DIR)/liblrm.la
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2018-02-05 10:49:15
Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old)
and /work/SRC/openSUSE:Factory/.cluster-glue.new (New)
Package is "cluster-glue"
Mon Feb 5 10:49:15 2018 rev:63 rq:572098
version:1.0.12+v1.git.1511436818.71ae59fa
Changes:
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes
2017-12-23 12:18:47.513615084 +0100
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2018-02-05 10:49:16.306807732 +0100
@@ -1,0 +2,26 @@
+Fri Feb 2 16:36:00 UTC 2018 - y...@suse.com
+
+- spec: Still use 90 as the consistent gid for the group "haclient" among the
cluster
+
+---
+Thu Feb 1 23:05:06 UTC 2018 - jeng...@inai.de
+
+- Stop building static archives only to remove them later.
+
+---
+Thu Jan 18 14:28:44 UTC 2018 - tchva...@suse.com
+
+- Switch to pkgconfig dependencies
+- Drop asciidoc from deps, even tho configure.ac checks for it
+ the mans are generated by docbook
+
+---
+Thu Jan 18 14:11:22 UTC 2018 - tchva...@suse.com
+
+- Format with spec-cleaner
+- Remove old distributions as we build only on SLE12+ (sle11/sle10)
+- Always disable fatal warnings, it only turns on -Werror which is
+ pointless for distro builds and just could break with gcc updates
+- Use the user creation oneliner like other packages
+
+---
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.2KZTFY/_old 2018-02-05 10:49:16.930778521 +0100
+++ /var/tmp/diff_new_pack.2KZTFY/_new 2018-02-05 10:49:16.930778521 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cluster-glue
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,31 +16,18 @@
#
-%global glue_release 1
-
+%define gid 90
%define uid 90
%define gname haclient
%define uname hacluster
-%if 0%{?sles_version} == 11
-# these three architectures have a problem with glib2
-%ifarch ppc ppc64 ia64
-%define warnings_fatal no
-%else
-%define warnings_fatal yes
-%endif
-%else
-# Enable warnings for Factory
-%define warnings_fatal yes
-%endif
# Directory where we install documentation
%global glue_docdir %{_defaultdocdir}/%{name}
-
Name: cluster-glue
-Summary:Reusable cluster components
-License:GPL-2.0 and LGPL-2.1+
-Group: Productivity/Clustering/HA
Version:1.0.12+v1.git.1511436818.71ae59fa
Release:0
+Summary:Reusable cluster components
+License:GPL-2.0 AND LGPL-2.1+
+Group: Productivity/Clustering/HA
Url:https://github.com/ClusterLabs/cluster-glue.git
Source: %{name}-%{version}.tar.bz2
Source2:baselibs.conf
@@ -52,56 +39,36 @@
# PATCH-FIX-UPSTREAM: fix warnings seen by GCC7
# PATCH-FIX-OPENSUSE: Port scripts to Python 3
Patch5: 0001-Port-scripts-to-Python-3.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: OpenIPMI-devel
-BuildRequires: asciidoc
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
BuildRequires: docbook_4
BuildRequires: e2fsprogs-devel
-BuildRequires: glib2-devel
BuildRequires: help2man
BuildRequires: libaio-devel
-BuildRequires: libbz2-devel
BuildRequires: libtool
-BuildRequires: libxml2-devel
BuildRequires: libxslt
BuildRequires: net-snmp-devel
BuildRequires: pkgconfig
-%if 0%{?suse_version} > 1130
-PreReq: sysvinit(network) sysvinit(syslog)
-%endif
-
-Requires(pre): %fillup_prereq
-
-%if 0%{?suse_version} > 1230
BuildRequires: systemd-rpm-macros
-%{?systemd_requires}
-%endif
-Conflicts: pacemaker < 1.1.8
-Conflicts: heartbeat-common < 3.0.2
-Obsoletes: heartbeat-common < 3.0.2
+BuildRequires: pkgconfig(OpenIPMI)
+BuildRequires: pkgconfig(bzip2)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(libcurl)
+BuildRequires: pkgconfig(libxml-2.0)
Requires: perl-TimeDate
Requires: sudo
+Requires(pre): shadow
# The following is necessary since sbd is dropped from
# cluster-glue itself:
Recommends: sbd
-Requires(pre):/usr/sbin/groupadd /usr/bin/getent /usr/sbin/useradd
+Conflicts: heartbeat-common < 3.0.2
+Conflicts: pacemaker < 1.1.8
+Obsoletes: heartbeat-common <
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2017-12-23 12:18:45
Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old)
and /work/SRC/openSUSE:Factory/.cluster-glue.new (New)
Package is "cluster-glue"
Sat Dec 23 12:18:45 2017 rev:62 rq:558247
version:1.0.12+v1.git.1511436818.71ae59fa
Changes:
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes
2017-11-30 12:39:06.395628693 +0100
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2017-12-23 12:18:47.513615084 +0100
@@ -1,0 +2,8 @@
+Mon Dec 18 19:38:49 UTC 2017 - kgronl...@suse.com
+
+- Fix Python 3 compatibility in these agents (bsc#1073376):
+ * external/ibmrsa-telnet
+ * external/dracmc-telnet
+ * external/riloe
+
+---
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.nEVZ1H/_old 2017-12-23 12:18:48.197581734 +0100
+++ /var/tmp/diff_new_pack.nEVZ1H/_new 2017-12-23 12:18:48.201581539 +0100
@@ -69,7 +69,6 @@
BuildRequires: libxslt
BuildRequires: net-snmp-devel
BuildRequires: pkgconfig
-BuildRequires: python3-devel
%if 0%{?suse_version} > 1130
PreReq: sysvinit(network) sysvinit(syslog)
%endif
@@ -147,6 +146,7 @@
export PYTHON
./autogen.sh
find . -type f -exec perl -pi -e 'BEGIN{undef $/};s[^#\!/usr/bin/env
perl][#\!%{_bindir}/perl]' {} \;
+find . -type f -exec perl -pi -e 'BEGIN{undef
$/};s[^#\!/usr/bin/python3][#\!%{_bindir}/python3]' {} \;
# SLES <= 10 does not support ./configure --docdir=,
# hence, use this ugly hack
%if 0%{?suse_version} < 1020
@@ -270,7 +270,6 @@
%exclude %{_libdir}/stonith/plugins/stonith2/ssh.so
%exclude %{_libdir}/stonith/plugins/external/ssh
%{_libdir}/stonith/plugins/stonith2/*.so
-%{_libdir}/stonith/plugins/stonith2/*.py
%{_libdir}/stonith/plugins/xen0-ha-dom0-stonith-helper
%files -n libglue2
++ 0001-Port-scripts-to-Python-3.patch ++
1051 lines (skipped)
between
/work/SRC/openSUSE:Factory/cluster-glue/0001-Port-scripts-to-Python-3.patch
and
/work/SRC/openSUSE:Factory/.cluster-glue.new/0001-Port-scripts-to-Python-3.patch
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2017-11-30 12:39:06
Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old)
and /work/SRC/openSUSE:Factory/.cluster-glue.new (New)
Package is "cluster-glue"
Thu Nov 30 12:39:06 2017 rev:61 rq:546436
version:1.0.12+v1.git.1511436818.71ae59fa
Changes:
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes
2017-08-24 18:19:26.355962836 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2017-11-30 12:39:06.395628693 +0100
@@ -1,0 +2,13 @@
+Wed Nov 29 13:45:21 UTC 2017 - kgronl...@suse.com
+
+- Port scripts to Python 3
+ * Add 0001-Port-scripts-to-Python-3.patch
+
+---
+Thu Nov 23 11:34:53 UTC 2017 - kgronl...@suse.com
+
+- Update to version 1.0.12+v1.git.1511436818.71ae59fa:
+ * Fix: stonith:external/ec2: Enforce en_US.UTF-8 locale when invoking aws
client (bsc#1059171)
+ * Drop libnet dependency (bsc#1069596)
+
+---
Old:
cluster-glue-1.0.12+v1.git.1501749673.bdd95fd0.tar.bz2
New:
0001-Port-scripts-to-Python-3.patch
cluster-glue-1.0.12+v1.git.1511436818.71ae59fa.tar.bz2
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.YgdPJ2/_old 2017-11-30 12:39:07.123602223 +0100
+++ /var/tmp/diff_new_pack.YgdPJ2/_new 2017-11-30 12:39:07.123602223 +0100
@@ -39,7 +39,7 @@
Summary:Reusable cluster components
License:GPL-2.0 and LGPL-2.1+
Group: Productivity/Clustering/HA
-Version:1.0.12+v1.git.1501749673.bdd95fd0
+Version:1.0.12+v1.git.1511436818.71ae59fa
Release:0
Url:https://github.com/ClusterLabs/cluster-glue.git
Source: %{name}-%{version}.tar.bz2
@@ -50,6 +50,8 @@
# PATCH-FIX-OPENSUSE: drop lrm as it's not used anymore by pacemaker
Patch4: cluster-glue_droplrm.patch
# PATCH-FIX-UPSTREAM: fix warnings seen by GCC7
+# PATCH-FIX-OPENSUSE: Port scripts to Python 3
+Patch5: 0001-Port-scripts-to-Python-3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: asciidoc
@@ -67,12 +69,9 @@
BuildRequires: libxslt
BuildRequires: net-snmp-devel
BuildRequires: pkgconfig
-BuildRequires: python-devel
+BuildRequires: python3-devel
%if 0%{?suse_version} > 1130
-BuildRequires: libnet-devel
PreReq: sysvinit(network) sysvinit(syslog)
-%else
-BuildRequires: libnet
%endif
Requires(pre): %fillup_prereq
@@ -139,17 +138,22 @@
%setup -q
%patch1 -p1
%patch4 -p1
+%patch5 -p1
%build
CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
export CFLAGS
+PYTHON="%{_bindir}/python3"
+export PYTHON
./autogen.sh
+find . -type f -exec perl -pi -e 'BEGIN{undef $/};s[^#\!/usr/bin/env
perl][#\!%{_bindir}/perl]' {} \;
# SLES <= 10 does not support ./configure --docdir=,
# hence, use this ugly hack
%if 0%{?suse_version} < 1020
export docdir=%{glue_docdir}
%configure \
--enable-ipmilan=no \
+ --enable-libnet=no \
--enable-fatal-warnings=%{warnings_fatal} \
--with-package-name=%{name} \
--with-daemon-group=%{gname} \
@@ -157,6 +161,7 @@
%else
%configure \
--enable-ipmilan=no \
+ --enable-libnet=no \
--enable-fatal-warnings=%{warnings_fatal} \
--with-package-name=%{name} \
--with-daemon-group=%{gname} \
++ 0001-Port-scripts-to-Python-3.patch ++
>From 6780d699034825d7cee5331c6d593b8645348401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?=
Date: Wed, 29 Nov 2017 14:44:22 +0100
Subject: [PATCH] Port scripts to Python 3
---
lib/plugins/stonith/external/dracmc-telnet | 10 +-
lib/plugins/stonith/external/ibmrsa-telnet | 8
lib/plugins/stonith/external/riloe | 22 +++---
lib/plugins/stonith/ribcl.py.in| 20 ++--
4 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/lib/plugins/stonith/external/dracmc-telnet
b/lib/plugins/stonith/external/dracmc-telnet
index 78c01453..0156dcda 100644
--- a/lib/plugins/stonith/external/dracmc-telnet
+++ b/lib/plugins/stonith/external/dracmc-telnet
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# vim: set filetype=python
###
#
@@ -74,7 +74,7 @@ class DracMC(telnetlib.Telnet):
def _get_timestamp(self):
ct = time.time()
-msecs = (ct - long(ct)) * 1000
+msecs = (ct - int(ct)) * 1000
return "%s,%03d" % (time.strftime("%Y-%m-%d %H:%M:%S",
time.localtime(ct)), msecs)
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2017-08-24 18:19:23
Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old)
and /work/SRC/openSUSE:Factory/.cluster-glue.new (New)
Package is "cluster-glue"
Thu Aug 24 18:19:23 2017 rev:60 rq:518394
version:1.0.12+v1.git.1501749673.bdd95fd0
Changes:
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes
2017-05-27 13:09:30.978566581 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2017-08-24 18:19:26.355962836 +0200
@@ -1,0 +2,9 @@
+Wed Aug 23 09:57:53 UTC 2017 - y...@suse.com
+
+- Update to version 1.0.12+v1.git.1501749673.bdd95fd0:
+ * stonith: external/vcenter: Reset returns success with RESETPOWERON=0 if vm
is already off (bsc#1050908)
+ * Remove hb_report from doc/
+ * Fix warnings reported by GCC7. (bsc#1030241)
+** Drop 0001-Fix-warnings-reported-by-GCC7.patch which has been merged
upstream
+
+---
Old:
0001-Fix-warnings-reported-by-GCC7.patch
cluster-glue-1.0.12+v1.git.1485976882.03d61cd.tar.bz2
New:
cluster-glue-1.0.12+v1.git.1501749673.bdd95fd0.tar.bz2
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.60oM0B/_old 2017-08-24 18:19:27.471805722 +0200
+++ /var/tmp/diff_new_pack.60oM0B/_new 2017-08-24 18:19:27.487803470 +0200
@@ -39,7 +39,7 @@
Summary:Reusable cluster components
License:GPL-2.0 and LGPL-2.1+
Group: Productivity/Clustering/HA
-Version:1.0.12+v1.git.1485976882.03d61cd
+Version:1.0.12+v1.git.1501749673.bdd95fd0
Release:0
Url:https://github.com/ClusterLabs/cluster-glue.git
Source: %{name}-%{version}.tar.bz2
@@ -50,7 +50,6 @@
# PATCH-FIX-OPENSUSE: drop lrm as it's not used anymore by pacemaker
Patch4: cluster-glue_droplrm.patch
# PATCH-FIX-UPSTREAM: fix warnings seen by GCC7
-Patch5: 0001-Fix-warnings-reported-by-GCC7.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: asciidoc
@@ -140,7 +139,6 @@
%setup -q
%patch1 -p1
%patch4 -p1
-%patch5 -p1
%build
CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
++ _servicedata ++
--- /var/tmp/diff_new_pack.60oM0B/_old 2017-08-24 18:19:27.587789392 +0200
+++ /var/tmp/diff_new_pack.60oM0B/_new 2017-08-24 18:19:27.591788829 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/cluster-glue.git
- 03d61cd161214dc9f8057f3d17f7c5e8e8eba5a8
\ No newline at end of file
+ bdd95fd0f89f31b19fa46ffa0ea3f5022ebcd858
++ cluster-glue-1.0.12+v1.git.1485976882.03d61cd.tar.bz2 ->
cluster-glue-1.0.12+v1.git.1501749673.bdd95fd0.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cluster-glue-1.0.12+v1.git.1485976882.03d61cd/.hgignore
new/cluster-glue-1.0.12+v1.git.1501749673.bdd95fd0/.hgignore
--- old/cluster-glue-1.0.12+v1.git.1485976882.03d61cd/.hgignore 1970-01-01
01:00:00.0 +0100
+++ new/cluster-glue-1.0.12+v1.git.1501749673.bdd95fd0/.hgignore
2017-08-03 10:41:13.0 +0200
@@ -0,0 +1,92 @@
+syntax: glob
+
+# Autofoo entries
+*.o
+*.la
+*.lo
+*.loT
+*.pyc
+.libs
+.deps
+*.cache
+.cvsignore
+compile
+configure
+configure.status
+configure.lineno
+depcomp
+aclocal.m4
+libtool
+ltmain.sh
+ltconfig
+libltdl
+mkinstalldirs
+install-sh
+missing
+py-compile
+autom4te*
+libtool.m4
+ltdl.m4
+libltdl.tar
+autoconf
+autoheader
+automake
+include/glue_config.h
+include/stamp-h1
+include/pils/plugin.h
+include/stamp-h2
+ylwrap
+
+# BEAM Entries
+*.beam
+parser-messages
+MISC_ERRORS
+cscope.files
+cscope.out
+patches
+updates
+logs
+
+# OS and Editor Artifacts
+.DS_Store
+*.diff
+*.patch
+*~
+
+# Project build targets
+lib/clplumbing/base64_md5_test
+lib/clplumbing/ipctest
+lib/clplumbing/ipctransientclient
+lib/clplumbing/ipctransientserver
+logd/ha_logd
+logd/ha_logger
+logd/logtest
+lrm/admin/lrmadmin
+lrm/lrmd/lrmd
+lrm/test/apitest
+lrm/test/callbacktest
+lrm/test/plugintest
+lrm/test/lrmregtest
+lrm/test/lrmregtest-heartbeat
+lrm/test/lrmregtest-lsb
+lrm/test/regression.sh
+lrm/test/LRMBasicSanityCheck
+lrm/test/simple_ops
+
+# Misc
+GPATH
+GRTAGS
+GSYMS
+GTAGS
+HTML
+TAGS
+.gres.*
+*.orig
+.gdb_history
+
+# Entries better done as regexp's to avoid matching too broadly
+syntax: regexp
+^config\.*
+README$
+Makefile$
+Makefile.in$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cluster-glue-1.0.12+v1.git.1485976882.03d61cd/.hgsigs
new/cluster-glue-1.0.12+v1.git.1501749673.bdd95fd0/.hgsigs
---
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2017-05-27 13:08:19
Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old)
and /work/SRC/openSUSE:Factory/.cluster-glue.new (New)
Package is "cluster-glue"
Sat May 27 13:08:19 2017 rev:59 rq:496041
version:1.0.12+v1.git.1485976882.03d61cd
Changes:
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes
2017-05-10 20:33:22.783933474 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2017-05-27 13:09:30.978566581 +0200
@@ -1,0 +2,10 @@
+Thu May 18 13:44:39 UTC 2017 - mli...@suse.cz
+
+- Remove openhpi support as the packages is going to be removed.
+
+---
+Thu May 18 12:51:46 UTC 2017 - mli...@suse.cz
+
+- Add 0001-Fix-warnings-reported-by-GCC7.patch to fix bnc#1030241.
+
+---
New:
0001-Fix-warnings-reported-by-GCC7.patch
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.k4Z2Xa/_old 2017-05-27 13:09:32.522348315 +0200
+++ /var/tmp/diff_new_pack.k4Z2Xa/_new 2017-05-27 13:09:32.526347749 +0200
@@ -49,6 +49,8 @@
Patch1: bug-694243_cluster-glue_symbol-conflict.patch
# PATCH-FIX-OPENSUSE: drop lrm as it's not used anymore by pacemaker
Patch4: cluster-glue_droplrm.patch
+# PATCH-FIX-UPSTREAM: fix warnings seen by GCC7
+Patch5: 0001-Fix-warnings-reported-by-GCC7.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: asciidoc
@@ -65,7 +67,6 @@
BuildRequires: libxml2-devel
BuildRequires: libxslt
BuildRequires: net-snmp-devel
-BuildRequires: openhpi-devel
BuildRequires: pkgconfig
BuildRequires: python-devel
%if 0%{?suse_version} > 1130
@@ -123,16 +124,6 @@
A collection of libraries that are useful for writing cluster managers
such as Pacemaker.
-%package -n stonith-bladehpi
-Summary:Stonith agent for IBM bladecenter
-Group: Productivity/Clustering/HA
-
-%description -n stonith-bladehpi
-This STONITH module talks to IBM BladeCenters via SNMP through
-use of the OpenHPI BladeCenter plugin (snmp_bc). For more information
-about installing OpenHPI, setting up the BladeCenter SNMP agent, etc.
-please visit http://www.openhpi.org/.
-
%package -n libglue-devel
Summary:Headers and libraries for writing cluster managers
Group: Development/Libraries/C and C++
@@ -149,6 +140,7 @@
%setup -q
%patch1 -p1
%patch4 -p1
+%patch5 -p1
%build
CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
@@ -274,7 +266,6 @@
%exclude %{_libdir}/stonith/plugins/stonith2/null.so
%exclude %{_libdir}/stonith/plugins/stonith2/ssh.so
%exclude %{_libdir}/stonith/plugins/external/ssh
-%exclude %{_libdir}/stonith/plugins/stonith2/bladehpi.so
%{_libdir}/stonith/plugins/stonith2/*.so
%{_libdir}/stonith/plugins/stonith2/*.py
%{_libdir}/stonith/plugins/xen0-ha-dom0-stonith-helper
@@ -285,12 +276,6 @@
%doc AUTHORS
%doc COPYING.LIB
-%files -n stonith-bladehpi
-%defattr(-,root,root)
-%{_libdir}/stonith/plugins/stonith2/bladehpi.so
-%doc AUTHORS
-%doc COPYING.LIB
-
%files -n libglue-devel
%defattr(-,root,root)
%dir %{_libdir}/heartbeat
++ 0001-Fix-warnings-reported-by-GCC7.patch ++
>From 460d572591e1d2263125f5f3ffe0e2b67d942c2e Mon Sep 17 00:00:00 2001
From: marxin
Date: Wed, 22 Mar 2017 12:55:40 +0100
Subject: [PATCH] Fix warnings reported by GCC7.
---
lib/clplumbing/cl_pidfile.c | 2 +-
lib/stonith/st_ttylock.c| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/clplumbing/cl_pidfile.c b/lib/clplumbing/cl_pidfile.c
index 5284261a..1a9af172 100644
--- a/lib/clplumbing/cl_pidfile.c
+++ b/lib/clplumbing/cl_pidfile.c
@@ -71,7 +71,7 @@
/* This is what the FHS standard specifies for the size of our lock file */
-#defineLOCKSTRLEN 11
+#defineLOCKSTRLEN 12
#include
int IsRunning(long pid)
{
diff --git a/lib/stonith/st_ttylock.c b/lib/stonith/st_ttylock.c
index d6d0464c..4cb5b8a7 100644
--- a/lib/stonith/st_ttylock.c
+++ b/lib/stonith/st_ttylock.c
@@ -125,7 +125,7 @@ st_ttyunlock(const char *serial_device)
}
/* This is what the FHS standard specifies for the size of our lock file */
-#defineLOCKSTRLEN 11
+#defineLOCKSTRLEN 12
static int
DoLock(const char * prefix, const char *lockname)
--
2.12.0
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2017-05-10 20:33:21
Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old)
and /work/SRC/openSUSE:Factory/.cluster-glue.new (New)
Package is "cluster-glue"
Wed May 10 20:33:21 2017 rev:58 rq:493418
version:1.0.12+v1.git.1485976882.03d61cd
Changes:
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes
2017-02-16 16:41:58.364201256 +0100
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2017-05-10 20:33:22.783933474 +0200
@@ -1,0 +2,5 @@
+Wed May 3 16:26:51 CEST 2017 - ku...@suse.de
+
+- Require user and group nobody
+
+---
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.0jgbAL/_old 2017-05-10 20:33:23.915773787 +0200
+++ /var/tmp/diff_new_pack.0jgbAL/_new 2017-05-10 20:33:23.931771531 +0200
@@ -90,6 +90,10 @@
# cluster-glue itself:
Recommends: sbd
Requires(pre):/usr/sbin/groupadd /usr/bin/getent /usr/sbin/useradd
+%if 0%{?suse_version} >= 1330
+Requires(pre): user(nobody)
+Requires(pre): group(nobody)
+%endif
# SLES10 needs tcpd-devel but doesn't have libcurl
%if 0%{?suse_version} < 1020
BuildRequires: sgml-skel
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2017-02-16 16:41:57
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
2017-02-06 14:34:09.482408787 +0100
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2017-02-16 16:41:58.364201256 +0100
@@ -1,0 +2,5 @@
+Thu Feb 9 18:15:33 UTC 2017 - dims...@opensuse.org
+
+- Explicitly package %{_docdir}/%{name} to fix build with RPM 4.13.
+
+---
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.bcI1I4/_old 2017-02-16 16:41:58.764144457 +0100
+++ /var/tmp/diff_new_pack.bcI1I4/_new 2017-02-16 16:41:58.768143889 +0100
@@ -227,6 +227,7 @@
%files
%defattr(-,root,root)
+%{_defaultdocdir}/%{name}/
%dir %{_libdir}/heartbeat
%dir %{_var}/lib/heartbeat
%dir %{_var}/lib/heartbeat/cores
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2017-02-06 14:34:08
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
2016-11-05 21:23:46.0 +0100
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2017-02-06 14:34:09.482408787 +0100
@@ -1,0 +2,7 @@
+Wed Feb 01 19:21:42 UTC 2017 - kgronl...@suse.com
+
+- Update to version 1.0.12+v1.git.1485976882.03d61cd:
+ * Low: ipc: fix poll function parameter type
+ * Medium: hb_report: invoke crm to create a report
+
+---
Old:
cluster-glue-1.0.12+v1.git.1478088779.afaeeb2.tar.bz2
New:
cluster-glue-1.0.12+v1.git.1485976882.03d61cd.tar.bz2
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.rgfRic/_old 2017-02-06 14:34:10.150312311 +0100
+++ /var/tmp/diff_new_pack.rgfRic/_new 2017-02-06 14:34:10.154311734 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cluster-glue
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -39,7 +39,7 @@
Summary:Reusable cluster components
License:GPL-2.0 and LGPL-2.1+
Group: Productivity/Clustering/HA
-Version:1.0.12+v1.git.1478088779.afaeeb2
+Version:1.0.12+v1.git.1485976882.03d61cd
Release:0
Url:https://github.com/ClusterLabs/cluster-glue.git
Source: %{name}-%{version}.tar.bz2
@@ -142,10 +142,11 @@
such as Pacemaker.
%prep
-%autosetup -p1
+%setup -q
+%patch1 -p1
+%patch4 -p1
%build
-cp %{S:3} ./hb_report/hb_report.in
CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
export CFLAGS
./autogen.sh
@@ -181,6 +182,7 @@
find $RPM_BUILD_ROOT -name '*.la' -type f -print0 | xargs -0 rm -f
find $RPM_BUILD_ROOT -name '*.pyc' -type f -print0 | xargs -0 rm -f
find $RPM_BUILD_ROOT -name '*.pyo' -type f -print0 | xargs -0 rm -f
+install -D -m 755 %{S:3} %{buildroot}%{_sbindir}/hb_report
%if %{defined _unitdir}
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rclogd
%endif
++ _servicedata ++
--- /var/tmp/diff_new_pack.rgfRic/_old 2017-02-06 14:34:10.234300180 +0100
+++ /var/tmp/diff_new_pack.rgfRic/_new 2017-02-06 14:34:10.234300180 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/cluster-glue.git
- afaeeb2f3e2a576c8a50ee3ce98e83e4da635c76
\ No newline at end of file
+ 03d61cd161214dc9f8057f3d17f7c5e8e8eba5a8
\ No newline at end of file
++ cluster-glue-1.0.12+v1.git.1478088779.afaeeb2.tar.bz2 ->
cluster-glue-1.0.12+v1.git.1485976882.03d61cd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cluster-glue-1.0.12+v1.git.1478088779.afaeeb2/configure.ac
new/cluster-glue-1.0.12+v1.git.1485976882.03d61cd/configure.ac
--- old/cluster-glue-1.0.12+v1.git.1478088779.afaeeb2/configure.ac
2016-11-02 13:12:59.0 +0100
+++ new/cluster-glue-1.0.12+v1.git.1485976882.03d61cd/configure.ac
2017-02-01 20:21:22.0 +0100
@@ -1396,7 +1396,6 @@
logd/logd.service \
replace/Makefile \
hb_report/Makefile \
- hb_report/hb_report \
doc/Makefile \
doc/ha_logd.xml \
doc/ha_logger.xml \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cluster-glue-1.0.12+v1.git.1478088779.afaeeb2/hb_report/Makefile.am
new/cluster-glue-1.0.12+v1.git.1485976882.03d61cd/hb_report/Makefile.am
--- old/cluster-glue-1.0.12+v1.git.1478088779.afaeeb2/hb_report/Makefile.am
2016-11-02 13:12:59.0 +0100
+++ new/cluster-glue-1.0.12+v1.git.1485976882.03d61cd/hb_report/Makefile.am
2017-02-01 20:21:22.0 +0100
@@ -21,5 +21,4 @@
hanoarchdir= $(datadir)/$(PACKAGE_NAME)
hanoarch_DATA = utillib.sh ha_cf_support.sh openais_conf_support.sh
-sbin_SCRIPTS = hb_report
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cluster-glue-1.0.12+v1.git.1478088779.afaeeb2/hb_report/hb_report.in
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2016-11-05 21:23:45
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
2016-10-22 13:02:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2016-11-05 21:23:46.0 +0100
@@ -1,0 +2,9 @@
+Wed Nov 02 21:09:00 UTC 2016 - kgronl...@suse.com
+
+- Update to version 1.0.12+v1.git.1478088779.afaeeb2:
+ * Low: stonith: Convert gethostbyname() usage to getaddrinfo()
+ * Low: apcmastersnmp: Convert gethostbyname() usage to getaddrinfo()
+ * Low: ipmilan_command: Convert gethostbyname() to getaddrinfo()
+ * Low: wti_mpc: Convert gethostbyname() usage to getaddrinfo()
+
+---
Old:
cluster-glue-1.0.12+v1.git.1476869614.524e5d0.tar.bz2
New:
cluster-glue-1.0.12+v1.git.1478088779.afaeeb2.tar.bz2
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.c72QFd/_old 2016-11-05 21:23:47.0 +0100
+++ /var/tmp/diff_new_pack.c72QFd/_new 2016-11-05 21:23:47.0 +0100
@@ -39,7 +39,7 @@
Summary:Reusable cluster components
License:GPL-2.0 and LGPL-2.1+
Group: Productivity/Clustering/HA
-Version:1.0.12+v1.git.1476869614.524e5d0
+Version:1.0.12+v1.git.1478088779.afaeeb2
Release:0
Url:https://github.com/ClusterLabs/cluster-glue.git
Source: %{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.c72QFd/_old 2016-11-05 21:23:47.0 +0100
+++ /var/tmp/diff_new_pack.c72QFd/_new 2016-11-05 21:23:47.0 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/cluster-glue.git
- 524e5d01c1866269c7563b498a1827c10bb2bba0
\ No newline at end of file
+ afaeeb2f3e2a576c8a50ee3ce98e83e4da635c76
\ No newline at end of file
++ cluster-glue-1.0.12+v1.git.1476869614.524e5d0.tar.bz2 ->
cluster-glue-1.0.12+v1.git.1478088779.afaeeb2.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cluster-glue-1.0.12+v1.git.1476869614.524e5d0/AUTHORS
new/cluster-glue-1.0.12+v1.git.1478088779.afaeeb2/AUTHORS
--- old/cluster-glue-1.0.12+v1.git.1476869614.524e5d0/AUTHORS 2016-10-19
11:33:34.0 +0200
+++ new/cluster-glue-1.0.12+v1.git.1478088779.afaeeb2/AUTHORS 2016-11-02
13:12:59.0 +0100
@@ -1,19 +1,69 @@
+abrugger <>
Alan Robertson
+Alessandro Federico
+Alex Tsariounov
Andreas Mock
Andrew Beekhof
+Ante Karamatic
+Bernd Schubert
+Borislav Borisov
+Darren Mansell
Dave Blaschke
David Lee
Dejan Muhamedagic
+Denis Chapligin
+Florian Haas
+Frederik Schüler
+Gao,Yan
+Goldwyn Rodrigues
+Guochun Shi
Hannes Eder
+Helmut Weymann
+Hideo Yamauchi
+Holger Teutsch
Huang Zhen
+Jean Raby
+Jochen Roeder
Junko Ikeda
-Lars Marowsky-Bree
+Kacper Kowalik
+Kazuhiko Higashi
+Kazuhiko Higashi
+Kazunori INOUE
+Keisuke MORI
+kevin <>
+Kristoffer Grönlund
+Lars Ellenberg
+Lars Marowsky-Brée
+lclaudio <>
Martin Bene
+Martin Gerhard Loschwitz
+Michael Prokop <>
+Matt Soffen
+Nhan Ngo Dinh
+panjiam <>
+Pádraig Brady
Phil Carns
+ram <>
+Raoul Bhatia
+RaSca
+Ruediger Oertel
Satomi Taniguchi
Sean Reifschneider
Sebastian Reitenbach
+Senko Rasic
Serge Dubrouski
Simon Horman
+Sun Jiang Dong
+Takatoshi MATSUO
+Tim Serong
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2016-10-22 13:02:43
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
2016-05-31 12:09:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2016-10-22 13:02:44.0 +0200
@@ -1,0 +2,23 @@
+Thu Oct 20 07:25:34 UTC 2016 - kgronl...@suse.com
+
+- Update to version 1.0.12+v1.git.1476869614.524e5d0:
+ * Adjust version to correct sorting
+
+---
+Tue Oct 18 10:08:31 UTC 2016 - kgronl...@suse.com
+
+- Update to version 1.0.12+git.1476707642.08bec62:
+ * low: cl_plumbing: Fix incorrect negations
+
+- Drop merged patches:
+ * Remove cluster-glue-gcc5.patch
+ * Remove remove-unused-constants.patch
+
+---
+Tue Oct 11 07:54:38 UTC 2016 - kgronl...@suse.com
+
+- Update to version 1.0.12+git.1476172419.3e86358:
+ * Upstream is now github.com/ClusterLabs/cluster-glue.git
+ * stonith: describe -E option
+
+---
Old:
cluster-glue-1.0.12+hg2818.tar.bz2
cluster-glue-gcc5.patch
remove-unused-constants.patch
New:
_servicedata
cluster-glue-1.0.12+v1.git.1476869614.524e5d0.tar.bz2
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.ttzg0o/_old 2016-10-22 13:02:45.0 +0200
+++ /var/tmp/diff_new_pack.ttzg0o/_new 2016-10-22 13:02:45.0 +0200
@@ -39,9 +39,9 @@
Summary:Reusable cluster components
License:GPL-2.0 and LGPL-2.1+
Group: Productivity/Clustering/HA
-Version:1.0.12+hg2818
+Version:1.0.12+v1.git.1476869614.524e5d0
Release:0
-Url:http://www.linux-ha.org/wiki/Cluster_Glue
+Url:https://github.com/ClusterLabs/cluster-glue.git
Source: %{name}-%{version}.tar.bz2
Source2:baselibs.conf
Source3:hb_report.in
@@ -49,10 +49,6 @@
Patch1: bug-694243_cluster-glue_symbol-conflict.patch
# PATCH-FIX-OPENSUSE: drop lrm as it's not used anymore by pacemaker
Patch4: cluster-glue_droplrm.patch
-# PATCH-FIX-OPENSUSE: fix build with GCC 59
-Patch6: cluster-glue-gcc5.patch
-# PATCH-FIX-OPENSUSE: fix build with GCC 6
-Patch7: remove-unused-constants.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: asciidoc
++ _service ++
--- /var/tmp/diff_new_pack.ttzg0o/_old 2016-10-22 13:02:45.0 +0200
+++ /var/tmp/diff_new_pack.ttzg0o/_new 2016-10-22 13:02:45.0 +0200
@@ -1,10 +1,11 @@
-http://hg.linux-ha.org/glue
-hg
+git://github.com/ClusterLabs/cluster-glue.git
+git
cluster-glue
-1.0.12+hg{rev}
-tip
+1.0.12+v1.git.%ct.%h
+master
+enable
++ _servicedata ++
git://github.com/ClusterLabs/cluster-glue.git
524e5d01c1866269c7563b498a1827c10bb2bba0
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2016-05-31 12:09:08
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
2016-02-11 12:33:11.0 +0100
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2016-05-31 12:09:09.0 +0200
@@ -1,0 +2,9 @@
+Mon May 23 19:14:33 UTC 2016 - kgronl...@suse.com
+
+- Update to 1.0.12+hg2818
+ + Fix addresses of FSF, point to gnu.org/licenses instead
+
+- Fix build with GCC 6
+ + Add remove-unused-constants.patch
+
+---
Old:
cluster-glue-1.0.12+hg2816.tar.bz2
New:
cluster-glue-1.0.12+hg2818.tar.bz2
remove-unused-constants.patch
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.TppV2Z/_old 2016-05-31 12:09:10.0 +0200
+++ /var/tmp/diff_new_pack.TppV2Z/_new 2016-05-31 12:09:10.0 +0200
@@ -39,7 +39,7 @@
Summary:Reusable cluster components
License:GPL-2.0 and LGPL-2.1+
Group: Productivity/Clustering/HA
-Version:1.0.12+hg2816
+Version:1.0.12+hg2818
Release:0
Url:http://www.linux-ha.org/wiki/Cluster_Glue
Source: %{name}-%{version}.tar.bz2
@@ -51,6 +51,8 @@
Patch4: cluster-glue_droplrm.patch
# PATCH-FIX-OPENSUSE: fix build with GCC 59
Patch6: cluster-glue-gcc5.patch
+# PATCH-FIX-OPENSUSE: fix build with GCC 6
+Patch7: remove-unused-constants.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: asciidoc
@@ -144,12 +146,7 @@
such as Pacemaker.
%prep
-###
-%setup -q
-%patch1 -p1
-%patch4 -p1
-%patch6 -p1
-###
+%autosetup -p1
%build
cp %{S:3} ./hb_report/hb_report.in
@@ -180,10 +177,8 @@
--docdir=%{glue_docdir}
%endif
make %{?_smp_mflags}
-###
%install
-###
make DESTDIR=$RPM_BUILD_ROOT install
# Dont package static libs or compiled python
find $RPM_BUILD_ROOT -name '*.a' -type f -print0 | xargs -0 rm -f
@@ -194,8 +189,6 @@
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rclogd
%endif
-###
-
%pre
if
getent group %{gname} >/dev/null
@@ -235,7 +228,6 @@
/sbin/ldconfig
%files
-###
%defattr(-,root,root)
%dir %{_libdir}/heartbeat
%dir %{_var}/lib/heartbeat
++ cluster-glue-1.0.12+hg2816.tar.bz2 -> cluster-glue-1.0.12+hg2818.tar.bz2
++
3173 lines of diff (skipped)
++ remove-unused-constants.patch ++
diff --git a/logd/ha_logd.c b/logd/ha_logd.c
--- a/logd/ha_logd.c
+++ b/logd/ha_logd.c
@@ -75,9 +75,6 @@
#define EOS '\0'
#definenullchk(a) ((a) ? (a) : "")
-static const int logd_keepalive_ms = 1000;
-static const int logd_warntime_ms = 5000;
-static const int logd_deadtime_ms = 1;
static gboolean verbose = FALSE;
static pid_t write_process_pid;
static IPC_Channel *chanspair[2];
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2016-02-11 12:33:09
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
2015-10-24 18:56:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2016-02-11 12:33:11.0 +0100
@@ -1,0 +2,7 @@
+Thu Feb 4 15:25:43 UTC 2016 - kgronl...@suse.com
+
+- Update to 1.0.12+hg2816
+ + Medium: stonith: external/libvirt: fix handling of hosts with uppercase
letters in names
+- upstream cs: 56f40ec5d37e
+
+---
Old:
cluster-glue-1.0.12+hg2815.tar.bz2
New:
cluster-glue-1.0.12+hg2816.tar.bz2
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.ILlU9O/_old 2016-02-11 12:33:12.0 +0100
+++ /var/tmp/diff_new_pack.ILlU9O/_new 2016-02-11 12:33:12.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cluster-glue
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -39,8 +39,8 @@
Summary:Reusable cluster components
License:GPL-2.0 and LGPL-2.1+
Group: Productivity/Clustering/HA
-Version:1.0.12+hg2815
-Release:%{?glue_release}
+Version:1.0.12+hg2816
+Release:0
Url:http://www.linux-ha.org/wiki/Cluster_Glue
Source: %{name}-%{version}.tar.bz2
Source2:baselibs.conf
++ cluster-glue-1.0.12+hg2815.tar.bz2 -> cluster-glue-1.0.12+hg2816.tar.bz2
++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cluster-glue-1.0.12+hg2815/lib/plugins/stonith/external/libvirt
new/cluster-glue-1.0.12+hg2816/lib/plugins/stonith/external/libvirt
--- old/cluster-glue-1.0.12+hg2815/lib/plugins/stonith/external/libvirt
2015-10-16 18:23:46.0 +0200
+++ new/cluster-glue-1.0.12+hg2816/lib/plugins/stonith/external/libvirt
2016-02-04 16:24:15.0 +0100
@@ -136,14 +136,15 @@
{
for h in $hostlist
do
-case $h in
+h_comp=`echo $h | tr A-Z a-z`
+case $h_comp in
$1:*)
domain_id=`expr $h : '.*:\(.*\)'`
return
;;
$1)
-domain_id=$1
+domain_id=$h
return
esac
done
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2015-10-24 18:56:02
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
2015-10-03 20:30:03.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2015-10-24 18:56:18.0 +0200
@@ -1,0 +2,16 @@
+Fri Oct 16 16:03:59 UTC 2015 - kgronl...@suse.com
+
+- Update to 1.0.12+hg2815
+ + Medium: stonith: external/ec2: use target's uname as default for port
(bsc#947026)
+- Replace hb_report with script which calls crm report (bsc#950182)
(bsc#950483)
+- Remove 0006-ec2-instance-tag-bsc-947026.patch
+- Remove 0001-high-hb_report-Collect-logs-from-journald-boo-900654.patch
+- Remove 0002-high-hb_report-Prefer-pacemaker.log-if-it-exists-bsc.patch
+- Remove 0003-high-hb_report-Always-prefer-syslog-if-available-bsc.patch
+- Remove 0004-low-hb_report-increase-time-to-wait-for-the-logmark.patch
+- Remove 0005-low-hb_report-collect-libqb-version-bsc-943327.patch
+- Remove bnc662816_cluster-glue_hb_report_abspath.patch
+- Move libglue-devel to group Development/Libraries/C and C++
+- Upstream cs: a10cd7cc13f5
+
+---
Old:
0001-high-hb_report-Collect-logs-from-journald-boo-900654.patch
0002-high-hb_report-Prefer-pacemaker.log-if-it-exists-bsc.patch
0003-high-hb_report-Always-prefer-syslog-if-available-bsc.patch
0004-low-hb_report-increase-time-to-wait-for-the-logmark.patch
0005-low-hb_report-collect-libqb-version-bsc-943327.patch
0006-ec2-instance-tag-bsc-947026.patch
bnc662816_cluster-glue_hb_report_abspath.patch
cluster-glue.tar.bz2
New:
_service
cluster-glue-1.0.12+hg2815.tar.bz2
hb_report.in
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.d4Wf28/_old 2015-10-24 18:56:19.0 +0200
+++ /var/tmp/diff_new_pack.d4Wf28/_new 2015-10-24 18:56:19.0 +0200
@@ -39,31 +39,18 @@
Summary:Reusable cluster components
License:GPL-2.0 and LGPL-2.1+
Group: Productivity/Clustering/HA
-Version:1.0.12
+Version:1.0.12+hg2815
Release:%{?glue_release}
Url:http://www.linux-ha.org/wiki/Cluster_Glue
-Source: cluster-glue.tar.bz2
+Source: %{name}-%{version}.tar.bz2
Source2:baselibs.conf
+Source3:hb_report.in
# PATCH-FIX-OPENSUSE: load libplumb symbols manually (thanks to lge)
(bnc#694243)
Patch1: bug-694243_cluster-glue_symbol-conflict.patch
-# PATCH-FIX-OPENSUSE: use absolute path when invoking slaves (bnc#662816)
-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: 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
+# PATCH-FIX-OPENSUSE: fix build with GCC 59
Patch6: cluster-glue-gcc5.patch
-# PATCH-FIX-OPENSUSE: high: hb_report: Prefer pacemaker.log if it exists
(bsc#941681)
-Patch7: 0002-high-hb_report-Prefer-pacemaker.log-if-it-exists-bsc.patch
-# PATCH-FIX-OPENSUSE: high: hb_report: Always prefer syslog if available
(bsc#942906)
-Patch8: 0003-high-hb_report-Always-prefer-syslog-if-available-bsc.patch
-# PATCH-FIX-OPENSUSE: low: hb_report: Increase time to wait for the logmark
-Patch9: 0004-low-hb_report-increase-time-to-wait-for-the-logmark.patch
-# PATCH-FIX-OPENSUSE: low: hb_report: Collect libqb version (bsc#943327)
-Patch10:0005-low-hb_report-collect-libqb-version-bsc-943327.patch
-# PATCH-FIX-UPSTREAM: Dev: stonith: external/ec2: Be able to omit the "port"
option. (bsc#947026) (fate#319008)
-Patch11:0006-ec2-instance-tag-bsc-947026.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: asciidoc
@@ -134,14 +121,6 @@
A collection of libraries that are useful for writing cluster managers
such as Pacemaker.
-# %package -n stonith-snmp
-# Summary:Stonith agents based on SNMP
-# Group: Productivity/Clustering/HA
-
-# %description -n stonith-snmp
-# All stonith plugins which require libnetsnmp (apcmastersnmp and
-# wti_mpc).
-
%package -n stonith-bladehpi
Summary:Stonith agent for IBM bladecenter
Group: Productivity/Clustering/HA
@@ -154,7 +133,7 @@
%package -n libglue-devel
Summary:Headers and
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2015-10-03 20:30:01
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
2015-08-29 20:03:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2015-10-03 20:30:03.0 +0200
@@ -1,0 +2,6 @@
+Fri Sep 25 09:49:28 UTC 2015 - kgronl...@suse.com
+
+- Dev: stonith: external/ec2: Be able to omit the "port" option. (bsc#947026)
(fate#319008)
+- Add 0006-ec2-instance-tag-bsc-947026.patch
+
+---
New:
0006-ec2-instance-tag-bsc-947026.patch
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.TlMyAY/_old 2015-10-03 20:30:04.0 +0200
+++ /var/tmp/diff_new_pack.TlMyAY/_new 2015-10-03 20:30:04.0 +0200
@@ -62,6 +62,8 @@
Patch9: 0004-low-hb_report-increase-time-to-wait-for-the-logmark.patch
# PATCH-FIX-OPENSUSE: low: hb_report: Collect libqb version (bsc#943327)
Patch10:0005-low-hb_report-collect-libqb-version-bsc-943327.patch
+# PATCH-FIX-UPSTREAM: Dev: stonith: external/ec2: Be able to omit the "port"
option. (bsc#947026) (fate#319008)
+Patch11:0006-ec2-instance-tag-bsc-947026.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: asciidoc
@@ -174,6 +176,7 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
###
%build
++ 0006-ec2-instance-tag-bsc-947026.patch ++
# HG changeset patch
# User Kazuhiko Higashi
# Date 1443417289 -32400
# Node ID 70c1608dd39535465b9f04147081436bcc59f611
# Parent 9da0680bc9c0b99eba65b40aac9282a8dd28889a
Dev: stonith: external/ec2: Be able to omit the "port" option.
It changed the following points.
- the "tag" and the "port" options will be "not" required.
- if the "port" option is not set, the 2nd argument of ec2 will use as the
"port".
- the 2nd argument of ec2 is "node to fence".
- the "stat" and "status" action will be same the "monitor" action.
(for do not use the "port" parameter in "stat" action.)
By this modifications, If it is described uname in the Name tag,
the setting of the "tag" and "port" parameters are no longer necessary.
diff -r 9da0680bc9c0 -r 70c1608dd395 lib/plugins/stonith/external/ec2
--- a/lib/plugins/stonith/external/ec2 Wed Mar 11 13:24:25 2015 +0100
+++ b/lib/plugins/stonith/external/ec2 Mon Sep 28 14:14:49 2015 +0900
@@ -47,7 +47,6 @@
###
quiet=0
-port_default=""
instance_not_found=0
unknown_are_stopped=0
@@ -57,10 +56,9 @@
sleep_time="1"
-ec2_tag=${tag}
+[ -n "$tag" ] && ec2_tag="$tag"
: ${ec2_tag=${ec2_tag_default}}
-: ${port=${port_default}}
function usage()
{
@@ -94,7 +92,7 @@
{
cat <
-
+
The name/id/tag of a instance to
control/check
@@ -102,7 +100,7 @@
Use a specific profile from your
credential file.
-
+
Name of the tag containing the instances
uname
@@ -129,7 +127,7 @@
Fencing Action
-
+
The name/id/tag of a instance to
control/check
@@ -139,7 +137,7 @@
Use a specific profile from your
credential file.
-
+
Name of the tag containing the instances
uname
@@ -219,6 +217,11 @@
return $rc
}
+function monitor()
+{
+ # Is the device ok?
+ aws ec2 describe-instances $options | grep INSTANCES &>
/dev/null
+}
TEMP=`getopt -o qVho:e:p:n:t:U --long
version,help,action:,port:,option:,profile:,tag:,quiet,unknown-are-stopped \
-n 'fence_ec2' -- "$@"`
@@ -265,6 +268,7 @@
done
[ -n "$1" ] && action=$1
+[ -n "$2" ] && node_to_fence=$2
if [ -z "$ec2_profile"]; then
options="--output text --profile default"
@@ -324,6 +328,10 @@
exit 1
fi
+if [ -z "$port" ]; then
+ port="$node_to_fence"
+fi
+
# get target's instance id
instance=""
if [ ! -z "$port" ]; then
@@ -376,8 +384,7 @@
done
;;
monitor)
- # Is the device ok?
- aws ec2 describe-instances $options | grep INSTANCES &>
/dev/null
+ monitor
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2015-08-29 20:03:54
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
2015-08-17 17:25:39.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2015-08-29 20:03:55.0 +0200
@@ -1,0 +2,10 @@
+Wed Aug 26 22:30:12 UTC 2015 - kgronl...@suse.com
+
+- high: hb_report: Always prefer syslog if available (bsc#942906)
+- low: hb_report: Increase time to wait for the logmark
+- low: hb_report: Collect libqb version (bsc#943327)
+- Add 0003-high-hb_report-Always-prefer-syslog-if-available-bsc.patch
+- Add 0004-low-hb_report-increase-time-to-wait-for-the-logmark.patch
+- Add 0005-low-hb_report-collect-libqb-version-bsc-943327.patch
+
+---
New:
0003-high-hb_report-Always-prefer-syslog-if-available-bsc.patch
0004-low-hb_report-increase-time-to-wait-for-the-logmark.patch
0005-low-hb_report-collect-libqb-version-bsc-943327.patch
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.yXvVoP/_old 2015-08-29 20:03:56.0 +0200
+++ /var/tmp/diff_new_pack.yXvVoP/_new 2015-08-29 20:03:56.0 +0200
@@ -56,6 +56,12 @@
Patch6: cluster-glue-gcc5.patch
# PATCH-FIX-OPENSUSE: high: hb_report: Prefer pacemaker.log if it exists
(bsc#941681)
Patch7: 0002-high-hb_report-Prefer-pacemaker.log-if-it-exists-bsc.patch
+# PATCH-FIX-OPENSUSE: high: hb_report: Always prefer syslog if available
(bsc#942906)
+Patch8: 0003-high-hb_report-Always-prefer-syslog-if-available-bsc.patch
+# PATCH-FIX-OPENSUSE: low: hb_report: Increase time to wait for the logmark
+Patch9: 0004-low-hb_report-increase-time-to-wait-for-the-logmark.patch
+# PATCH-FIX-OPENSUSE: low: hb_report: Collect libqb version (bsc#943327)
+Patch10:0005-low-hb_report-collect-libqb-version-bsc-943327.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: asciidoc
@@ -165,6 +171,9 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
###
%build
++ 0003-high-hb_report-Always-prefer-syslog-if-available-bsc.patch ++
commit 395dad096f401deeec3bca80c3f9db7a38128a53
Author: Kristoffer Grönlund k...@koru.se
Date: Tue Aug 25 14:47:15 2015 +0200
high: hb_report: Always prefer syslog if available (bsc#942906)
diff --git a/hb_report/hb_report.in b/hb_report/hb_report.in
index 07ab23c..b228665 100755
--- a/hb_report/hb_report.in
+++ b/hb_report/hb_report.in
@@ -295,10 +295,6 @@ logmark() {
#
findlog() {
local logf=
- if [ -f $PCMK_LOG ]; then
- echo $PCMK_LOG
- return
- fi
if [ $HA_LOGFACILITY ]; then
logf=`findmsg $UNIQUE_MSG | awk '{print $1}'`
@@ -308,13 +304,16 @@ findlog() {
return
fi
-
- collect_journal $FROM_TIME $TO_TIME $WORKDIR/$JOURNAL_F
if [ -f $WORKDIR/$JOURNAL_F ]; then
echo $WORKDIR/$JOURNAL_F
return
fi
+ if [ -f $PCMK_LOG ]; then
+ echo $PCMK_LOG
+ return
+ fi
+
echo ${HA_DEBUGFILE:-$HA_LOGFILE}
[ ${HA_DEBUGFILE:-$HA_LOGFILE} ]
debug will try with ${HA_DEBUGFILE:-$HA_LOGFILE}
@@ -1051,6 +1050,9 @@ getlog() {
local outf
outf=$WORKDIR/$HALOG_F
+ # collect journal from systemd
+ collect_journal $FROM_TIME $TO_TIME $WORKDIR/$JOURNAL_F
+
if [ $HA_LOG ]; then # log provided by the user?
[ -f $HA_LOG ] || { # not present
is_collector || # warning if not on slave
diff --git a/hb_report/utillib.sh b/hb_report/utillib.sh
index 1f16967..ff54df8 100644
--- a/hb_report/utillib.sh
+++ b/hb_report/utillib.sh
@@ -118,22 +118,14 @@ findmsg() {
mark=$1
log=
- if [ -f /var/log/pacemaker.log ]; then
- log=`grep -l -e $mark /var/log/pacemaker.log`
- if [ ! $log ]; then
- log=`grep -l -e $mark /var/log/pacemaker.log*`
break
- fi
- fi
+ for d in $syslogdirs; do
+ [ -d $d ] || continue
+ log=`grep -l -e $mark $d/$favourites` break
+ test $log break
+ log=`grep -l -e $mark $d/*` break
+ test $log break
+ done 2/dev/null
- if [ ! $log ]; then
-
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2015-08-17 17:25: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
2015-05-20 23:23:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2015-08-17 17:25:39.0 +0200
@@ -1,0 +2,6 @@
+Fri Aug 14 11:34:28 UTC 2015 - kgronl...@suse.com
+
+- high: hb_report: Prefer pacemaker.log if it exists (bsc#941681)
+- Add 0002-high-hb_report-Prefer-pacemaker.log-if-it-exists-bsc.patch
+
+---
New:
0002-high-hb_report-Prefer-pacemaker.log-if-it-exists-bsc.patch
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.2eMiQX/_old 2015-08-17 17:25:40.0 +0200
+++ /var/tmp/diff_new_pack.2eMiQX/_new 2015-08-17 17:25:40.0 +0200
@@ -54,6 +54,8 @@
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
+# PATCH-FIX-OPENSUSE: high: hb_report: Prefer pacemaker.log if it exists
(bsc#941681)
+Patch7: 0002-high-hb_report-Prefer-pacemaker.log-if-it-exists-bsc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: asciidoc
@@ -162,6 +164,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
###
%build
++ 0002-high-hb_report-Prefer-pacemaker.log-if-it-exists-bsc.patch ++
From 35faa72ad8a5269fe60960574bcea114b57c9a78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= k...@koru.se
Date: Fri, 14 Aug 2015 13:33:20 +0200
Subject: [PATCH 2/2] high: hb_report: Prefer pacemaker.log if it exists
(bsc#941681)
---
hb_report/hb_report.in | 34 +++---
hb_report/utillib.sh | 24 +---
2 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/hb_report/hb_report.in b/hb_report/hb_report.in
index df94f39..6c7b074 100755
--- a/hb_report/hb_report.in
+++ b/hb_report/hb_report.in
@@ -164,7 +164,8 @@ setvarsanddefaults() {
# logs to collect in addition
# NB: they all have to be in syslog format
#
- EXTRA_LOGS=/var/log/messages
+ EXTRA_LOGS=/var/log/messages /var/log/pacemaker.log
+ PCMK_LOG=/var/log/pacemaker.log
# used only by the master
NO_SSH=
SSH_USER=
@@ -308,19 +309,29 @@ logmark() {
#
findlog() {
local logf=
- collect_journal $FROM_TIME $TO_TIME $WORKDIR/$JOURNAL_F
+ if [ -f $PCMK_LOG ]; then
+ echo $PCMK_LOG
+ return
+ fi
+
if [ $HA_LOGFACILITY ]; then
logf=`findmsg $UNIQUE_MSG | awk '{print $1}'`
fi
if [ -f $logf ]; then
echo $logf
- elif [ -f $WORKDIR/$JOURNAL_F ]; then
+ return
+ fi
+
+
+ collect_journal $FROM_TIME $TO_TIME $WORKDIR/$JOURNAL_F
+ if [ -f $WORKDIR/$JOURNAL_F ]; then
echo $WORKDIR/$JOURNAL_F
- else
- echo ${HA_DEBUGFILE:-$HA_LOGFILE}
- [ ${HA_DEBUGFILE:-$HA_LOGFILE} ]
- debug will try with ${HA_DEBUGFILE:-$HA_LOGFILE}
+ return
fi
+
+ echo ${HA_DEBUGFILE:-$HA_LOGFILE}
+ [ ${HA_DEBUGFILE:-$HA_LOGFILE} ]
+ debug will try with ${HA_DEBUGFILE:-$HA_LOGFILE}
}
#
@@ -537,12 +548,12 @@ USER_NODES=$USER_NODES
NODES=$NODES
MASTER_NODE=$MASTER_NODE
HA_LOG=$HA_LOG
-MASTER_IS_HOSTLOG=$MASTER_IS_HOSTLOG
UNIQUE_MSG=$UNIQUE_MSG
SANITIZE=$SANITIZE
DO_SANITIZE=$DO_SANITIZE
SKIP_LVL=$SKIP_LVL
EXTRA_LOGS=$EXTRA_LOGS
+PCMK_LOG=$PCMK_LOG
USER_CLUSTER_TYPE=$USER_CLUSTER_TYPE
CONF=$CONF
B_CONF=$B_CONF
@@ -1055,7 +1066,6 @@ pickcompress() {
}
# get the right part of the log
getlog() {
- local cnt
local outf
outf=$WORKDIR/$HALOG_F
@@ -1068,8 +1078,6 @@ getlog() {
fi
if [ $HA_LOG = ]; then
HA_LOG=`findlog`
- [ $HA_LOG ]
- cnt=`fgrep -c $UNIQUE_MSG $HA_LOG`
fi
if [ $HA_LOG = -o ! -f $HA_LOG ]; then
if [ $CTS ]; then
@@ -1079,10 +1087,6 @@ getlog() {
fi
return
fi
- if [ $cnt ] [ $cnt -gt 1 -a $cnt -eq $NODECNT ]; then
- MASTER_IS_HOSTLOG=1
- info found the central log!
- fi
if [ $NO_str2time ]; then
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2015-05-20 23:23:08
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
2015-03-01 14:49:39.0 +0100
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2015-05-20 23:23:09.0 +0200
@@ -1,0 +2,12 @@
+Mon May 11 08:24:10 UTC 2015 - kgronl...@suse.com
+
+- Low: stonith: external/ec2: update name in the short description
+- High: stonith: external/ec2: new agent for aws/ec2
+- Medium: hb_report: use faster zypper interface if available
+- Medium: stonith: external/vcenter: replace experimental smartmatch
(bnc#900353)
+- Medium: ha_logd: prevent race caused by pid reuse (bsc#894272)
+- fix syslogmsgfmt logging inconsistency for stderr/stdout
+- Medium: clplumbing: don't abort on bad input
+- upstream cs: 9da0680bc9c0
+
+---
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.OlkHGK/_old 2015-05-20 23:23:09.0 +0200
+++ /var/tmp/diff_new_pack.OlkHGK/_new 2015-05-20 23:23:09.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package cluster-glue
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++ 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-10-31 15:43:17.0 +0100
+++ new/cluster-glue/.hg_archival.txt 2015-03-11 13:24:25.0 +0100
@@ -1,5 +1,6 @@
repo: e3ffdd7ae81c596b2be7e1e110d2c1255161340e
-node: 6be50bc2ce61d9ac64e591c97609cace06ce3045
+node: 9da0680bc9c0b99eba65b40aac9282a8dd28889a
branch: default
latesttag: glue-1.0.12
-latesttagdistance: 5
+latesttagdistance: 13
+changessincelatesttag: 13
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-10-31 15:43:17.0
+0100
+++ new/cluster-glue/hb_report/hb_report.in 2015-03-11 13:24:25.0
+0100
@@ -67,7 +67,7 @@
usage() {
catEOF
-usage: hb_report -f {time|cts:testnum} [-t time]
+usage: $PROG -f {time|cts:testnum} [-t time]
[-u user] [-X ssh-options] [-l file] [-n nodes] [-E files]
[-p patt] [-L patt] [-e prog] [-MSDZAQVsvhd] [dest]
@@ -117,12 +117,12 @@
Examples
- hb_report -f 2pm report_1
- hb_report -f 2007/9/5 12:30 -t 2007/9/5 14:00 report_2
- hb_report -f 1:00 -t 3:00 -l /var/log/cluster/ha-debug report_3
- hb_report -f 09sep07 2:00 -u hbadmin report_4
- hb_report -f 18:00 -p usern.* -p admin.* report_5
- hb_report -f cts:133 ctstest_133
+ $PROG -f 2pm report_1
+ $PROG -f 2007/9/5 12:30 -t 2007/9/5 14:00 report_2
+ $PROG -f 1:00 -t 3:00 -l /var/log/cluster/ha-debug report_3
+ $PROG -f 09sep07 2:00 -u hbadmin report_4
+ $PROG -f 18:00 -p usern.* -p admin.* report_5
+ $PROG -f cts:133 ctstest_133
. WARNING . WARNING . WARNING . WARNING . WARNING . WARNING .
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-10-31 15:43:17.0
+0100
+++ new/cluster-glue/hb_report/utillib.sh 2015-03-11 13:24:25.0
+0100
@@ -387,6 +387,10 @@
local pkg
debug get debuginfo packages using zypper: $@
zypper -qn ref /dev/null
+ # use --ignore-unknown if available, much faster
+ # (2 is zypper exit code for syntax/usage)
+ zypper -qn --ignore-unknown install -C $@ /dev/null
+ [ $? -ne 2 ] return
for pkg in $@; do
zypper -qn install -C $pkg /dev/null
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cluster-glue/lib/plugins/stonith/external/Makefile.am
new/cluster-glue/lib/plugins/stonith/external/Makefile.am
--- old/cluster-glue/lib/plugins/stonith/external/Makefile.am 2014-10-31
15:43:17.0 +0100
+++
commit cluster-glue for openSUSE:Factory
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.0 +0100
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2015-03-01 14:49:39.0 +0100
@@ -1,0 +2,28 @@
+Tue Feb 24 09:36:37 UTC 2015 - rguent...@suse.com
+
+- 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 - co...@suse.com
+
+- 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 - dmuhameda...@suse.com
+
+- 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 led...@gmail.com
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.hiMttV/_new 2015-03-01 14:49:40.0 +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.0 +0100
+++ cluster-glue/lib/pils/pils.c2015-02-24 09:54:15.334311067 +0100
@@ -898,7 +898,7 @@ DelPILInterfaceType(PILInterfaceType*ift
gpointerkey, 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
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2014-11-24 11:15:46
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-10-11 22:41:54.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2014-11-24 11:15:48.0 +0100
@@ -1,0 +2,6 @@
+Wed Nov 19 23:08:51 UTC 2014 - dims...@opensuse.org
+
+- Replace systemd BuildRequires with pkgconfig(systemd): we do not
+ require the full installation / dep chain of systemd.
+
+---
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.hiccs2/_old 2014-11-24 11:15:49.0 +0100
+++ /var/tmp/diff_new_pack.hiccs2/_new 2014-11-24 11:15:49.0 +0100
@@ -81,7 +81,7 @@
Requires(pre): %fillup_prereq
%if %{defined systemd_requires}
-BuildRequires: systemd
+BuildRequires: pkgconfig(systemd)
%{?systemd_requires}
%endif
Conflicts: pacemaker 1.1.8
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2014-10-11 22:41:48
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-07-27 08:25:37.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2014-10-11 22:41:54.0 +0200
@@ -1,0 +2,6 @@
+Fri Oct 10 17:34:18 UTC 2014 - kgronl...@suse.com
+
+- high: hb_report: Collect logs from journald (boo#900654)
+- Add patch: 0001-high-hb_report-Collect-logs-from-journald-boo-900654.patch
+
+---
New:
0001-high-hb_report-Collect-logs-from-journald-boo-900654.patch
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.QWNgqc/_old 2014-10-11 22:41:55.0 +0200
+++ /var/tmp/diff_new_pack.QWNgqc/_new 2014-10-11 22:41:55.0 +0200
@@ -50,6 +50,8 @@
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: high: hb_report: Collect logs from journald (boo#900654)
+Patch5: 0001-high-hb_report-Collect-logs-from-journald-boo-900654.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: asciidoc
@@ -156,6 +158,7 @@
%patch1 -p1
%patch2 -p1
%patch4 -p1
+%patch5 -p1
###
%build
++ 0001-high-hb_report-Collect-logs-from-journald-boo-900654.patch ++
From 2405e74cc62a511ec2017372b6df23e22b8d27e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= k...@koru.se
Date: Fri, 10 Oct 2014 17:46:10 +0200
Subject: [PATCH] high: hb_report: Collect logs from journald (boo#900654)
Uses journalctl to collect logs for the report period.
---
hb_report/hb_report.in | 29 -
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/hb_report/hb_report.in b/hb_report/hb_report.in
index 555fffa..167d075 100755
--- a/hb_report/hb_report.in
+++ b/hb_report/hb_report.in
@@ -305,11 +305,14 @@ logmark() {
#
findlog() {
local logf=
+ collect_journal $FROM_TIME $TO_TIME $WORKDIR/$JOURNAL_F
if [ $HA_LOGFACILITY ]; then
logf=`findmsg $UNIQUE_MSG | awk '{print $1}'`
fi
if [ -f $logf ]; then
echo $logf
+ elif [ -f $WORKDIR/$JOURNAL_F ]; then
+ echo $WORKDIR/$JOURNAL_F
else
echo ${HA_DEBUGFILE:-$HA_LOGFILE}
[ ${HA_DEBUGFILE:-$HA_LOGFILE} ]
@@ -1094,6 +1097,29 @@ getlog() {
fi
fi
}
+collect_journal() {
+ local from_time to_time outf
+ from_time=$1
+ to_time=$2
+ outf=$3
+ if which journalctl /dev/null 21; then
+ if isnumber $from_time [ $from_time -eq 0 ]; then
+ from_time=$(date +%Y-%m-%d %H:%M)
+ elif isnumber $from_time; then
+ from_time=$(echo $from_time | awk '{ print
strftime(%Y-%m-%d %H:%M, $1); }')
+ fi
+ if isnumber $to_time [ $to_time -eq 0 ]; then
+ to_time=$(date +%Y-%m-%d %H:%M)
+ elif isnumber $to_time; then
+ to_time=$(echo $to_time | awk '{ print
strftime(%Y-%m-%d %H:%M, $1); }')
+ fi
+ if [ -f $outf ]; then
+ warning $outf already exists
+ fi
+ debug journalctl from: '$1' until: '$2' from_time '$from_time'
to_time: '$to_time' $outf
+ journalctl --since $from_time --until $to_time --no-pager |
tail -n +2 $outf
+ fi
+}
#
# get all other info (config, stats, etc)
#
@@ -1314,12 +1340,13 @@ fi
ANALYSIS_F=analysis.txt
DESCRIPTION_F=description.txt
HALOG_F=ha-log.txt
+JOURNAL_F=journal.log
BT_F=backtraces.txt
SYSINFO_F=sysinfo.txt
SYSSTATS_F=sysstats.txt
DLM_DUMP_F=dlm_dump.txt
TIME_F=time.txt
-export ANALYSIS_F DESCRIPTION_F HALOG_F BT_F SYSINFO_F SYSSTATS_F DLM_DUMP_F
TIME_F
+export ANALYSIS_F DESCRIPTION_F HALOG_F JOURNAL_F BT_F SYSINFO_F SYSSTATS_F
DLM_DUMP_F TIME_F
CRM_MON_F=crm_mon.txt
MEMBERSHIP_F=members.txt
HB_UUID_F=hb_uuid.txt
--
1.8.4.5
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2014-07-27 08:25:36
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-07-10 08:16:49.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2014-07-27 08:25:37.0 +0200
@@ -1,0 +2,12 @@
+Thu Jul 17 14:53:25 UTC 2014 - dmuhameda...@suse.com
+
+- hb_report: add -Q to usage
+- upstream cs: ec7802482c73
+
+---
+Wed Jul 9 15:02:38 UTC 2014 - dmuhameda...@suse.com
+
+- hb_report: add -Q option for quick runs
+- upstream cs: 51d0ebbb2868
+
+---
Other differences:
--
++ 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-02 11:10:32.0 +0200
+++ new/cluster-glue/.hg_archival.txt 2014-07-14 17:49:05.0 +0200
@@ -1,5 +1,5 @@
repo: e3ffdd7ae81c596b2be7e1e110d2c1255161340e
-node: 0abe35bebf5fd26c1efcd2bb8f796e697c8492fd
+node: ec7802482c733072db57b46d4304f27040f81bcd
branch: default
latesttag: glue-1.0.12-rc1
-latesttagdistance: 23
+latesttagdistance: 27
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/doc/hb_report.8.txt
new/cluster-glue/doc/hb_report.8.txt
--- old/cluster-glue/doc/hb_report.8.txt2014-07-02 11:10:32.0
+0200
+++ new/cluster-glue/doc/hb_report.8.txt2014-07-14 17:49:05.0
+0200
@@ -14,7 +14,8 @@
SYNOPSIS
*hb_report* -f {time|cts:testnum} [-t time] [-u user] [-l file]
- [-n nodes] [-E files] [-p patt] [-L patt] [-e prog] [-MSDCZAVsvhd]
[dest]
+ [-n nodes] [-E files] [-p patt] [-L patt] [-e prog]
+ [-MSDCZAQVsvhd] [dest]
DESCRIPTION
@@ -75,6 +76,14 @@
Additional patterns to match parameter name which contain
sensitive information. This option is additive (default: passw.*).
+*-Q*::
+ Quick run. Gathering some system information can be expensive.
+ With this option, such operations are skipped and thus
+ information collecting sped up. The operations considered
+ I/O or CPU intensive: verifying installed packages content,
+ sanitizing files for sensitive information, and producing dot
+ files from PE inputs.
+
*-A*::
This is an OpenAIS cluster. hb_report has some heuristics to
find the cluster stack, but that is not always reliable.
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-07-02 11:10:32.0
+0200
+++ new/cluster-glue/hb_report/hb_report.in 2014-07-14 17:49:05.0
+0200
@@ -69,7 +69,7 @@
catEOF
usage: hb_report -f {time|cts:testnum} [-t time]
[-u user] [-X ssh-options] [-l file] [-n nodes] [-E files]
- [-p patt] [-L patt] [-e prog] [-MSDZAVsvhd] [dest]
+ [-p patt] [-L patt] [-e prog] [-MSDZAQVsvhd] [dest]
-f time: time to start from or a CTS test number
-t time: time to finish at (dflt: now)
@@ -89,6 +89,7 @@
-L patt: regular expression to match in log files for analysis;
this option is additive (dflt: $LOG_PATTERNS)
-e prog: your favourite editor
+ -Q : don't run resource intensive operations (speed up)
-M : don't collect extra logs (/var/log/messages)
-D : don't invoke editor to write description
-Z : if destination directories exist, remove them instead of
exiting
@@ -170,8 +171,16 @@
TRY_SSH=root hacluster
SLAVEPIDS=
NO_DESCRIPTION=1
+ SKIP_LVL=0
VERBOSITY=0
}
+#
+# caller may skip collecting information if the skip level
+# exceeds the given value
+#
+skip_lvl() {
+ [ $SKIP_LVL -ge $1 ]
+}
chkname() {
[ $1 ] || usage short
echo $1 | grep -qs '[^a-zA-Z0-9@_+=:.-]'
@@ -529,6 +538,7 @@
UNIQUE_MSG=$UNIQUE_MSG
SANITIZE=$SANITIZE
DO_SANITIZE=$DO_SANITIZE
+SKIP_LVL=$SKIP_LVL
EXTRA_LOGS=$EXTRA_LOGS
USER_CLUSTER_TYPE=$USER_CLUSTER_TYPE
CONF=$CONF
@@ -674,7 +684,7 @@
}
if [ `echo $flist | wc -w` -le 20 ]; then
for f in $flist; do
- pe2dot $3/`basename $pe_dir`/`basename $f`
+
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2014-07-10 08:16: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-06-26 10:42:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2014-07-10 08:16:49.0 +0200
@@ -1,0 +2,12 @@
+Wed Jul 2 09:56:35 UTC 2014 - dmuhameda...@suse.com
+
+- hb_report: remove obsolete combine-logs.pl
+- upstream cs: 0abe35bebf5f
+
+---
+Wed Jun 25 14:37:40 UTC 2014 - kgronl...@suse.com
+
+- Medium: hb_report: dot is not illegal in file names (bnc#884079,
debian#715391)
+- upstream cs: 0f48479c251b
+
+---
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.5TRR2z/_old 2014-07-10 08:16:51.0 +0200
+++ /var/tmp/diff_new_pack.5TRR2z/_new 2014-07-10 08:16:51.0 +0200
@@ -261,7 +261,6 @@
%{_datadir}/%{name}/openais_conf_support.sh
%{_datadir}/%{name}/utillib.sh
%{_datadir}/%{name}/ha_log.sh
-%{_datadir}/%{name}/combine-logs.pl
%{_sbindir}/ha_logger
%{_sbindir}/hb_report
#%{_sbindir}/lrmadmin
++ 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-06-25 14:47:30.0 +0200
+++ new/cluster-glue/.hg_archival.txt 2014-07-02 11:10:32.0 +0200
@@ -1,5 +1,5 @@
repo: e3ffdd7ae81c596b2be7e1e110d2c1255161340e
-node: 0f48479c251beb5be75110e62c867970d71adc89
+node: 0abe35bebf5fd26c1efcd2bb8f796e697c8492fd
branch: default
latesttag: glue-1.0.12-rc1
-latesttagdistance: 22
+latesttagdistance: 23
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-06-25 14:47:30.0
+0200
+++ new/cluster-glue/cluster-glue-fedora.spec 2014-07-02 11:10:32.0
+0200
@@ -128,7 +128,6 @@
%{_datadir}/%{name}/ha_cf_support.sh
%{_datadir}/%{name}/openais_conf_support.sh
%{_datadir}/%{name}/utillib.sh
-%{_datadir}/%{name}/combine-logs.pl
%{_datadir}/%{name}/ha_log.sh
%{_sbindir}/ha_logger
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-06-25 14:47:30.0
+0200
+++ new/cluster-glue/cluster-glue-suse.spec 2014-07-02 11:10:32.0
+0200
@@ -230,7 +230,6 @@
%{_datadir}/%{name}/ha_cf_support.sh
%{_datadir}/%{name}/openais_conf_support.sh
%{_datadir}/%{name}/utillib.sh
-%{_datadir}/%{name}/combine-logs.pl
%{_datadir}/%{name}/ha_log.sh
%{_sbindir}/ha_logger
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/hb_report/Makefile.am
new/cluster-glue/hb_report/Makefile.am
--- old/cluster-glue/hb_report/Makefile.am 2014-06-25 14:47:30.0
+0200
+++ new/cluster-glue/hb_report/Makefile.am 2014-07-02 11:10:32.0
+0200
@@ -21,7 +21,6 @@
hanoarchdir= $(datadir)/$(PACKAGE_NAME)
-hanoarch_SCRIPTS = combine-logs.pl
hanoarch_DATA = utillib.sh ha_cf_support.sh openais_conf_support.sh
sbin_SCRIPTS = hb_report
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/hb_report/combine-logs.pl
new/cluster-glue/hb_report/combine-logs.pl
--- old/cluster-glue/hb_report/combine-logs.pl 2014-06-25 14:47:30.0
+0200
+++ new/cluster-glue/hb_report/combine-logs.pl 1970-01-01 01:00:00.0
+0100
@@ -1,136 +0,0 @@
-#!/usr/bin/perl
-#
-# combine-logs v1.0
-#
-# Copyright (c) 1999 Steven J. Madsen. All rights reserved.
-#
-# Combines multiple syslog-format logs into a single chronological log. Very
-# handy for syslog report generators such as cksyslog.
-#
-# usage: combine-logs log file [...]
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-#
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2014-06-26 10:42:40
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-06-18 07:47:46.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2014-06-26 10:42:48.0 +0200
@@ -1,0 +2,6 @@
+Wed Jun 25 14:37:40 UTC 2014 - kgronl...@suse.com
+
+- Medium: hb_report: dot is not illegal in file names (bnc#884079,
debian#715391)
+- upstream cs: 0f48479c251b
+
+---
Other differences:
--
++ 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-06-12 12:28:59.0 +0200
+++ new/cluster-glue/.hg_archival.txt 2014-06-25 14:47:30.0 +0200
@@ -1,5 +1,5 @@
repo: e3ffdd7ae81c596b2be7e1e110d2c1255161340e
-node: 45e21bc9795d70b86ecc3825b91ef6424db178d8
+node: 0f48479c251beb5be75110e62c867970d71adc89
branch: default
latesttag: glue-1.0.12-rc1
-latesttagdistance: 19
+latesttagdistance: 22
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-06-12 12:28:59.0
+0200
+++ new/cluster-glue/cluster-glue-fedora.spec 2014-06-25 14:47:30.0
+0200
@@ -60,6 +60,11 @@
BuildRequires: e2fsprogs-devel
%endif
+%if %{defined systemd_requires}
+BuildRequires: systemd
+%{?systemd_requires}
+%endif
+
%prep
%setup -q -n cluster-glue
@@ -82,6 +87,9 @@
--with-daemon-user=%{uname} \
--localstatedir=%{_var} \
--libdir=%{_libdir} \
+%if %{defined _unitdir}
+--with-systemdsystemunitdir=%{_unitdir} \
+%endif
--docdir=%{glue_docdir}
%endif
@@ -112,7 +120,11 @@
%files
%defattr(-,root,root)
%dir %{_datadir}/%{name}
+%if %{defined _unitdir}
+%{_unitdir}/logd.service
+%else
%{_sysconfdir}/init.d/logd
+%endif
%{_datadir}/%{name}/ha_cf_support.sh
%{_datadir}/%{name}/openais_conf_support.sh
%{_datadir}/%{name}/utillib.sh
@@ -176,6 +188,17 @@
-c cluster user %{uname}
exit 0
+%if %{defined _unitdir}
+%post
+%systemd_post logd.service
+
+%preun
+%systemd_preun logd.service
+
+%postun
+%systemd_postun_with_restart logd.service
+%endif
+
%post -n cluster-glue-libs -p /sbin/ldconfig
%postun -n cluster-glue-libs -p /sbin/ldconfig
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-06-12 12:28:59.0
+0200
+++ new/cluster-glue/cluster-glue-suse.spec 2014-06-25 14:47:30.0
+0200
@@ -42,6 +42,7 @@
BuildRequires: libxslt docbook_4 docbook-xsl-stylesheets
BuildRequires: help2man
BuildRequires: asciidoc
+BuildRequires: libbz2-devel libaio-devel
Obsoletes: heartbeat-common
Provides: heartbeat-common
@@ -56,6 +57,11 @@
BuildRequires: libcurl-devel
%endif
+%if %{defined systemd_requires}
+BuildRequires: systemd
+%{?systemd_requires}
+%endif
+
%description
A collection of common tools derived from the Heartbeat project that are
useful for writing cluster managers such as Pacemaker.
@@ -113,6 +119,9 @@
--with-daemon-group=%{gname} \
--with-daemon-user=%{uname} \
--with-rundir=%{_rundir} \
+%if %{defined _unitdir}
+--with-systemdsystemunitdir=%{_unitdir} \
+%endif
--docdir=%{glue_docdir}
%endif
@@ -128,11 +137,15 @@
find $RPM_BUILD_ROOT -name '*.pyc' -type f -print0 | xargs -0 rm -f
find $RPM_BUILD_ROOT -name '*.pyo' -type f -print0 | xargs -0 rm -f
+%if %{defined _unitdir}
+ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rclogd
+%else
test -d $RPM_BUILD_ROOT/sbin || mkdir $RPM_BUILD_ROOT/sbin
(
cd $RPM_BUILD_ROOT/sbin
ln -s /etc/init.d/logd rclogd
)
+%endif
###
@@ -163,7 +176,20 @@
-d %{_var}/lib/heartbeat/cores/%{uname} -o -u %{uid} \
%{uname} 2/dev/null || :
fi
+%if %{defined _unitdir}
+ %service_add_pre logd.service
+%endif
+
+%if %{defined _unitdir}
+%post
+%service_add_post logd.service
+
+%preun
+%service_del_preun logd.service
+%postun
+%service_del_postun logd.service
+%else
%preun
%stop_on_removal logd
@@ -172,6 +198,7 @@
%postun
%insserv_cleanup
+%endif
commit cluster-glue for openSUSE:Factory
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2014-06-18 07:47:46.0 +0200
@@ -1,0 +2,14 @@
+Thu Jun 12 14:38:50 UTC 2014 - dmuhameda...@suse.com
+
+- hb_report: fix interface to gdb and zypper
+- upstream cs: 45e21bc9795d
+
+---
+Fri Jun 6 13:30:57 UTC 2014 - dmuhameda...@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.0 +0200
+++ /var/tmp/diff_new_pack.OMxhrY/_new 2014-06-18 07:47:47.0 +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.0 +0200
+++ new/cluster-glue/.hg_archival.txt 2014-06-12 12:28:59.0 +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.0
+0200
+++ new/cluster-glue/cluster-glue-suse.spec 2014-06-12 12:28:59.0
+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.0 +0200
+++ new/cluster-glue/configure.ac 2014-06-12 12:28:59.0 +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.0
+0200
+++ new/cluster-glue/hb_report/hb_report.in 2014-06-12 12:28:59.0
+0200
@@ -1059,7 +1059,7 @@
}
# get the right part of the log
getlog() {
- local getstampproc cnt
+ local cnt
local outf
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2014-05-22 20:38:43
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-04-25 11:33:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2014-05-22 20:39:09.0 +0200
@@ -1,0 +2,30 @@
+Tue May 20 09:25:18 UTC 2014 - jseg...@novell.com
+
+- added service_add_pre to spec file
+- removed .CI_CNT.B_CNT from the release tag
+
+---
+Thu May 8 11:41:07 CEST 2014 - r...@suse.de
+
+- Add cluster-glue-configure-statedir.patch
+ * use _rundir macro and define GLUE_STATE_DIR accordingly
+
+---
+Mon May 5 09:03:29 UTC 2014 - kgronl...@suse.com
+
+- Drop rc1 from release numbering (bnc#873456)
+
+---
+Fri May 2 15:25:24 UTC 2014 - dmuhameda...@suse.com
+
+- hb_report: fix ssh passwords for clusters larger than 2 (bnc#867365)
+- upstream cs: b44fe9e0c67e
+ * removed obsolete Low-hb_report-pcmk-lib-changed-permissions.patch
(upstream)
+ * removed obsolete
0001-hb_report-Don-t-use-deprecated-corosync-fplay-bnc-87.patch (upstream)
+ * removed obsolete 0002-hb_report-Update-FSF-address-in-license.patch
(upstream)
+ * removed obsolete bnc863248-logd-add-systemd-support.patch (upstream)
+ * removed obsolete
bnc851990_cluster-glue_external_vcenter_disable_hostname_verification.patch
(upstream)
+ * removed obsolete bnc854060_hb_report-add-xz-support.patch (upstream)
+ * removed obsolete ipmilan-ipmiif.patch (upstream)
+
+---
Old:
0001-hb_report-Don-t-use-deprecated-corosync-fplay-bnc-87.patch
0002-hb_report-Update-FSF-address-in-license.patch
Low-hb_report-pcmk-lib-changed-permissions.patch
bnc851990_cluster-glue_external_vcenter_disable_hostname_verification.patch
bnc854060_hb_report-add-xz-support.patch
bnc863248-logd-add-systemd-support.patch
ipmilan-ipmiif.patch
New:
cluster-glue-configure-statedir.patch
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.eEPu5W/_old 2014-05-22 20:39:11.0 +0200
+++ /var/tmp/diff_new_pack.eEPu5W/_new 2014-05-22 20:39:11.0 +0200
@@ -16,7 +16,7 @@
#
-%global glue_release 0.rc1
+%global glue_release 1
%define uid 90
%define gname haclient
@@ -40,24 +40,18 @@
License:GPL-2.0 and LGPL-2.1+
Group: Productivity/Clustering/HA
Version:1.0.12
-Release:%{?glue_release}.CI_CNT.B_CNT
+Release:%{?glue_release}
Url:http://www.linux-ha.org/wiki/Cluster_Glue
Source: cluster-glue.tar.bz2
Source2:baselibs.conf
+# PATCH-FIX-OPENSUSE: load libplumb symbols manually (thanks to lge)
(bnc#694243)
Patch1: bug-694243_cluster-glue_symbol-conflict.patch
+# PATCH-FIX-OPENSUSE: use absolute path when invoking slaves (bnc#662816)
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
-Patch5: ipmilan-ipmiif.patch
-Patch6:
bnc851990_cluster-glue_external_vcenter_disable_hostname_verification.patch
-Patch7: bnc854060_hb_report-add-xz-support.patch
-Patch8: bnc863248-logd-add-systemd-support.patch
-# PATCH-FIX-UPSTREAM: hb_report: Don't use deprecated corosync-fplay
(bnc#870913)
-Patch9: 0001-hb_report-Don-t-use-deprecated-corosync-fplay-bnc-87.patch
-# PATCH-FIX-UPSTREAM: hb_report: Update FSF address in license
-Patch10:0002-hb_report-Update-FSF-address-in-license.patch
-# PATCH-FIX-UPSTREAM: hb_report: pcmk lib changed permissions (bnc#872958)
-Patch11:Low-hb_report-pcmk-lib-changed-permissions.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
@@ -107,6 +101,10 @@
BuildRequires: libcurl-devel
%endif
+%if ! %{defined _rundir}
+%define _rundir %{_localstatedir}/run
+%endif
+
%description
A collection of common tools that are useful for writing cluster managers
such as Pacemaker.
@@ -161,12 +159,6 @@
%patch2 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2014-04-25 11:33: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-04-03 16:38:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2014-04-25 11:33:44.0 +0200
@@ -1,0 +2,8 @@
+Fri Apr 11 14:38:34 UTC 2014 - kgronl...@suse.com
+
+- hb_report: pcmk lib changed permissions (bnc#872958)
+
+- added patches:
+ * Low-hb_report-pcmk-lib-changed-permissions.patch
+
+---
New:
Low-hb_report-pcmk-lib-changed-permissions.patch
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.FkFhDW/_old 2014-04-25 11:33:45.0 +0200
+++ /var/tmp/diff_new_pack.FkFhDW/_new 2014-04-25 11:33:45.0 +0200
@@ -55,6 +55,8 @@
Patch9: 0001-hb_report-Don-t-use-deprecated-corosync-fplay-bnc-87.patch
# PATCH-FIX-UPSTREAM: hb_report: Update FSF address in license
Patch10:0002-hb_report-Update-FSF-address-in-license.patch
+# PATCH-FIX-UPSTREAM: hb_report: pcmk lib changed permissions (bnc#872958)
+Patch11:Low-hb_report-pcmk-lib-changed-permissions.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
@@ -164,6 +166,7 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
###
%build
++ Low-hb_report-pcmk-lib-changed-permissions.patch ++
changeset: 2782:2d376c7eb9d7
parent: 2778:b5f160509785
user:Dejan Muhamedagic de...@hello-penguin.com
date:Thu Apr 10 15:02:10 2014 +0200
summary: Low: hb_report: pcmk lib changed permissions
diff --git a/hb_report/ha_cf_support.sh b/hb_report/ha_cf_support.sh
--- a/hb_report/ha_cf_support.sh
+++ b/hb_report/ha_cf_support.sh
@@ -76,7 +76,7 @@ essential_files() {
catEOF
d $HA_VARLIB 0755 root root
d $HA_VARLIB/ccm 0750 hacluster haclient
-d $PCMK_LIB 0755 root root
+d $PCMK_LIB 0750 hacluster haclient
d $PE_STATE_DIR 0750 hacluster haclient
d $CIB_DIR 0750 hacluster haclient
EOF
diff --git a/hb_report/openais_conf_support.sh
b/hb_report/openais_conf_support.sh
--- a/hb_report/openais_conf_support.sh
+++ b/hb_report/openais_conf_support.sh
@@ -90,7 +90,7 @@ cluster_info() {
}
essential_files() {
catEOF
-d $PCMK_LIB 0755 root root
+d $PCMK_LIB 0750 hacluster haclient
d $PE_STATE_DIR 0750 hacluster haclient
d $CIB_DIR 0750 hacluster haclient
EOF
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2014-04-03 16:38:34
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-02-26 23:20:25.0 +0100
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2014-04-03 16:38:44.0 +0200
@@ -1,0 +2,10 @@
+Mon Mar 31 08:50:24 UTC 2014 - kgronl...@suse.com
+
+- hb_report: Don't use deprecated corosync-fplay (bnc#870913)
+- hb_report: Update FSF address in license
+
+- added patches:
+ * 0001-hb_report-Don-t-use-deprecated-corosync-fplay-bnc-87.patch
+ * 0002-hb_report-Update-FSF-address-in-license.patch
+
+---
New:
0001-hb_report-Don-t-use-deprecated-corosync-fplay-bnc-87.patch
0002-hb_report-Update-FSF-address-in-license.patch
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.ADF4PN/_old 2014-04-03 16:38:45.0 +0200
+++ /var/tmp/diff_new_pack.ADF4PN/_new 2014-04-03 16:38:45.0 +0200
@@ -51,6 +51,11 @@
Patch6:
bnc851990_cluster-glue_external_vcenter_disable_hostname_verification.patch
Patch7: bnc854060_hb_report-add-xz-support.patch
Patch8: bnc863248-logd-add-systemd-support.patch
+# PATCH-FIX-UPSTREAM: hb_report: Don't use deprecated corosync-fplay
(bnc#870913)
+Patch9: 0001-hb_report-Don-t-use-deprecated-corosync-fplay-bnc-87.patch
+# PATCH-FIX-UPSTREAM: hb_report: Update FSF address in license
+Patch10:0002-hb_report-Update-FSF-address-in-license.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: asciidoc
@@ -157,6 +162,8 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
+%patch10 -p1
###
%build
++ 0001-hb_report-Don-t-use-deprecated-corosync-fplay-bnc-87.patch ++
From 3705b041220cb315f3c8f5f89bf594c5ab42abe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= k...@koru.se
Date: Mon, 31 Mar 2014 10:36:50 +0200
Subject: [PATCH 1/2] hb_report: Don't use deprecated corosync-fplay
(bnc#870913)
corosync-fplay is no longer distributed with corosync 2.0.
---
hb_report/hb_report.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hb_report/hb_report.in b/hb_report/hb_report.in
index f53eb996def1..886e782cd2b7 100755
--- a/hb_report/hb_report.in
+++ b/hb_report/hb_report.in
@@ -683,7 +683,7 @@ corosync_blackbox() {
local inpf
inpf=`find_files /var/lib/corosync $from_time $to_time | grep -w fdata`
if [ -f $inpf ]; then
- corosync-fplay $outf
+ corosync-blackbox $outf
touch -r $inpf $outf
fi
}
--
1.8.4.5
++ 0002-hb_report-Update-FSF-address-in-license.patch ++
From c9ad775f37ca75733c5cf6cbcd470d966af4e045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= k...@koru.se
Date: Mon, 31 Mar 2014 10:38:10 +0200
Subject: [PATCH 2/2] hb_report: Update FSF address in license
Update the FSF address in license of combine-logs.pl
---
hb_report/combine-logs.pl | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hb_report/combine-logs.pl b/hb_report/combine-logs.pl
index 2cfacd7f3176..3fbc100b0d8c 100755
--- a/hb_report/combine-logs.pl
+++ b/hb_report/combine-logs.pl
@@ -9,10 +9,10 @@
#
# usage: combine-logs log file [...]
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
#
# Note by Dejan Muhamedagic de...@suse.de
#
--
1.8.4.5
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail:
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2014-02-26 23:20:21
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
2013-12-11 16:42:13.0 +0100
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2014-02-26 23:20:25.0 +0100
@@ -1,0 +2,7 @@
+Sun Feb 23 23:33:52 UTC 2014 - kgronl...@suse.com
+
+- logd: Add systemd unit file for logd (bnc#863248)
+
+- added patches:
+ * bnc863248-logd-add-systemd-support.patch
+---
New:
bnc863248-logd-add-systemd-support.patch
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.eMUeQj/_old 2014-02-26 23:20:26.0 +0100
+++ /var/tmp/diff_new_pack.eMUeQj/_new 2014-02-26 23:20:26.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cluster-glue
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -50,6 +50,7 @@
Patch5: ipmilan-ipmiif.patch
Patch6:
bnc851990_cluster-glue_external_vcenter_disable_hostname_verification.patch
Patch7: bnc854060_hb_report-add-xz-support.patch
+Patch8: bnc863248-logd-add-systemd-support.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: asciidoc
@@ -75,6 +76,13 @@
%else
BuildRequires: libnet
%endif
+
+Requires(pre): %fillup_prereq
+
+%if %{defined systemd_requires}
+BuildRequires: systemd
+%{?systemd_requires}
+%endif
Conflicts: pacemaker 1.1.8
Conflicts: heartbeat-common 3.0.2
Obsoletes: heartbeat-common 3.0.2
@@ -148,6 +156,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
###
%build
@@ -171,6 +180,9 @@
--with-package-name=%{name} \
--with-daemon-group=%{gname} \
--with-daemon-user=%{uname} \
+%if %{defined _unitdir}
+--with-systemdsystemunitdir=%{_unitdir} \
+%endif
--docdir=%{glue_docdir}
%endif
make %{?_smp_mflags}
@@ -184,11 +196,10 @@
find $RPM_BUILD_ROOT -name '*.la' -type f -print0 | xargs -0 rm -f
find $RPM_BUILD_ROOT -name '*.pyc' -type f -print0 | xargs -0 rm -f
find $RPM_BUILD_ROOT -name '*.pyo' -type f -print0 | xargs -0 rm -f
-test -d $RPM_BUILD_ROOT/sbin || mkdir $RPM_BUILD_ROOT/sbin
-(
- cd $RPM_BUILD_ROOT/sbin
- ln -s /etc/init.d/logd rclogd
-)
+%if %{defined _unitdir}
+ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rclogd
+%endif
+
###
%pre
@@ -209,15 +220,16 @@
%{uname} 2/dev/null || :
fi
-%preun
-%stop_on_removal logd
-
+%if %{defined _unitdir}
%post
-%{insserv_force_if_yast logd}
+%service_add_post logd.service
+
+%preun
+%service_del_preun logd.service
%postun
-%restart_on_update logd
-%insserv_cleanup
+%service_del_postun logd.service
+%endif
%post -n libglue2
/sbin/ldconfig
@@ -253,13 +265,18 @@
%{_sbindir}/cibsecret
%{_sbindir}/meatclient
%{_sbindir}/stonith
-%{_sysconfdir}/init.d/logd
+
+%if %{defined _unitdir}
+%{_unitdir}/logd.service
+%endif
+
+#%{_sysconfdir}/init.d/logd
%doc %{_mandir}/man1/*
%doc %{_mandir}/man8/*
%doc AUTHORS
%doc COPYING
%doc logd/logd.cf
-/sbin/rclogd
+%{_sbindir}/rclogd
#%{_libdir}/heartbeat/lrmd
%{_libdir}/heartbeat/ha_logd
%{_libdir}/heartbeat/plugins/RAExec/*.so
++ bnc863248-logd-add-systemd-support.patch ++
From e98f92959484dc913be739b78abaa549c9ea78d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= k...@koru.se
Date: Mon, 24 Feb 2014 00:54:59 +0100
Subject: [PATCH] logd: Add systemd unit file for logd (bnc#863248)
Adds a systemd service script for logd, to replace the
old SysVInit script.
---
Makefile.am | 3 +++
configure.ac | 17 +
logd/Makefile.am | 6 +-
logd/ha_logd.c | 12
logd/logd.service.in | 13 +
5 files changed, 46 insertions(+), 5 deletions(-)
create mode 100644 logd/logd.service.in
diff --git a/Makefile.am b/Makefile.am
index d724837e2d1b..93dbaf6a0906 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,9 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
+DISTCHECK_CONFIGURE_FLAGS = \
+--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2013-12-11 16:42:12
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
2013-11-07 17:37:00.0 +0100
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2013-12-11 16:42:13.0 +0100
@@ -1,0 +2,10 @@
+Tue Dec 10 17:27:46 UTC 2013 - kgronl...@suse.com
+
+- external/vcenter: Disable SSL hostname verification (bnc#851990)
+
+---
+Mon Dec 9 20:50:30 UTC 2013 - kgronl...@suse.com
+
+- hb_report: Add support for xz compression (bnc#854060)
+
+---
New:
bnc851990_cluster-glue_external_vcenter_disable_hostname_verification.patch
bnc854060_hb_report-add-xz-support.patch
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.6u85gR/_old 2013-12-11 16:42:14.0 +0100
+++ /var/tmp/diff_new_pack.6u85gR/_new 2013-12-11 16:42:14.0 +0100
@@ -48,6 +48,8 @@
Patch2: bnc662816_cluster-glue_hb_report_abspath.patch
Patch4: cluster-glue_droplrm.patch
Patch5: ipmilan-ipmiif.patch
+Patch6:
bnc851990_cluster-glue_external_vcenter_disable_hostname_verification.patch
+Patch7: bnc854060_hb_report-add-xz-support.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: asciidoc
@@ -144,6 +146,8 @@
%patch2 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
+%patch7 -p1
###
%build
++
bnc851990_cluster-glue_external_vcenter_disable_hostname_verification.patch
++
# HG changeset patch
# User Kristoffer Grönlund kgronl...@suse.com
# Date 1385970687 -3600
# Mon Dec 02 08:51:27 2013 +0100
# Node ID bc660db57b1eb82a6bafbd15de69f92104f3e618
# Parent 8ee647b07cfaee0a59024248e1b3a2a2c6c4d175
Low: stonith: external/vcenter: Disable SSL hostname verification by default
(bnc#851990)
Add parameter to the agent to enable or disable SSL hostname verification, and
set the default to 0.
diff --git a/lib/plugins/stonith/external/vcenter
b/lib/plugins/stonith/external/vcenter
--- a/lib/plugins/stonith/external/vcenter
+++ b/lib/plugins/stonith/external/vcenter
@@ -106,6 +106,14 @@ Enable/disable a PowerOnVM on reset when
Allowed values: 0, 1
/longdesc
/parameter
+parameter name=PERL_LWP_SSL_VERIFY_HOSTNAME
+content type=string default=0/
+shortdesc lang=enDisable SSL hostname verification/shortdesc
+longdesc lang=en
+Disable SSL hostname verification by default. To enable hostname
+verification, set this option to 1.
+/longdesc
+/parameter
/parameters} . \n;
}
else { dielog(Invalid command specified: $command\n); }
++ bnc854060_hb_report-add-xz-support.patch ++
# HG changeset patch
# User Kristoffer Grönlund kgronl...@suse.com
# Date 1386521692 -3600
# Sun Dec 08 17:54:52 2013 +0100
# Node ID e1707c266d9239a182e389172fab2f42fef2365b
# Parent bc660db57b1eb82a6bafbd15de69f92104f3e618
Medium: hb_report: Add support for xz compression (bnc#854060)
On some systems, log files are compressed with xz compression.
Assumes that xz is installed if logs are compressed with xz.
diff --git a/hb_report/hb_report.in b/hb_report/hb_report.in
--- a/hb_report/hb_report.in
+++ b/hb_report/hb_report.in
@@ -315,7 +315,9 @@ findlog() {
#
find_decompressor() {
- if echo $1 | grep -qs 'bz2$'; then
+ if echo $1 | grep -qs 'xz$'; then
+ echo xz -dc
+ elif echo $1 | grep -qs 'bz2$'; then
echo bzip2 -dc
elif echo $1 | grep -qs 'gz$'; then
echo gzip -dc
@@ -1018,8 +1020,10 @@ edittemplate() {
fi
}
pickcompress() {
- if COMPRESS_PROG=`pickfirst bzip2 gzip`; then
- if [ $COMPRESS_PROG = bzip2 ]; then
+ if COMPRESS_PROG=`pickfirst bzip2 gzip xz`; then
+ if [ $COMPRESS_PROG = xz ]; then
+ COMPRESS_EXT=.xz
+ elif [ $COMPRESS_PROG = bzip2 ]; then
COMPRESS_EXT=.bz2
else
COMPRESS_EXT=.gz
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2013-10-21 19:51: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
2013-10-11 11:03:39.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2013-10-21 19:51:43.0 +0200
@@ -1,0 +2,7 @@
+Mon Oct 14 12:30:18 UTC 2013 - kgronl...@suse.com
+
+- add ipmilan-ipmiif.patch:
+ Make sure to include OpenIPMI/ipmiif.h for correct
+ version detection.
+
+---
New:
ipmilan-ipmiif.patch
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.HShN0H/_old 2013-10-21 19:51:44.0 +0200
+++ /var/tmp/diff_new_pack.HShN0H/_new 2013-10-21 19:51:44.0 +0200
@@ -47,6 +47,7 @@
Patch1: bug-694243_cluster-glue_symbol-conflict.patch
Patch2: bnc662816_cluster-glue_hb_report_abspath.patch
Patch4: cluster-glue_droplrm.patch
+Patch5: ipmilan-ipmiif.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: asciidoc
@@ -124,6 +125,7 @@
%patch1 -p1
%patch2 -p1
%patch4 -p1
+%patch5 -p1
###
%build
++ ipmilan-ipmiif.patch ++
# HG changeset patch
# User Kristoffer Grönlund kgronl...@suse.com
# Date 1381753486 -7200
# Mon Oct 14 14:24:46 2013 +0200
# Node ID 8ee647b07cfaee0a59024248e1b3a2a2c6c4d175
# Parent 5e7ce9f5535788db962f3a1335d0ee374d22aebd
Medium: Include OpenIPMI/ipmiif.h to ensure version detection succeeds.
diff --git a/lib/plugins/stonith/ipmilan_command.c
b/lib/plugins/stonith/ipmilan_command.c
--- a/lib/plugins/stonith/ipmilan_command.c
+++ b/lib/plugins/stonith/ipmilan_command.c
@@ -28,6 +28,7 @@
#include sys/types.h
#include sys/socket.h
+#include OpenIPMI/ipmiif.h
#include OpenIPMI/selector.h
#include OpenIPMI/ipmi_conn.h
#include OpenIPMI/ipmi_lan.h
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cluster-glue for openSUSE:Factory
Hello community, here is the log from the commit of package cluster-glue for openSUSE:Factory checked in at 2013-10-11 11:03:39 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 2013-09-27 17:07:21.0 +0200 +++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes 2013-10-11 11:03:39.0 +0200 @@ -1,0 +2,7 @@ +Thu Oct 3 21:16:54 UTC 2013 - dmuhameda...@suse.com + +- fix the tag glue-1.0.12-rc1 +- since lrm bits are not compiled, this package conflicts with + pacemaker 1.1.8 + +--- Other differences: -- ++ cluster-glue.spec ++ --- /var/tmp/diff_new_pack.JGhEe8/_old 2013-10-11 11:03:40.0 +0200 +++ /var/tmp/diff_new_pack.JGhEe8/_new 2013-10-11 11:03:40.0 +0200 @@ -72,6 +72,7 @@ %else BuildRequires: libnet %endif +Conflicts: pacemaker 1.1.8 Conflicts: heartbeat-common 3.0.2 Obsoletes: heartbeat-common 3.0.2 Requires: perl-TimeDate ++ 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 2013-09-26 17:39:21.0 +0200 +++ new/cluster-glue/.hg_archival.txt 2013-10-03 23:16:07.0 +0200 @@ -1,5 +1,5 @@ repo: e3ffdd7ae81c596b2be7e1e110d2c1255161340e -node: 45d62d62a6b976dc70759ef30ec898e6e704af01 +node: 5e7ce9f5535788db962f3a1335d0ee374d22aebd branch: default -latesttag: c64d6e96f20a -latesttagdistance: 1 +latesttag: glue-1.0.12-rc1 +latesttagdistance: 3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/.hgtags new/cluster-glue/.hgtags --- old/cluster-glue/.hgtags2013-09-26 17:39:21.0 +0200 +++ new/cluster-glue/.hgtags2013-10-03 23:16:07.0 +0200 @@ -64,4 +64,4 @@ 0a08a469fdc8a0db1875369497bc83c0523ceb21 glue-1.0.9 12055ca2b025ab250a544701edaa1f5aaf63aef1 glue-1.0.10 02bdcf58f9a098b717784746308e199e12eeb005 glue-1.0.11 -c64d6e96f20ad5ba245f7fb9e1295b14fa179e29 c64d6e96f20a +c64d6e96f20ad5ba245f7fb9e1295b14fa179e29 glue-1.0.12-rc1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2013-09-27 17:07:20
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
2013-09-25 14:30:13.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2013-09-27 17:07:21.0 +0200
@@ -1,0 +2,6 @@
+Thu Sep 26 15:43:28 UTC 2013 - dmuhameda...@suse.com
+
+- clplumbing: increase listen backlog to 128
+- upstream cs: 1.0.12-rc1
+
+---
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.90wxKx/_old 2013-09-27 17:07:23.0 +0200
+++ /var/tmp/diff_new_pack.90wxKx/_new 2013-09-27 17:07:23.0 +0200
@@ -16,6 +16,8 @@
#
+%global glue_release 0.rc1
+
%define uid 90
%define gname haclient
%define uname hacluster
@@ -37,8 +39,8 @@
Summary:Reusable cluster components
License:GPL-2.0 and LGPL-2.1+
Group: Productivity/Clustering/HA
-Version:1.0.11
-Release:0
+Version:1.0.12
+Release:%{?glue_release}.CI_CNT.B_CNT
Url:http://www.linux-ha.org/wiki/Cluster_Glue
Source: cluster-glue.tar.bz2
Source2:baselibs.conf
++ 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 2013-08-29 15:44:53.0 +0200
+++ new/cluster-glue/.hg_archival.txt 2013-09-26 17:39:21.0 +0200
@@ -1,5 +1,5 @@
repo: e3ffdd7ae81c596b2be7e1e110d2c1255161340e
-node: 8acfc748667a8234e5e78d138d24afa6b9ac10ea
+node: 45d62d62a6b976dc70759ef30ec898e6e704af01
branch: default
-latesttag: glue-1.0.11
-latesttagdistance: 38
+latesttag: c64d6e96f20a
+latesttagdistance: 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/.hgtags new/cluster-glue/.hgtags
--- old/cluster-glue/.hgtags2013-08-29 15:44:53.0 +0200
+++ new/cluster-glue/.hgtags2013-09-26 17:39:21.0 +0200
@@ -64,3 +64,4 @@
0a08a469fdc8a0db1875369497bc83c0523ceb21 glue-1.0.9
12055ca2b025ab250a544701edaa1f5aaf63aef1 glue-1.0.10
02bdcf58f9a098b717784746308e199e12eeb005 glue-1.0.11
+c64d6e96f20ad5ba245f7fb9e1295b14fa179e29 c64d6e96f20a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/ChangeLog new/cluster-glue/ChangeLog
--- old/cluster-glue/ChangeLog 2013-08-29 15:44:53.0 +0200
+++ new/cluster-glue/ChangeLog 2013-09-26 17:39:21.0 +0200
@@ -1,3 +1,24 @@
+* Thu Sep 26 2013 Dejan Muhamedagic de...@suse.de, Lars Ellenberg
lars.ellenb...@linbit.com, and many others
+- release candidate 1.0.12-rc1
+- clplumbing: increase listen backlog to 128
+- hb_report: add -X option for extra ssh options
+- hb_report: add support for the rfc5424 syslog date format
+- stonith: external/libvirt: fix exit code in reset
+- stonith: external/vcenter: do not list vms in status
+ (bnc#825765)
+- stonith: fix memory leak in external.c
+- hb_report: enable ssh to prompt for passwords (bnc#808373)
+- hb_report: collect RA trace files
+- hb_report: look for nodes in the archived CIB if pacemaker is
+ not running
+- sbd plugin now lives at http://hg.linux-ha.org/sbd/
+- stonith: if debug's not set, do not send debug messages to the
+ logger (bnc#792124)
+- stonith: log status message at the debug level (bnc#792124)
+- stonith: don't always log debug level messages (bnc#792124)
+- stonith: external/vcenter: fix gethosts to produce list of
+ nodes not vms (bnc#792704)
+
* Mon Oct 15 2012 Dejan Muhamedagic de...@suse.de, Lars Ellenberg
lars.ellenb...@linbit.com, and many others
- stable release 1.0.11
- lrmd: set max-children depending on the number of processors
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 2013-08-29 15:44:53.0
+0200
+++ new/cluster-glue/cluster-glue-fedora.spec 2013-09-26 17:39:21.0
+0200
@@ -15,8 +15,8 @@
Name: cluster-glue
Summary: Reusable cluster components
-Version: 1.0.11
-Release: 1%{?dist}
+Version: 1.0.12
+Release: 0.rc1%{?dist}
License: GPLv2+ and LGPLv2+
Url: http://www.linux-ha.org/wiki/Cluster_Glue
Group: System Environment/Base
diff -urN
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2013-09-25 14:30:12
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
2013-06-05 13:27:23.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2013-09-25 14:30:13.0 +0200
@@ -1,0 +2,20 @@
+Wed Sep 18 14:41:03 UTC 2013 - l...@suse.com
+
+- Change to recommend sbd instead of requiring it to avoid dependency
+ loop.
+
+---
+Thu Aug 29 15:13:20 UTC 2013 - dmuhameda...@suse.com
+
+- hb_report: fix test for the root user
+- hb_report: add support for the rfc5424 syslog date format
+- hb_report: add -X option for extra ssh options (fate#314906)
+- hb_report: adjust for more pacemaker directories moving
+- hb_report: Add sudo to package requirements (bnc#823087)
+- stonith: external/libvirt: fix exit code in reset
+- stonith: external/vcenter: do not list vms in status (bnc#825765)
+- Fix gcc warning about wrong typecast on i586.
+- fix various gcc warnings
+- upstream cs: 8acfc748667a
+
+---
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.67uyhK/_old 2013-09-25 14:30:14.0 +0200
+++ /var/tmp/diff_new_pack.67uyhK/_new 2013-09-25 14:30:14.0 +0200
@@ -73,6 +73,10 @@
Conflicts: heartbeat-common 3.0.2
Obsoletes: heartbeat-common 3.0.2
Requires: perl-TimeDate
+Requires: sudo
+# The following is necessary since sbd is dropped from
+# cluster-glue itself:
+Recommends: sbd
Requires(pre):/usr/sbin/groupadd /usr/bin/getent /usr/sbin/useradd
# SLES10 needs tcpd-devel but doesn't have libcurl
%if 0%{?suse_version} 1020
++ 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 2013-05-07 04:52:50.0 +0200
+++ new/cluster-glue/.hg_archival.txt 2013-08-29 15:44:53.0 +0200
@@ -1,5 +1,5 @@
repo: e3ffdd7ae81c596b2be7e1e110d2c1255161340e
-node: 27019ba6670df783a757d6993cbd504f0befaf25
+node: 8acfc748667a8234e5e78d138d24afa6b9ac10ea
branch: default
latesttag: glue-1.0.11
-latesttagdistance: 26
+latesttagdistance: 38
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 2013-05-07 04:52:50.0 +0200
+++ new/cluster-glue/configure.ac 2013-08-29 15:44:53.0 +0200
@@ -1201,7 +1201,7 @@
CFLAGS=$CFLAGS -g
enable_fatal_warnings=no
else
-CFLAGS=$CFLAGS -ggdb3 -O0
+CFLAGS=$CFLAGS -ggdb
# We had to eliminate -Wnested-externs because of libtool changes
EXTRA_FLAGS=-fgnu89-inline
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/doc/hb_report.8.txt
new/cluster-glue/doc/hb_report.8.txt
--- old/cluster-glue/doc/hb_report.8.txt2013-05-07 04:52:50.0
+0200
+++ new/cluster-glue/doc/hb_report.8.txt2013-08-29 15:44:53.0
+0200
@@ -87,6 +87,11 @@
hacluster. If you have another user for administration over
ssh, please use this option.
+*-X* ssh-options::
+ Extra ssh options. These will be added to every ssh
+ invocation. Alternatively, use `$HOME/.ssh/config` to setup
+ desired ssh connection options.
+
*-S*::
Single node operation. Run hb_report only on this node and
don't try to start slave collectors on other members of the
@@ -246,6 +251,10 @@
+
If you need to supply a password for your passphrase/login, then
always use the `-u` option.
+ +
+ For extra ssh(1) options, if you're too lazy to setup
+ $HOME/.ssh/config, use the `-X` option. Do not forget to put
+ the options in quotes.
sudo::
If the ssh user (as specified with the `-u` option) is other
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 2013-05-07 04:52:50.0
+0200
+++ new/cluster-glue/hb_report/hb_report.in 2013-08-29 15:44:53.0
+0200
@@ -66,8 +66,9 @@
usage() {
catEOF
-usage: hb_report -f {time|cts:testnum} [-t
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2013-06-05 13:27:22
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
2012-10-18 15:52:35.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2013-06-05 13:27:23.0 +0200
@@ -1,0 +2,70 @@
+Mon May 13 08:15:14 UTC 2013 - dmuhameda...@suse.com
+
+- stonith: fix memory leak in external.c
+- stonith: use 0 for the unique parameters attribute in most
+ agents
+- upstream cs: 27019ba6670d
+
+---
+Thu Mar 28 09:46:00 UTC 2013 - dmuhameda...@suse.com
+
+- hb_report: ignore differences in white space
+- upstream cs: 8347e8c9b94f
+
+---
+Thu Mar 14 08:56:33 UTC 2013 - dmuhameda...@suse.com
+
+- hb_report: enable ssh to prompt for passwords (bnc#808373)
+- hb_report: do not assume that this is a loghost if the number
+ of entries equals 1
+- upstream cs: 3cff550e1084
+
+---
+Mon Feb 25 09:08:52 UTC 2013 - dmuhameda...@suse.com
+
+- hb_report: reduce severity of several info messages (bnc#804704)
+- upstream cs: 0c0bd21916ce
+
+---
+Mon Feb 11 10:09:03 UTC 2013 - dmuhameda...@suse.com
+
+- hb_report: collect RA trace files
+- hb_report: look for nodes in the archived CIB if pacemaker is
+ not running
+- upstream cs: ee43da63fc88
+
+---
+Fri Feb 8 09:39:00 UTC 2013 - dmuhameda...@suse.com
+
+- hb_report: fix false disk full errors
+- upstream cs: afd858980b16
+
+---
+Fri Feb 1 15:42:38 UTC 2013 - dmuhameda...@suse.com
+
+- hb_report: exit early on disk full (FATE#313815)
+- hb_report: create links instead of copying PE inputs
+ (FATE#313815)
+- drop LRM bits (bnc#800095)
+- upstream cs: 54ec848c439e
+
+---
+Sat Dec 15 18:20:32 UTC 2012 - dmuhameda...@suse.com
+
+- stonith: external/libvirt: don't log if status succeeded
+- stonith: if debug's not set, do not send debug messages
+ to the logger (bnc#792124)
+- hb_report: readd description fields to description.txt (SUSE)
+- hb_report: do zypper ref before trying to get packages
+- stonith: log status message at the debug level (bnc#792124)
+- stonith: don't always log debug level messages (bnc#792124)
+- stonith: external/vcenter: fix gethosts to produce list of
+ nodes not vms (bnc#792704)
+- Upstream version cs: 67224d37df80
+
+---
+Mon Nov 19 18:05:31 UTC 2012 - dmuhameda...@suse.com
+
+- this release has code to support Pacemaker v1.1.8
+
+---
Old:
cluster-glue-1.0.11.tar.bz2
New:
cluster-glue.tar.bz2
cluster-glue_droplrm.patch
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.vwDZ1z/_old 2013-06-05 13:27:25.0 +0200
+++ /var/tmp/diff_new_pack.vwDZ1z/_new 2013-06-05 13:27:25.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package cluster-glue
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -34,18 +34,20 @@
%global glue_docdir %{_defaultdocdir}/%{name}
Name: cluster-glue
-Summary:The Heartbeat Subsystem for High-Availability Linux
+Summary:Reusable cluster components
License:GPL-2.0 and LGPL-2.1+
Group: Productivity/Clustering/HA
Version:1.0.11
Release:0
-Url:http://linux-ha.org/
-Source: cluster-glue-%{version}.tar.bz2
+Url:http://www.linux-ha.org/wiki/Cluster_Glue
+Source: cluster-glue.tar.bz2
Source2:baselibs.conf
Patch1: bug-694243_cluster-glue_symbol-conflict.patch
Patch2: bnc662816_cluster-glue_hb_report_abspath.patch
+Patch4: cluster-glue_droplrm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
+BuildRequires: asciidoc
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
@@ -81,29 +83,13 @@
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2012-10-18 15:52:34
Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old)
and /work/SRC/openSUSE:Factory/.cluster-glue.new (New)
Package is cluster-glue, Maintainer is dmuhameda...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes
2012-05-03 10:54:26.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2012-10-18 15:52:35.0 +0200
@@ -1,0 +2,53 @@
+Tue Oct 16 13:10:55 UTC 2012 - dmuhameda...@suse.com
+
+- lrmd: set max-children depending on the number of processors
+- lrmd: don't send parameters from ops back to crmd
+- stonith: external/libvirt: support for reboot reset method
+- stonith: external/virsh: update test for virsh output
+- stonith: external/libvirt: add more search strings for domain
+ start and stop
+- hb_report: node's type got optional
+- hb_report: make use of bash trace features
+- hb_report: compatibility code for pacemaker v1.1.8
+- build: link libstonith with stonith2 agents
+- Upstream version cs: 02bdcf58f9a0 (glue-1.0.11)
+
+---
+Tue Oct 16 11:48:00 UTC 2012 - co...@suse.com
+
+- add explict buildrequire on libbz2-devel
+
+---
+Mon Jul 16 14:26:54 UTC 2012 - dmuhameda...@suse.com
+
+- set version to 1.0.10
+- stonith: external/libvirt: add more search strings for domain
+ start and stop
+- Upstream version cs: 18489f275f75
+
+---
+Mon Jul 9 15:22:09 UTC 2012 - dmuhameda...@suse.com
+
+- clplumbing: cl_msg: revert max message size to 256Kb
+- clplumbing: fix memleak for Gmain_timeout
+- stonith: rhcs: avoid false error if parameter isn't set
+- stonith: rhcs: pass the action via stdin too
+- hb_report: add node time information
+- hb_report: get corosync blackbox records if available
+- hb_report: make sure that work directory gets removed
+- hb_report: improve performance
+- sbd: Debug mode added (bnc#753559, bnc#738295)
+- sbd: Handle IO errors during slot allocation properly
+ (bnc#753559)
+- sbd: Explicitly inform the master process about IO problems on
+ the child (bnc#738295)
+- sbd: Make servant restart logic more robust and verbose
+ (bnc#738295)
+- sbd: Use async IO for disk reads to increase resilience against
+ hung IO (bnc#738295)
+- logd: add try-restart action to the logd init script
+ (allows logd restart on upgrades)
+- update regression tests
+- Upstream version cs: fc64670fd789
+
+---
Old:
bug-728579_glue-stonith-dev-id.patch
cluster-glue-1.0.9.tar.bz2
fix-glib_h-include.patch
fix-runlevels.diff
New:
cluster-glue-1.0.11.tar.bz2
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.OSoafq/_old 2012-10-18 15:52:37.0 +0200
+++ /var/tmp/diff_new_pack.OSoafq/_new 2012-10-18 15:52:37.0 +0200
@@ -35,18 +35,15 @@
Name: cluster-glue
Summary:The Heartbeat Subsystem for High-Availability Linux
-License:GPL-2.0 ; LGPL-2.1+
+License:GPL-2.0 and LGPL-2.1+
Group: Productivity/Clustering/HA
-Version:1.0.9
+Version:1.0.11
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
-Patch5: fix-glib_h-include.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: autoconf
@@ -56,6 +53,8 @@
BuildRequires: e2fsprogs-devel
BuildRequires: glib2-devel
BuildRequires: help2man
+BuildRequires: libaio-devel
+BuildRequires: libbz2-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: libxslt
@@ -147,11 +146,8 @@
%prep
###
%setup -n cluster-glue -q
-%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch4 -p1
-%patch5 -p1
###
%build
++ cluster-glue-1.0.9.tar.bz2 - cluster-glue-1.0.11.tar.bz2 ++
3593 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2012-05-03 10:54:25
Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old)
and /work/SRC/openSUSE:Factory/.cluster-glue.new (New)
Package is cluster-glue, Maintainer is dmuhameda...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes
2012-02-16 12:19:02.0 +0100
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2012-05-03 10:54:26.0 +0200
@@ -1,0 +2,25 @@
+Thu Mar 22 12:12:04 GMT 2012 - aspi...@suse.com
+
+- add dependency on perl-TimeDate for hb_report (bnc#753562)
+
+---
+Wed Mar 21 15:53:10 UTC 2012 - dmuhameda...@suse.com
+
+- clplumbing: cl_msg: increase max message size to 512Kb
+- clplumbing: cl_msg: increase compression threshold
+- clplumbing: cl_msg: don't use traditional compression by default
+- clplumbing: cl_msg: try compressing message before rejecting it as too big
+- clplumbing: load bz2 compression module by default
+- clplumbing: ipc: fix message size checks (bnc#752231)
+- stonith: external/vcenter: return list of configured hosts on gethosts
+- Upstream version cs: 6766d7061071
+
+---
+Tue Mar 13 16:56:14 UTC 2012 - dmuhameda...@suse.com
+
+- LRM: lrmd: add basic authentication (lf#2547)
+- LRM: lrmd: if set, get max-children from the LRMD_MAX_CHILDREN environment
var
+- hb_report: add /etc/booth/booth.conf to the list of configurations
(bnc#750049)
+- Upstream version cs: 58686d5ae302
+
+---
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.vLqHvw/_old 2012-05-03 10:54:27.0 +0200
+++ /var/tmp/diff_new_pack.vLqHvw/_new 2012-05-03 10:54:27.0 +0200
@@ -71,11 +71,12 @@
%endif
Conflicts: heartbeat-common 3.0.2
Obsoletes: heartbeat-common 3.0.2
+Requires: perl-TimeDate
Requires(pre):/usr/sbin/groupadd /usr/bin/getent /usr/sbin/useradd
# SLES10 needs tcpd-devel but doesn't have libcurl
%if 0%{?suse_version} 1020
-BuildRequires: tcpd-devel
BuildRequires: sgml-skel
+BuildRequires: tcpd-devel
%else
BuildRequires: libcurl-devel
%endif
@@ -238,6 +239,7 @@
%dir %{_libdir}/heartbeat/plugins
%dir %{_libdir}/heartbeat/plugins/RAExec
%dir %{_libdir}/heartbeat/plugins/InterfaceMgr
+%dir %{_libdir}/heartbeat/plugins/compress
%dir %{_libdir}/stonith
%dir %{_libdir}/stonith/plugins
%dir %{_libdir}/stonith/plugins/stonith2
@@ -266,6 +268,7 @@
%{_libdir}/heartbeat/ha_logd
%{_libdir}/heartbeat/plugins/RAExec/*.so
%{_libdir}/heartbeat/plugins/InterfaceMgr/*.so
+%{_libdir}/heartbeat/plugins/compress/*.so
%{_libdir}/stonith/plugins/external
%exclude %{_libdir}/stonith/plugins/stonith2/null.so
%exclude %{_libdir}/stonith/plugins/stonith2/ssh.so
++ bug-728579_glue-stonith-dev-id.patch ++
--- /var/tmp/diff_new_pack.vLqHvw/_old 2012-05-03 10:54:27.0 +0200
+++ /var/tmp/diff_new_pack.vLqHvw/_new 2012-05-03 10:54:27.0 +0200
@@ -1,10 +1,10 @@
# HG changeset patch
-# Parent 4b08977bece328dd582ba23e9d92a7aa728133fd
+# Parent 58686d5ae302fffcf62ca337cefcaf792e47014a
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.shFri Nov 04 17:59:44 2011 +0100
-+++ b/lib/stonith/ha_log.shThu Nov 10 10:50:40 2011 +0100
+diff -r 58686d5ae302 lib/stonith/ha_log.sh
+--- a/lib/stonith/ha_log.shTue Mar 13 16:53:03 2012 +0100
b/lib/stonith/ha_log.shTue Mar 13 17:10:30 2012 +0100
@@ -54,16 +54,24 @@ level_pres() {
esac
}
@@ -12,8 +12,8 @@
+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]
++ if [ -n $CRM_meta_st_device_id ]; then
++ HA_LOGTAG=$HA_LOGTAG($CRM_meta_st_device_id)[$PPID]
+ else
+ HA_LOGTAG=$HA_LOGTAG[$PPID]
+ fi
++ cluster-glue-1.0.9.tar.bz2 ++
3517 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2012-02-16 12:19:00
Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old)
and /work/SRC/openSUSE:Factory/.cluster-glue.new (New)
Package is cluster-glue, Maintainer is dmuhameda...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes
2012-01-09 16:22:39.0 +0100
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2012-02-16 12:19:02.0 +0100
@@ -1,0 +2,13 @@
+Thu Feb 2 14:21:44 UTC 2012 - dmuhameda...@suse.com
+
+- logd: remove runlevel 4 from the LSB info section in the logd
+ init script (bnc#744120)
+- Upstream version cs: d8c154589a16
+
+---
+Mon Jan 16 13:49:04 UTC 2012 - dmuhameda...@suse.com
+
+- stonith: adjust timeouts in the meta-data template (bnc#77)
+- Upstream version cs: 3efdcb8fc3af
+
+---
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.s2mbdj/_old 2012-02-16 12:19:04.0 +0100
+++ /var/tmp/diff_new_pack.s2mbdj/_new 2012-02-16 12:19:04.0 +0100
@@ -104,6 +104,7 @@
%package -n libglue2
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}
@@ -114,6 +115,7 @@
%package -n libglue-devel
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
++ cluster-glue-1.0.9.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 2011-11-29 10:44:31.0 +0100
+++ new/cluster-glue/.hg_archival.txt 2012-01-31 17:19:00.0 +0100
@@ -1,5 +1,5 @@
repo: e3ffdd7ae81c596b2be7e1e110d2c1255161340e
-node: ce78649ed7ea0d55059aaf8374f9e2522c58bfb1
+node: d8c154589a16cb99ab16f36a27756ba94eefdbee
branch: default
latesttag: glue-1.0.9
-latesttagdistance: 1
+latesttagdistance: 4
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 2011-11-29 10:44:31.0
+0100
+++ new/cluster-glue/hb_report/utillib.sh 2012-01-31 17:19:00.0
+0100
@@ -108,7 +108,9 @@
#
findmsg() {
# this is tricky, we try a few directories
- syslogdirs=/var/log /var/logs /var/syslog /var/adm /var/log/ha
/var/log/cluster
+ syslogdirs=/var/log /var/logs /var/syslog /var/adm
+ /var/log/ha /var/log/cluster /var/log/pacemaker
+ /var/log/heartbeat /var/log/crm /var/log/corosync /var/log/openais
favourites=ha-*
mark=$1
log=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/lib/stonith/main.c
new/cluster-glue/lib/stonith/main.c
--- old/cluster-glue/lib/stonith/main.c 2011-11-29 10:44:31.0 +0100
+++ new/cluster-glue/lib/stonith/main.c 2012-01-31 17:19:00.0 +0100
@@ -55,10 +55,10 @@
shortdesc lang=\en\%s/shortdesc\n
%s\n
actions\n
-action name=\start\ timeout=\60\ /\n
+action name=\start\ timeout=\20\ /\n
action name=\stop\timeout=\15\ /\n
-action name=\status\ timeout=\60\ /\n
-action name=\monitor\ timeout=\60\ interval=\3600\ /\n
+action name=\status\ timeout=\20\ /\n
+action name=\monitor\ timeout=\20\ interval=\3600\ /\n
action name=\meta-data\ timeout=\15\ /\n
/actions\n
special tag=\heartbeat\\n
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/logd/logd.in
new/cluster-glue/logd/logd.in
--- old/cluster-glue/logd/logd.in 2011-11-29 10:44:31.0 +0100
+++ new/cluster-glue/logd/logd.in 2012-01-31 17:19:00.0 +0100
@@ -28,7 +28,7 @@
# Required-Start: $network $syslog $remote_fs
# Required-Stop: $network $syslog $remote_fs
# X-Start-Before: heartbeat openais corosync
-# Default-Start: 2 3 4 5
+# Default-Start: 2 3 5
# Default-Stop: 0 1 6
### END INIT INFO
++ fix-runlevels.diff ++
--- /var/tmp/diff_new_pack.s2mbdj/_old 2012-02-16 12:19:05.0 +0100
+++ /var/tmp/diff_new_pack.s2mbdj/_new 2012-02-16 12:19:05.0 +0100
@@ -1,12 +1,12 @@
Index:
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2012-01-09 16:22:37
Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old)
and /work/SRC/openSUSE:Factory/.cluster-glue.new (New)
Package is cluster-glue, Maintainer is dmuhameda...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes
2011-12-25 17:33:38.0 +0100
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2012-01-09 16:22:39.0 +0100
@@ -1,0 +2,5 @@
+Mon Jan 9 06:49:48 UTC 2012 - tser...@suse.com
+
+- Only include glib.h in cl_uuid.h (don't directly use glib/gtypes.h)
+
+---
New:
fix-glib_h-include.patch
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.5dz5fE/_old 2012-01-09 16:22:42.0 +0100
+++ /var/tmp/diff_new_pack.5dz5fE/_new 2012-01-09 16:22:42.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cluster-glue
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -46,6 +46,7 @@
Patch1: bug-694243_cluster-glue_symbol-conflict.patch
Patch2: bnc662816_cluster-glue_hb_report_abspath.patch
Patch4: bug-728579_glue-stonith-dev-id.patch
+Patch5: fix-glib_h-include.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: autoconf
@@ -147,6 +148,7 @@
%patch1 -p1
%patch2 -p1
%patch4 -p1
+%patch5 -p1
###
%build
++ fix-glib_h-include.patch ++
Index: cluster-glue/include/clplumbing/cl_uuid.h
===
--- cluster-glue.orig/include/clplumbing/cl_uuid.h
+++ cluster-glue/include/clplumbing/cl_uuid.h
@@ -16,7 +16,7 @@
#ifndef _CL_UUID_H_
#define _CL_UUID_H_
-#include glib/gtypes.h
+#include glib.h
typedef struct cl_uuid_s{
unsigned char uuid[16];
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cluster-glue for openSUSE:Factory
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 dmuhameda...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes
2011-09-23 01:53:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2011-12-25 17:33:38.0 +0100
@@ -1,0 +2,55 @@
+Mon Dec 12 13:24:22 UTC 2011 - dmuhameda...@suse.com
+
+- 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 - dmuhameda...@suse.com
+
+- 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 - dmuhameda...@suse.com
+
+- hb_report: improve destination directory handling (bnc#727295)
+- Upstream version cs: 4b08977bece3
+
+---
+Mon Oct 24 13:12:38 UTC 2011 - dmuhameda...@suse.com
+
+- 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 - dmuhameda...@suse.com
+
+- 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 - dmuhameda...@suse.com
+
+- Upstream version cs: f1d722d9cef1
+
+---
+Mon Oct 10 13:28:50 UTC 2011 - dmuhameda...@suse.com
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.JUAEnD/_new 2011-12-25 17:33:39.0 +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:
commit cluster-glue for openSUSE:Factory
Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at Tue Mar 15 10:18:32 CET 2011.
--- cluster-glue/cluster-glue.changes 2011-02-08 14:40:12.0 +0100
+++ /mounts/work_src_done/STABLE/cluster-glue/cluster-glue.changes
2011-03-11 09:09:37.0 +0100
@@ -1,0 +2,5 @@
+Fri Mar 11 08:05:21 UTC 2011 - co...@novell.com
+
+- prereq sysvinit services and don't start in !network runlevels
+
+---
calling whatdependson for head-i586
New:
fix-runlevels.diff
Other differences:
--
++ cluster-glue.spec ++
--- /var/tmp/diff_new_pack.uSuJQt/_old 2011-03-15 10:18:09.0 +0100
+++ /var/tmp/diff_new_pack.uSuJQt/_new 2011-03-15 10:18:09.0 +0100
@@ -37,11 +37,12 @@
Name: cluster-glue
Summary:The Heartbeat Subsystem for High-Availability Linux
Version:1.0.7
-Release:1
+Release:7
License:GPLv2 ; LGPLv2.1+
Url:http://linux-ha.org/
Group: Productivity/Clustering/HA
Source: cluster-glue-%{version}.tar.bz2
+Patch0: fix-runlevels.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv:on
BuildRequires: autoconf automake e2fsprogs-devel glib2-devel libtool
libxml2-devel pkgconfig python-devel
@@ -50,6 +51,7 @@
BuildRequires: help2man
%if 0%{?suse_version} 1130
BuildRequires: libnet-devel
+PreReq: sysvinit(network) sysvinit(syslog)
%else
BuildRequires: libnet
%endif
@@ -86,19 +88,6 @@
- IPv4 ping pseudo-cluster members.
-
-
-Authors:
-
-Alan Robertson al...@unix.sh
-Andrew Beekhof abeek...@suse.de
-Guochun Shi g...@ncsa.uiuc.edu
-Horms ho...@verge.net.net
-Huang Zhen zhenh...@cn.ibm.com
-Lars Marowsky-Bree l...@suse.de
-Sun Jiang Dong ha...@cn.ibm.com
-(See doc/AUTHORS)
-
%package -n libglue2
License:GPLv2 ; LGPLv2.1+
Summary:The Pacemaker scalable High-Availability cluster resource
manager
@@ -111,19 +100,6 @@
A collection of libraries that are useful for writing cluster managers
such as Pacemaker.
-
-
-Authors:
-
-Alan Robertson al...@unix.sh
-Andrew Beekhof abeek...@suse.de
-Guochun Shi g...@ncsa.uiuc.edu
-Horms ho...@verge.net.net
-Huang Zhen zhenh...@cn.ibm.com
-Lars Marowsky-Bree l...@suse.de
-Sun Jiang Dong ha...@cn.ibm.com
-(See doc/AUTHORS)
-
%package -n libglue-devel
License:GPLv2 ; LGPLv2.1+
Summary:The Heartbeat Subsystem for High-Availability Linux
@@ -155,22 +131,10 @@
- IPv4 ping pseudo-cluster members.
-
-
-Authors:
-
-Alan Robertson al...@unix.sh
-Andrew Beekhof abeek...@suse.de
-Guochun Shi g...@ncsa.uiuc.edu
-Horms ho...@verge.net.net
-Huang Zhen zhenh...@cn.ibm.com
-Lars Marowsky-Bree l...@suse.de
-Sun Jiang Dong ha...@cn.ibm.com
-(See doc/AUTHORS)
-
%prep
###
%setup -n cluster-glue -q
+%patch0 -p1
###
%build
++ fix-runlevels.diff ++
Index: cluster-glue/logd/logd.in
===
--- cluster-glue.orig/logd/logd.in 2011-01-31 10:15:04.0 +0100
+++ cluster-glue/logd/logd.in 2011-03-11 09:04:58.627390876 +0100
@@ -28,7 +28,7 @@
# Required-Start: $network $syslog $remote_fs
# Required-Stop: $network $syslog $remote_fs
# X-Start-Before: heartbeat openais corosync
-# Default-Start: 2 3 4 5
+# Default-Start: 3 5
# Default-Stop: 0 1 6
### END INIT INFO
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
