Hello community, here is the log from the commit of package sbd for openSUSE:Factory checked in at 2017-06-12 15:33:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sbd (Old) and /work/SRC/openSUSE:Factory/.sbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sbd" Mon Jun 12 15:33:39 2017 rev:16 rq:502575 version:1.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sbd/sbd.changes 2017-03-31 15:09:33.959718635 +0200 +++ /work/SRC/openSUSE:Factory/.sbd.new/sbd.changes 2017-06-12 15:33:42.153606588 +0200 @@ -1,0 +2,17 @@ +Fri Jun 2 09:37:38 UTC 2017 - y...@suse.com + +- sbd-inquisitor: cleanup_servant_by_pid() should be static + * sbd-cleanup_servant_by_pid-static.patch + +- sbd.sh: Correctly handle SBD_DELAY_START for multiple SBD devices (bsc#1033934) +- sbd.sh: consistent use of SBD_BIN (bsc#1033934) +- Upstream version cs: a0bc43b17fcb997fe4c09731db2126ab350cfb50 + +------------------------------------------------------------------- +Wed May 31 12:17:20 UTC 2017 - y...@suse.com + +- Update to v1.3.0 +- spec: Do not automatically try to restart sbd.service on update (bsc#1033934) +- Upstream version cs: 4968e9c8602fbb990bed63cc96ca18f62e2181db (v1.3.0) + +------------------------------------------------------------------- Old: ---- sbd-1.2.1+20170306.4ee36fa.tar.bz2 New: ---- sbd-1.3.0+20170530.a0bc43b.tar.bz2 sbd-cleanup_servant_by_pid-static.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sbd.spec ++++++ --- /var/tmp/diff_new_pack.RPTZrF/_old 2017-06-12 15:33:42.825511823 +0200 +++ /var/tmp/diff_new_pack.RPTZrF/_new 2017-06-12 15:33:42.825511823 +0200 @@ -17,16 +17,17 @@ # -%global commit 1.2.1+20170306.4ee36fa +%global commit 1.3.0+20170530.a0bc43b Name: sbd -Version: 1.2.1 +Version: 1.3.0 Release: 0 Summary: Storage-based death License: GPL-2.0+ Group: Productivity/Clustering/HA Url: https://github.com/ClusterLabs/sbd Source: %{name}-%{commit}.tar.bz2 +Patch1: sbd-cleanup_servant_by_pid-static.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: e2fsprogs-devel @@ -80,12 +81,12 @@ %service_add_pre sbd_remote.service %preun -%service_del_preun sbd.service -%service_del_preun sbd_remote.service +%service_del_preun -n sbd.service +%service_del_preun -n sbd_remote.service %postun -%service_del_postun sbd.service -%service_del_postun sbd_remote.service +%service_del_postun -n sbd.service +%service_del_postun -n sbd_remote.service %files %defattr(-,root,root) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.RPTZrF/_old 2017-06-12 15:33:42.861506746 +0200 +++ /var/tmp/diff_new_pack.RPTZrF/_new 2017-06-12 15:33:42.865506182 +0200 @@ -4,7 +4,7 @@ <param name="exclude">.git</param> <param name="url">https://github.com/ClusterLabs/sbd.git</param> <param name="revision">opensuse</param> - <param name="versionformat">1.2.1.git.%ct.%h</param> + <param name="versionformat">1.3.0.git.%ct.%h</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.RPTZrF/_old 2017-06-12 15:33:42.885503362 +0200 +++ /var/tmp/diff_new_pack.RPTZrF/_new 2017-06-12 15:33:42.885503362 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/ClusterLabs/sbd.git</param> - <param name="changesrevision">4ee36fa33b57a1ad95678363911cfb02a92e1edb</param> + <param name="changesrevision">a0bc43b17fcb997fe4c09731db2126ab350cfb50</param> </service> </servicedata> ++++++ sbd-1.2.1+20170306.4ee36fa.tar.bz2 -> sbd-1.3.0+20170530.a0bc43b.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.2.1+20170306.4ee36fa/.git_info new/sbd-1.3.0+20170530.a0bc43b/.git_info --- old/sbd-1.2.1+20170306.4ee36fa/.git_info 2017-03-15 13:22:57.371420004 +0100 +++ new/sbd-1.3.0+20170530.a0bc43b/.git_info 2017-06-02 10:53:19.188935542 +0200 @@ -1 +1 @@ -v1.2.0-126-g4ee36fa +v1.3.0-6-ga0bc43b diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.2.1+20170306.4ee36fa/configure.ac new/sbd-1.3.0+20170530.a0bc43b/configure.ac --- old/sbd-1.2.1+20170306.4ee36fa/configure.ac 2017-03-06 15:26:43.000000000 +0100 +++ new/sbd-1.3.0+20170530.a0bc43b/configure.ac 2017-05-31 01:07:27.000000000 +0200 @@ -20,7 +20,7 @@ dnl checks for system services AC_INIT([sbd], - [1.2.1], + [1.3.0], [l...@suse.com]) AC_CANONICAL_HOST AC_CONFIG_AUX_DIR(.) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.2.1+20170306.4ee36fa/sbd.spec new/sbd-1.3.0+20170530.a0bc43b/sbd.spec --- old/sbd-1.2.1+20170306.4ee36fa/sbd.spec 2017-03-06 15:26:43.000000000 +0100 +++ new/sbd-1.3.0+20170530.a0bc43b/sbd.spec 2017-05-31 01:07:27.000000000 +0200 @@ -15,16 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%global commit 872e82f39db02eab3527ecfa392b1a930dd1964b +%global commit 4ee36fa33b57a1ad95678363911cfb02a92e1edb %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global github_owner beekhof -%global buildnum 5 +%global buildnum 1 Name: sbd Summary: Storage-based death License: GPLv2+ Group: System Environment/Daemons -Version: 1.2.1 +Version: 1.3.0 Release: 0.%{buildnum}.%{shortcommit}.git%{?dist} Url: https://github.com/%{github_owner}/%{name} Source0: https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz @@ -113,6 +113,11 @@ %doc COPYING %changelog +* Sun Mar 26 2016 <klaus.wennin...@aon.at> - 1.3.0-0.1.4ee36fa3.git +- Changes since v1.2.0 like adding the possibility to have a + watchdog-only setup without shared-block-devices + legitimate a bump to v1.3.0. + * Mon Oct 13 2014 <and...@beekhof.net> - 1.2.1-0.4.3de531ed.git - Fixes for suitability to the el7 environment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.2.1+20170306.4ee36fa/src/sbd.sh new/sbd-1.3.0+20170530.a0bc43b/src/sbd.sh --- old/sbd-1.2.1+20170306.4ee36fa/src/sbd.sh 2017-03-06 15:26:43.000000000 +0100 +++ new/sbd-1.3.0+20170530.a0bc43b/src/sbd.sh 2017-05-31 01:07:27.000000000 +0200 @@ -67,7 +67,7 @@ exit 1 fi if ocf_is_true ${SBD_DELAY_START} ; then - sleep $(sbd -d "$SBD_DEVICE" dump | grep -m 1 msgwait | awk '{print $4}') 2>/dev/null + sleep $($SBD_BIN -d $SBD_DEVICE dump | grep -m 1 msgwait | awk '{print $4}') 2>/dev/null fi else return 0 ++++++ sbd-cleanup_servant_by_pid-static.patch ++++++ commit ddb57ad1aff67b3f7e6f2787c77d7872fb44703b Author: Gao,Yan <y...@suse.com> Date: Thu Jun 1 15:42:31 2017 +0200 Build: sbd-inquisitor: cleanup_servant_by_pid() should be static diff --git a/src/sbd-inquisitor.c b/src/sbd-inquisitor.c index 4facc4d..3c3a5a0 100644 --- a/src/sbd-inquisitor.c +++ b/src/sbd-inquisitor.c @@ -199,7 +199,7 @@ void servants_kill(void) } } -inline void cleanup_servant_by_pid(pid_t pid) +static inline void cleanup_servant_by_pid(pid_t pid) { struct servants_list_item* s;
