Hello community,
here is the log from the commit of package pacemaker for openSUSE:Factory
checked in at 2015-10-17 16:38:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pacemaker (Old)
and /work/SRC/openSUSE:Factory/.pacemaker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pacemaker"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pacemaker/pacemaker.changes 2015-09-24
07:17:23.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pacemaker.new/pacemaker.changes 2015-10-17
16:38:39.000000000 +0200
@@ -1,0 +2,52 @@
+Thu Oct 8 10:31:45 UTC 2015 - y...@suse.com
+
+- fencing: Return a provider for the internal fencing agent "#watchdog"
instead of logging an error (bsc#949441)
+ * bug-949441_pacemaker-fencing-provider-internal.patch
+
+- spec: Move the normal resource agents into pacemaker-cli package (bsc#947197)
+- spec: Move logrotate configuration file into pacemaker-cli package
(bsc#947197)
+- spec: Move attrd_updater, crm_attribute and crm_master into pacemaker-cli
package (bsc#947197)
+- spec: Move xml schema files and PCMK-MIB.txt into pacemaker-cli package
(bsc#947197)
+
+-------------------------------------------------------------------
+Thu Oct 8 10:29:54 UTC 2015 - y...@suse.com
+
+- crm_resource: Correctly observe --force when deleting and updating
attributes (bsc#948197)
+- crm_resource: Correctly delete existing meta attributes regardless of their
position in the heirarchy (bsc#948197)
+- fencing,libfencing: use level tag consistently in internal XML
+- crm_resource: Correctly update existing meta attributes regardless of their
position in the heirarchy (bsc#948197)
+- crmd: properly detect CIB update failures for remote nodes
+- cibadmin: Prevent potential use-of-NULL in print_xml_output() (bsc#947180)
+- Fencing: The device list is expected to be comma separated
+- Tools: Do not send command lines to syslog
+- Tools: Repair the logging of 'interesting' command-lines
+- PE: resolve memory leak
+- libfencing: make topology level removal compatible with latest stonithd API
+- fencing: parse from correct XML location when registering/unregistering
topology
+- tools: improve error handling when modifying configuration
+- crmd,libcrmcommon,libservices,tools: potential memory leaks (bsc#948197)
+- crmd,fencing: avoid potential null dereference in string searches
+- typo: OPSTIONS -> OPTIONS in crm_mon.sysconfig
+- cib: Check if the configuration changes with cib_config_changed() only for
v1 diffs (bsc#946224)
+- liblrmd: don't print error if remote key environment variable unset
+- libcib: properly handle temporary file
+- libcrmcommon: better validation of environment variable value
+- crmd: avoid potential null dereference
+- libcib: potential user input overflow
+- controld: replace bashism
+- PE: drop probe_complete actions
+- PE: Allow resources to start and stop as soon as their state is known on all
nodes
+- Fencing: Correctly construct simple topologies with stonith_admin
+- Fencing: Correctly remove topologies and detect invalid entries
+
+- remote: Revise a misleading message in the ocf:pacemaker:remote resource
agent (bsc#946332)
+ * Drop bug-946332_pacemaker-resource-agent-remote-message.patch which has
been merged upstream
+
+- remote: Correctly display the usage of the ocf:pacemaker:remote resource
agent (bsc#946332)
+ * Drop bug-946332_pacemaker-resource-agent-remote-usage.patch which has been
merged upstream
+
+- libcib: find_nvpair_attr_delegate: check buffer overflow
+- libcib: find_nvpair_attr_delegate: check alloc failure
+- Upstream version cs: 7906df92a713052db1edae851579ea229d8a5393
+
+-------------------------------------------------------------------
@@ -37 +89 @@
-- services: Reduce severity of noisy log messages
+- services: Reduce severity of noisy log messages (bsc#943319)
Old:
----
bug-946332_pacemaker-resource-agent-remote-message.patch
bug-946332_pacemaker-resource-agent-remote-usage.patch
pacemaker-1.1.13+git20150917.20c2178.tar.bz2
New:
----
bug-949441_pacemaker-fencing-provider-internal.patch
pacemaker-1.1.13+git20151008.7906df9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pacemaker.spec ++++++
--- /var/tmp/diff_new_pack.0VJrti/_old 2015-10-17 16:38:40.000000000 +0200
+++ /var/tmp/diff_new_pack.0VJrti/_new 2015-10-17 16:38:40.000000000 +0200
@@ -21,8 +21,9 @@
%global pcmk_docdir %{_docdir}/%{name}
%global specversion 1
-%global upstream_version HEAD
-%global upstream_prefix ClusterLabs-pacemaker
+%global commit HEAD
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global github_owner ClusterLabs
# Turn off the auto compilation of python files not in the site-packages
directory
# Needed so that the -devel package is multilib compliant
@@ -68,7 +69,7 @@
%endif
%if %{with pre_release}
-%global pcmk_release 0.%{specversion}.%{upstream_version}.git
+%global pcmk_release 0.%{specversion}.%{shortcommit}.git
%else
%global pcmk_release %{specversion}
%endif
@@ -99,13 +100,12 @@
Summary: Scalable High-Availability cluster resource manager
License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Clustering/HA
-Version: 1.1.13+git20150917.20c2178
+Version: 1.1.13+git20151008.7906df9
Release: 0
#Release: %{pcmk_release}%{?dist}
Url: http://www.clusterlabs.org
-# export VER={upstream_version}
-# wget --no-check-certificate -O ClusterLabs-pacemaker-${VER}.tar.gz
https://github.com/ClusterLabs/pacemaker/tarball/${VER}
+#Source0:
https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
Source0: %{name}-%{version}.tar.bz2
Source100: pacemaker.rpmlintrc
Patch1: bug-806256_pacemaker-log-level-notice.patch
@@ -116,8 +116,7 @@
Patch6: bug-812269_pacemaker-fencing-device-register-messages.patch
Patch7: pacemaker-Wno-format-signedness.patch
Patch8: bug-943295_pacemaker-lrmd-log-notice.patch
-Patch9: bug-946332_pacemaker-resource-agent-remote-usage.patch
-Patch10: bug-946332_pacemaker-resource-agent-remote-message.patch
+Patch9: bug-949441_pacemaker-fencing-provider-internal.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: pacemaker-ticket-support = 2.0
Conflicts: heartbeat < 3.0
@@ -141,14 +140,14 @@
%endif
%if 0%{?rhel} > 0
-ExclusiveArch: i686 x86_64
+ExclusiveArch: i386 i686 x86_64
%endif
# Required for core functionality
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
-BuildRequires: glib2-devel
+BuildRequires: pkgconfig(glib-2.0)
%if 0%{?suse_version}
BuildRequires: libbz2-devel
@@ -176,7 +175,7 @@
# Enables optional functionality
BuildRequires: bison
#BuildRequires: byacc
-BuildRequires: dbus-1-devel
+BuildRequires: pkgconfig(dbus-1)
%if 0%{?suse_version} > 1100
BuildRequires: docbook-xsl-stylesheets
@@ -390,7 +389,7 @@
%endif
%prep
-#%setup -q -n %{name}%{upstream_prefix}-%{upstream_version}
+#%setup -q -n %{name}-%{commit}
%setup -q -n %{name}-%{version}
%patch1 -p1
%patch2 -p1
@@ -401,7 +400,6 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
-%patch10 -p1
# Force the local time
#
@@ -480,7 +478,7 @@
find %{buildroot} -name '*.rng' -type f -print0 | xargs -0 chmod a-x
find %{buildroot} -name '*.dtd' -type f -print0 | xargs -0 chmod a-x
-# Dont package static libs
+# Don't package static libs
find %{buildroot} -name '*.a' -type f -print0 | xargs -0 rm -f
find %{buildroot} -name '*.la' -type f -print0 | xargs -0 rm -f
@@ -628,10 +626,7 @@
###########################################################
%defattr(-,root,root)
-%exclude %{_datadir}/pacemaker/tests
-
#%config(noreplace) %{_sysconfdir}/sysconfig/pacemaker
-%config(noreplace) %{_sysconfdir}/logrotate.d/pacemaker
%{_sbindir}/pacemakerd
%if %{defined _unitdir}
@@ -641,28 +636,20 @@
%{_initrddir}/pacemaker
%endif
-%exclude %{_datadir}/pacemaker/report.common
-%exclude %{_datadir}/pacemaker/report.collector
-%{_datadir}/pacemaker
-%{_datadir}/snmp/mibs/PCMK-MIB.txt
%exclude %{_libexecdir}/pacemaker/lrmd_test
%exclude %{_sbindir}/pacemaker_remoted
%dir %{_libexecdir}/pacemaker
%{_libexecdir}/pacemaker/*
-%{_sbindir}/crm_attribute
-%{_sbindir}/crm_master
%{_sbindir}/crm_node
-%{_sbindir}/attrd_updater
%{_sbindir}/fence_legacy
%{_sbindir}/fence_pcmk
%{_sbindir}/stonith_admin
-%doc %{_mandir}/man7/*
-%doc %{_mandir}/man8/attrd_updater.*
-%doc %{_mandir}/man8/crm_attribute.*
+%doc %{_mandir}/man7/ocf_pacemaker_controld.*
+%doc %{_mandir}/man7/ocf_pacemaker_o2cb.*
+%doc %{_mandir}/man7/ocf_pacemaker_remote.*
%doc %{_mandir}/man8/crm_node.*
-%doc %{_mandir}/man8/crm_master.*
%doc %{_mandir}/man8/fence_pcmk.*
%doc %{_mandir}/man8/fence_legacy.*
%doc %{_mandir}/man8/pacemakerd.*
@@ -677,14 +664,16 @@
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cores
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/pengine
%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/blackbox
-%dir /usr/lib/ocf
-%dir /usr/lib/ocf/resource.d
-/usr/lib/ocf/resource.d/pacemaker
+/usr/lib/ocf/resource.d/pacemaker/controld
+/usr/lib/ocf/resource.d/pacemaker/o2cb
+/usr/lib/ocf/resource.d/pacemaker/remote
/usr/lib/ocf/resource.d/.isolation
+%if "%{?cs_version}" != "UNKNOWN"
%if 0%{?cs_version} < 2
%{_libexecdir}/lcrso/pacemaker.lcrso
%endif
+%endif
%if %{with upstart_job}
%config(noreplace) %{_sysconfdir}/init/pacemaker.conf
@@ -694,6 +683,9 @@
%files cli
%defattr(-,root,root)
+%config(noreplace) %{_sysconfdir}/logrotate.d/pacemaker
+#%config(noreplace) %{_sysconfdir}/sysconfig/crm_mon
+
%if %{defined _unitdir}
%{_unitdir}/crm_mon.service
%{_sbindir}/rccrm_mon
@@ -703,10 +695,13 @@
%config(noreplace) %{_sysconfdir}/init/crm_mon.conf
%endif
+%{_sbindir}/attrd_updater
%{_sbindir}/cibadmin
+%{_sbindir}/crm_attribute
%{_sbindir}/crm_diff
%{_sbindir}/crm_error
%{_sbindir}/crm_failcount
+%{_sbindir}/crm_master
%{_sbindir}/crm_mon
%{_sbindir}/crm_resource
%{_sbindir}/crm_standby
@@ -717,14 +712,26 @@
%{_sbindir}/crm_simulate
%{_sbindir}/crm_report
%{_sbindir}/crm_ticket
-%{_datadir}/pacemaker/report.common
-%{_datadir}/pacemaker/report.collector
+%exclude %{_datadir}/pacemaker/tests
+%{_datadir}/pacemaker
+%{_datadir}/snmp/mibs/PCMK-MIB.txt
+
+%exclude /usr/lib/ocf/resource.d/pacemaker/controld
+%exclude /usr/lib/ocf/resource.d/pacemaker/o2cb
+%exclude /usr/lib/ocf/resource.d/pacemaker/remote
+
+%dir /usr/lib/ocf
+%dir /usr/lib/ocf/resource.d
+/usr/lib/ocf/resource.d/pacemaker
+
+%config(noreplace) /var/adm/fillup-templates/sysconfig.pacemaker
%config(noreplace) /var/adm/fillup-templates/sysconfig.crm_mon
+%doc %{_mandir}/man7/*
+%exclude %{_mandir}/man7/ocf_pacemaker_controld.*
+%exclude %{_mandir}/man7/ocf_pacemaker_o2cb.*
+%exclude %{_mandir}/man7/ocf_pacemaker_remote.*
%doc %{_mandir}/man8/*
-%exclude %{_mandir}/man8/attrd_updater.*
-%exclude %{_mandir}/man8/crm_attribute.*
%exclude %{_mandir}/man8/crm_node.*
-%exclude %{_mandir}/man8/crm_master.*
%exclude %{_mandir}/man8/fence_pcmk.*
%exclude %{_mandir}/man8/fence_legacy.*
%exclude %{_mandir}/man8/pacemakerd.*
@@ -747,7 +754,6 @@
%{_libdir}/libpengine.so.*
%{_libdir}/libstonithd.so.*
%{_libdir}/libtransitioner.so.*
-%config(noreplace) /var/adm/fillup-templates/sysconfig.pacemaker
%doc COPYING.LIB
%doc AUTHORS
%{_libdir}/libcrmcluster.so.*
++++++ _service ++++++
--- /var/tmp/diff_new_pack.0VJrti/_old 2015-10-17 16:38:40.000000000 +0200
+++ /var/tmp/diff_new_pack.0VJrti/_new 2015-10-17 16:38:40.000000000 +0200
@@ -11,7 +11,7 @@
<param name="version">1.1.13</param>
-->
<param name="versionformat">1.1.13+git%cd.%h</param>
- <param name="revision">20c2178f076ff32fdf9ba9a467c193b8dac2f9e5</param>
+ <param name="revision">7906df92a713052db1edae851579ea229d8a5393</param>
</service>
<service name="recompress" mode="disabled">
++++++ bug-949441_pacemaker-fencing-provider-internal.patch ++++++
commit 61835593b43a5e0d29287f24fa5500f950b2bf6b
Author: Gao,Yan <y...@suse.com>
Date: Mon Oct 5 17:44:13 2015 +0200
Fix: fencing: Return a provider for the internal fencing agent "#watchdog"
instead of logging an error
diff --git a/lib/fencing/st_client.c b/lib/fencing/st_client.c
index b8f3967..b9fef3e 100644
--- a/lib/fencing/st_client.c
+++ b/lib/fencing/st_client.c
@@ -1499,8 +1499,13 @@ get_stonith_provider(const char *agent, const char
*provider)
#endif
}
- crm_err("No such device: %s", agent);
- return NULL;
+ if (safe_str_eq(provider, "internal")) {
+ return provider;
+
+ } else {
+ crm_err("No such device: %s", agent);
+ return NULL;
+ }
}
static gint
++++++ pacemaker-1.1.13+git20150917.20c2178.tar.bz2 ->
pacemaker-1.1.13+git20151008.7906df9.tar.bz2 ++++++
++++ 179273 lines of diff (skipped)
