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.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes 2015-10-24 18:56:18.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Oct 16 16:03:59 UTC 2015 - [email protected] + +- 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.000000000 +0200 +++ /var/tmp/diff_new_pack.d4Wf28/_new 2015-10-24 18:56:19.000000000 +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 libraries for writing cluster managers -Group: Productivity/Clustering/HA +Group: Development/Libraries/C and C++ Requires: %{name} = %{version}-%{release} Requires: libglue2 = %{version}-%{release} Conflicts: libheartbeat-devel < 3.0.2 @@ -166,20 +145,14 @@ %prep ########################################################### -%setup -n cluster-glue -q +%setup -q %patch1 -p1 -%patch2 -p1 %patch4 -p1 -%patch5 -p1 %patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 ########################################################### %build +cp %{S:3} ./hb_report/hb_report.in CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" export CFLAGS ./autogen.sh @@ -284,7 +257,6 @@ %{_datadir}/%{name}/ha_log.sh %{_sbindir}/ha_logger %{_sbindir}/hb_report -#%{_sbindir}/lrmadmin %{_sbindir}/cibsecret %{_sbindir}/meatclient %{_sbindir}/stonith @@ -293,14 +265,12 @@ %{_unitdir}/logd.service %endif -#%{_sysconfdir}/init.d/logd %doc %{_mandir}/man1/* %doc %{_mandir}/man8/* %doc AUTHORS %doc COPYING %doc logd/logd.cf %{_sbindir}/rclogd -#%{_libdir}/heartbeat/lrmd %{_libdir}/heartbeat/ha_logd %{_libdir}/heartbeat/plugins/RAExec/*.so %{_libdir}/heartbeat/plugins/InterfaceMgr/*.so @@ -310,8 +280,6 @@ %exclude %{_libdir}/stonith/plugins/stonith2/ssh.so %exclude %{_libdir}/stonith/plugins/external/ssh %exclude %{_libdir}/stonith/plugins/stonith2/bladehpi.so -# %exclude %{_libdir}/stonith/plugins/stonith2/apcmastersnmp.so -# %exclude %{_libdir}/stonith/plugins/stonith2/wti_mpc.so %{_libdir}/stonith/plugins/stonith2/*.so %{_libdir}/stonith/plugins/stonith2/*.py %{_libdir}/stonith/plugins/xen0-ha-dom0-stonith-helper @@ -322,13 +290,6 @@ %doc AUTHORS %doc COPYING.LIB -# %files -n stonith-snmp -# %defattr(-,root,root) -# %{_libdir}/stonith/plugins/stonith2/apcmastersnmp.so -# %{_libdir}/stonith/plugins/stonith2/wti_mpc.so -# %doc AUTHORS -# %doc COPYING.LIB - %files -n stonith-bladehpi %defattr(-,root,root) %{_libdir}/stonith/plugins/stonith2/bladehpi.so @@ -353,7 +314,6 @@ %exclude %{_includedir}/heartbeat/lrm %{_includedir}/stonith %{_includedir}/pils -#%{_datadir}/%{name}/lrmtest %{_libdir}/heartbeat/plugins/test/test.so %{_libdir}/stonith/plugins/stonith2/null.so %{_libdir}/stonith/plugins/stonith2/ssh.so ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">http://hg.linux-ha.org/glue</param> <param name="scm">hg</param> <param name="filename">cluster-glue</param> <param name="versionformat">1.0.12+hg{rev}</param> <param name="revision">tip</param> </service> <service name="recompress" mode="disabled"> <param name="file">cluster-glue*.tar</param> <param name="compression">bz2</param> </service> <service name="set_version" mode="disabled"> <param name="basename">cluster-glue</param> </service> </services> ++++++ hb_report.in ++++++ #!/bin/sh # # Copyright (C) 2007 Dejan Muhamedagic <[email protected]> # Copyright (C) 2015 Kristoffer Gronlund <[email protected]> # # Replaced with crm report PARENT_COMMAND="$(ps -o comm= $PPID)" PROG="$(basename "$0")" die() { echo "$PROG: $*" exit 1 } [ "$(basename "$PARENT_COMMAND")" = "crm" ] && die "called itself in a loop, aborting" if which crm > /dev/null 2>&1; then crm report "$@" elif [ -x /usr/sbin/crm ]; then /usr/sbin/crm report "$@" else die "hb_report has been deprecated: Please install crmsh, which replaces it" fi
