Hello community,
here is the log from the commit of package resource-agents for openSUSE:Factory
checked in at 2017-02-06 14:33:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/resource-agents (Old)
and /work/SRC/openSUSE:Factory/.resource-agents.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "resource-agents"
Changes:
--------
--- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes
2016-12-01 10:23:07.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.resource-agents.new/resource-agents.changes
2017-02-06 14:33:30.544034094 +0100
@@ -1,0 +2,63 @@
+Wed Feb 01 18:43:15 UTC 2017 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1485962683.3b5faae:
+ * Also backup users permissions. Skip guest user permission for vhost /
+ * Low: slapd: Change of the stop processing.
+ * LVM: add error messages for partial_activation
+ * Low: apache: Reduce log spam for success
+ * Low: findif.sh: Correctly redirect output to /dev/null
+ * Low: eDir88: Fix incorrect shell usage
+ * Low: redis: Fix error in log output
+ * Low: tomcat: Fix incorrect shell usage
+ * Low: rabbitmq-cluster: Fix incorrect shell usage
+ * Low: Filesystem: Fix incorrect shell usage
+ * Low: nginx: Fix incorrect shell usage
+ * Low: ServeRAID: Fix incorrect shell usage
+ * Low: postfix: data_dir loop could only ever run once
+ * Low: SysInfo: Convert test series to legal syntax
+ * tomcat: fix systemd tomcat start script check
+ * galera: make last commit parsing compatible with mariadb 10.1.18+
+ * galera: prevent promote right after demote
+ * ifcheck must not suppress stdout of "ip" command so that it can be printed
out in case of an error (e.g., usage in findif_check_params).
+ * Medium: IPaddr2: add option to enable sending refresh arp packets in
monitor
+ * Low: IPaddr2: Log refresh arp packets at debug level instead of info
+ * pgsql: fix problem with creating replication slot names, when node count
greather then 2
+ * Low: Update outdated mailing list/wiki references
+ * Enable dump/restore users from RabbitMQ ver. 3.6.x
+ * Don't run scriptlets if Mnesia isn't available
+ * Don't call erlang:halt/0 inside of the working node
+ * Remove file only if successfully imported users
+ * Dump users only if non-empty
+ * Improve dump/restore ofusers' permissions
+ * Restore users' permissions only if Mnesia is running
+ * RabbitMQ: Reset Mnesia before joining existing cluster
+ * portblock: Use -w (wait) to avoid "insufficient privileges" error
+ * portblock: version check for -w
+ * Double-quote value of synchronous_standby_names in rep_mode.conf
+ * specfile: make requirements general and update comments
+ * Filesystem: check if there are any mounts mounted under the mountpoint
+ * IPaddr2: return success on stop with invalid IP
+ * Fix typo in IPaddr2
+ * Fix grammar and spelling in some resource agents
+ * galera: allow names in wsrep_cluster_address to differ from pacemaker
nodes' names
+ * IPaddr2 detect duplicate IP
+ * redis: use "CLIENT KILL type normal" to notify clients of master being
demoted
+ * specfile: Add metadata.rng to the file to be collected
+ * Adds support for fstype=zfs on Filesystem resource agent
+ * LVM: fix partial activation
+ * galera: revert "long SST monitoring" PR #684 and #762
+ * Medium: exportfs: Only strip brackets from edges of clientspec
(bsc#1022223)
+
+- Rebase patches:
+ * Add 0001-LVM-Default-partial_activation-to-true-in-SLE-HAE.patch
+ * Add 0002-nfsserver-fix-path-to-sm-notify.patch
+ * Add 0003-ldirectord-don-t-create-subsys-lock.patch
+ * Add 0004-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch
+ * Add 0005-Medium-CTDB-Use-logging-syntax-for-ctdbd-bsc-981863.patch
+ * Remove lvm-vg-partial-active.diff
+ * Remove resource-agents-nfsserver-sle11.patch
+ * Remove no-var-lock-subsys.patch
+ * Remove 0006-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch
+ * Remove 0001-Medium-CTDB-Use-logging-syntax-for-ctdbd-bsc-981863.patch
+
+-------------------------------------------------------------------
Old:
----
0001-Medium-CTDB-Use-logging-syntax-for-ctdbd-bsc-981863.patch
0006-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch
lvm-vg-partial-active.diff
no-var-lock-subsys.patch
resource-agents-3.9.7+git.1478106349.5ff08d4.tar.xz
resource-agents-nfsserver-sle11.patch
New:
----
0001-LVM-Default-partial_activation-to-true-in-SLE-HAE.patch
0002-nfsserver-fix-path-to-sm-notify.patch
0003-ldirectord-don-t-create-subsys-lock.patch
0004-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch
0005-Medium-CTDB-Use-logging-syntax-for-ctdbd-bsc-981863.patch
resource-agents-4.0.0+git.1485962683.3b5faae.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ resource-agents.spec ++++++
--- /var/tmp/diff_new_pack.RZq0rZ/_old 2017-02-06 14:33:31.003967639 +0100
+++ /var/tmp/diff_new_pack.RZq0rZ/_new 2017-02-06 14:33:31.007967061 +0100
@@ -1,7 +1,7 @@
#
# spec file for package resource-agents
#
-# 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
@@ -17,7 +17,7 @@
Name: resource-agents
-Version: 3.9.7+git.1478106349.5ff08d4
+Version: 4.0.0+git.1485962683.3b5faae
Release: 0
Summary: Open Source HA Reusable Cluster Resource Scripts
License: GPL-2.0 and LGPL-2.1+ and GPL-3.0+
@@ -26,16 +26,17 @@
Source: resource-agents-%{version}.tar.xz
Source1: resource-agents.conf
Source2: monitoring-plugins-metadata.tar.bz2
+
# PATCH-FIX-OPENSUSE: activate VG with partial PV by default
-Patch2: lvm-vg-partial-active.diff
+Patch1: 0001-LVM-Default-partial_activation-to-true-in-SLE-HAE.patch
# PATCH-FIX-OPENSUSE: fix path to sm-notify
-Patch3: resource-agents-nfsserver-sle11.patch
+Patch2: 0002-nfsserver-fix-path-to-sm-notify.patch
# PATCH-FIX-OPENSUSE: ldirectord: don't create subsys lock
-Patch4: no-var-lock-subsys.patch
+Patch3: 0003-ldirectord-don-t-create-subsys-lock.patch
# PATCH-FIX-OPENSUSE: Revert moving binaries to /usr/libexec
-Patch8: 0006-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch
+Patch4: 0004-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch
# PATCH-FIX-OPENSUSE: Medium: CTDB: Use --logging syntax for ctdbd (bsc#981863)
-Patch10: 0001-Medium-CTDB-Use-logging-syntax-for-ctdbd-bsc-981863.patch
+Patch5: 0005-Medium-CTDB-Use-logging-syntax-for-ctdbd-bsc-981863.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
@@ -100,7 +101,12 @@
pages of individual nagios plugins.
%prep
-%autosetup -p1
+%setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
autoreconf -fvi
@@ -168,6 +174,7 @@
%dir %{_prefix}/lib/tmpfiles.d
%{_libexecdir}/tmpfiles.d/resource-agents.conf
%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*.rng
%dir %{_datadir}/%{name}/ocft
%dir %{_datadir}/%{name}/ocft/configs
%config(noreplace) %{_datadir}/%{name}/ocft/configs/*
++++++ 0001-LVM-Default-partial_activation-to-true-in-SLE-HAE.patch ++++++
>From 177ced07b7173798eaa5bca803e5dc1e003aa0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <k...@koru.se>
Date: Wed, 1 Feb 2017 14:51:23 +0100
Subject: [PATCH 1/5] LVM: Default partial_activation to true in SLE HAE
---
heartbeat/LVM | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/heartbeat/LVM b/heartbeat/LVM
index 90a900b..e9e5813 100755
--- a/heartbeat/LVM
+++ b/heartbeat/LVM
@@ -100,10 +100,10 @@ If "exclusive" is set on a non clustered volume group,
this overrides the tag to
<longdesc lang="en">
If set, the volume group will be activated partially even with some
physical volumes missing. It helps to set to true when using mirrored
-logical volumes.
+logical volumes. Set to true by default in SLE HAE.
</longdesc>
<shortdesc lang="en">Activate VG partially when missing PVs</shortdesc>
-<content type="string" default="false" />
+<content type="string" default="true" />
</parameter>
</parameters>
@@ -368,7 +368,7 @@ get_activate_options()
2) options="${options}ey";;
esac
- if ocf_is_true "$OCF_RESKEY_partial_activation" ; then
+ if ocf_is_true "$PARTIAL_INVOCATION" ; then
options="${options} --partial"
fi
@@ -682,6 +682,7 @@ then
exit $OCF_ERR_INSTALLED
fi
LVM_MAJOR="${LVM_VERSION%%.*}"
+PARTIAL_INVOCATION=${OCF_RESKEY_partial_activation:-"true"}
VOLUME=$OCF_RESKEY_volgrpname
OP_METHOD=$1
--
2.10.1
++++++ 0002-nfsserver-fix-path-to-sm-notify.patch ++++++
>From e2aedf01dd440e3d4d5f88c5966c13159e763966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <k...@koru.se>
Date: Wed, 1 Feb 2017 14:52:01 +0100
Subject: [PATCH 2/5] nfsserver: fix path to sm-notify
---
heartbeat/nfsserver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver
index bac5bbb..6e32d37 100755
--- a/heartbeat/nfsserver
+++ b/heartbeat/nfsserver
@@ -27,7 +27,7 @@ do
done
DEFAULT_NOTIFY_CMD=`which sm-notify`
-DEFAULT_NOTIFY_CMD=${DEFAULT_NOTIFY_CMD:-"/sbin/sm-notify"}
+DEFAULT_NOTIFY_CMD=${DEFAULT_NOTIFY_CMD:-"/usr/sbin/sm-notify"}
DEFAULT_NOTIFY_FOREGROUND="false"
DEFAULT_RPCPIPEFS_DIR="/var/lib/nfs/rpc_pipefs"
EXEC_MODE=0
--
2.10.1
++++++ 0003-ldirectord-don-t-create-subsys-lock.patch ++++++
>From 33607fcb964ed44876a2c5af50fa7590142fc333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <k...@koru.se>
Date: Wed, 1 Feb 2017 14:52:50 +0100
Subject: [PATCH 3/5] ldirectord: don't create subsys lock
---
ldirectord/init.d/ldirectord.in | 2 --
1 file changed, 2 deletions(-)
diff --git a/ldirectord/init.d/ldirectord.in b/ldirectord/init.d/ldirectord.in
index 9d8083e..f7ab552 100755
--- a/ldirectord/init.d/ldirectord.in
+++ b/ldirectord/init.d/ldirectord.in
@@ -60,11 +60,9 @@ action() {
case "$1" in
start)
action "Starting ldirectord" $DAEMON start
- touch /var/lock/subsys/ldirectord
;;
stop)
action "Stopping ldirectord" $DAEMON stop
- rm -f /var/lock/subsys/ldirectord
;;
restart)
action "Restarting ldirectord" $DAEMON restart
--
2.10.1
++++++ 0006-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch ->
0004-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch ++++++
---
/work/SRC/openSUSE:Factory/resource-agents/0006-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch
2014-01-23 15:55:37.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.resource-agents.new/0004-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch
2017-02-06 14:33:30.396055475 +0100
@@ -1,7 +1,7 @@
-From 65dcc5d74aa1f4098a37fcb3961d4b13b70772a5 Mon Sep 17 00:00:00 2001
+From db257a532c27e592b8cf7161acf4bf0652e3fe6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <k...@koru.se>
-Date: Wed, 22 Jan 2014 11:20:23 +0100
-Subject: [PATCH 6/6] Revert "Low: build: Move binaries in /usr/lib/heartbeat
+Date: Wed, 1 Feb 2017 14:53:28 +0100
+Subject: [PATCH 4/5] Revert "Low: build: Move binaries in /usr/lib/heartbeat
to /usr/libexec/heartbeat to avoid multi-lib inconsistencies"
This reverts commit 1e79b7831d9daf9cbfa852f0d6f909d2f7ec4a2a.
@@ -13,7 +13,7 @@
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/heartbeat/Makefile.am b/heartbeat/Makefile.am
-index cbaa9d9d3d02..99bda6418f81 100644
+index 91d4090..e03b9da 100644
--- a/heartbeat/Makefile.am
+++ b/heartbeat/Makefile.am
@@ -25,7 +25,7 @@ EXTRA_DIST = $(ocf_SCRIPTS) $(ocfcommon_DATA) \
@@ -26,7 +26,7 @@
ocfdir = $(OCF_RA_DIR_PREFIX)/heartbeat
diff --git a/heartbeat/ocf-directories.in b/heartbeat/ocf-directories.in
-index 6e0a9d542e2f..26004a3eebb1 100644
+index 8d70776..7246e08 100644
--- a/heartbeat/ocf-directories.in
+++ b/heartbeat/ocf-directories.in
@@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@
@@ -39,10 +39,10 @@
: ${HA_DATEFMT:="%Y/%m/%d_%T "}
: ${HA_DEBUGLOG:=/dev/null}
diff --git a/resource-agents.spec.in b/resource-agents.spec.in
-index 64557dbece0f..5c831cb5212d 100644
+index d87364d..aa087ec 100644
--- a/resource-agents.spec.in
+++ b/resource-agents.spec.in
-@@ -255,7 +255,7 @@ rm -rf %{buildroot}
+@@ -280,7 +280,7 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/ha.d
%{_sysconfdir}/ha.d/shellfuncs
@@ -52,7 +52,7 @@
%post -n resource-agents
if [ $1 = 2 ]; then
diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 1186967cfbcb..71292bf33acc 100644
+index 1186967..71292bf 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -23,7 +23,7 @@ SUBDIRS = ocft
@@ -65,5 +65,5 @@
EXTRA_DIST = ocf-tester.8 sfex_init.8
--
-1.8.4
+2.10.1
++++++ 0001-Medium-CTDB-Use-logging-syntax-for-ctdbd-bsc-981863.patch ->
0005-Medium-CTDB-Use-logging-syntax-for-ctdbd-bsc-981863.patch ++++++
---
/work/SRC/openSUSE:Factory/resource-agents/0001-Medium-CTDB-Use-logging-syntax-for-ctdbd-bsc-981863.patch
2016-06-05 14:19:18.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.resource-agents.new/0005-Medium-CTDB-Use-logging-syntax-for-ctdbd-bsc-981863.patch
2017-02-06 14:33:30.416052586 +0100
@@ -1,7 +1,7 @@
-From 968f22a83ca96ab1ee2fc313f3daa93b7985c028 Mon Sep 17 00:00:00 2001
-From: James McDonough <jmcdono...@suse.com>
-Date: Mon, 30 May 2016 13:10:10 +0200
-Subject: [PATCH] Medium: CTDB: Use --logging syntax for ctdbd (bsc#981863)
+From a0e995ff40a3b98dc3cb89d251748d4a2d5e8d46 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <k...@koru.se>
+Date: Wed, 1 Feb 2017 14:55:09 +0100
+Subject: [PATCH 5/5] Medium: CTDB: Use --logging syntax for ctdbd (bsc#981863)
The --logfile parameter in ctdb has been replaced with
--logging, which allows for file: or syslog:.
@@ -10,15 +10,15 @@
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/heartbeat/CTDB b/heartbeat/CTDB
-index 6cfff63..b2c0775 100755
+index b23ffae..9fe8f18 100755
--- a/heartbeat/CTDB
+++ b/heartbeat/CTDB
-@@ -566,9 +566,9 @@ ctdb_start() {
- enable_event_scripts
+@@ -572,9 +572,9 @@ ctdb_start() {
# Use logfile by default, or syslog if asked for
-- local log_option="--logfile=$OCF_RESKEY_ctdb_logfile"
-+ local log_option="--logging=file:$OCF_RESKEY_ctdb_logfile"
+ local log_option
+- log_option="--logfile=$OCF_RESKEY_ctdb_logfile"
++ log_option="--logging=file:$OCF_RESKEY_ctdb_logfile"
if [ "$OCF_RESKEY_ctdb_logfile" = "syslog" ]; then
- log_option="--syslog"
+ log_option="--logging=syslog"
@@ -26,5 +26,5 @@
# ensure the logfile's directory exists, otherwise ctdb will
fail to start
mkdir -p $(dirname $OCF_RESKEY_ctdb_logfile)
--
-2.8.3
+2.10.1
++++++ _service ++++++
--- /var/tmp/diff_new_pack.RZq0rZ/_old 2017-02-06 14:33:31.091954926 +0100
+++ /var/tmp/diff_new_pack.RZq0rZ/_new 2017-02-06 14:33:31.091954926 +0100
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="filename">resource-agents</param>
- <param name="versionformat">3.9.7+git.%ct.%h</param>
+ <param name="versionformat">4.0.0+git.%ct.%h</param>
<param name="revision">master</param>
<param name="changesgenerate">enable</param>
</service>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.RZq0rZ/_old 2017-02-06 14:33:31.123950303 +0100
+++ /var/tmp/diff_new_pack.RZq0rZ/_new 2017-02-06 14:33:31.123950303 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/resource-agents.git</param>
-<param name="changesrevision">5ff08d4aef4bd693eccbc6072205e5fb88da9c92</param>
+<param name="changesrevision">816951e9cfe290cfdfda65dce3d566cead8451fc</param>
</service>
-</servicedata>
+</servicedata>
\ No newline at end of file
++++++ resource-agents-3.9.7+git.1478106349.5ff08d4.tar.xz ->
resource-agents-4.0.0+git.1485962683.3b5faae.tar.xz ++++++
++++ 4954 lines of diff (skipped)
