Hello community, here is the log from the commit of package sbd for openSUSE:Factory checked in at 2020-12-07 15:01:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sbd (Old) and /work/SRC/openSUSE:Factory/.sbd.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sbd" Mon Dec 7 15:01:47 2020 rev:37 rq:853540 version:1.4.2+20201202.0446439 Changes: -------- --- /work/SRC/openSUSE:Factory/sbd/sbd.changes 2020-11-02 09:42:20.937722514 +0100 +++ /work/SRC/openSUSE:Factory/.sbd.new.5913/sbd.changes 2020-12-07 15:01:48.428808722 +0100 @@ -1,0 +2,12 @@ +Fri Dec 04 10:43:43 UTC 2020 - Yan Gao <[email protected]> + +- Update to version 1.4.2+20201202.0446439 (v1.4.2): +- ship sbd.pc with basic sbd build information for downstream packages to use + +------------------------------------------------------------------- +Tue Nov 10 17:01:53 UTC 2020 - Yan Gao <[email protected]> + +- Update to version 1.4.1+20201105.507bd5f: +- sbd: inform the user to restart the sbd service (bsc#1179655) + +------------------------------------------------------------------- Old: ---- sbd-1.4.1+20200819.4a02ef2.tar.xz New: ---- sbd-1.4.2+20201202.0446439.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sbd.spec ++++++ --- /var/tmp/diff_new_pack.Pv09H4/_old 2020-12-07 15:01:49.016809379 +0100 +++ /var/tmp/diff_new_pack.Pv09H4/_new 2020-12-07 15:01:49.024809388 +0100 @@ -33,7 +33,7 @@ %global sync_resource_startup_sysconfig no Name: sbd -Version: 1.4.1+20200819.4a02ef2 +Version: 1.4.2+20201202.0446439 Release: 0 Summary: Storage-based death License: GPL-2.0-or-later @@ -125,6 +125,7 @@ %{_sbindir}/rcsbd %{_sbindir}/rcsbd_remote %{_datadir}/sbd +%{_datadir}/pkgconfig/sbd.pc %exclude %{_datadir}/sbd/regressions.sh %{_mandir}/man8/sbd* %{_unitdir}/sbd.service ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Pv09H4/_old 2020-12-07 15:01:49.048809415 +0100 +++ /var/tmp/diff_new_pack.Pv09H4/_new 2020-12-07 15:01:49.048809415 +0100 @@ -4,7 +4,7 @@ <param name="exclude">.git</param> <param name="url">https://github.com/ClusterLabs/sbd.git</param> <param name="revision">master</param> - <param name="versionformat">1.4.1+%cd.%h</param> + <param name="versionformat">1.4.2+%cd.%h</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Pv09H4/_old 2020-12-07 15:01:49.068809437 +0100 +++ /var/tmp/diff_new_pack.Pv09H4/_new 2020-12-07 15:01:49.068809437 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/ClusterLabs/sbd.git</param> - <param name="changesrevision">4a02ef21e43551ef10ca596ef9cbee5f0fb0f668</param> + <param name="changesrevision">044643922c3044c0bac2f91b1382ff3f2c64a4a2</param> </service> </servicedata> \ No newline at end of file ++++++ sbd-1.4.1+20200819.4a02ef2.tar.xz -> sbd-1.4.2+20201202.0446439.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.4.1+20200819.4a02ef2/Makefile.am new/sbd-1.4.2+20201202.0446439/Makefile.am --- old/sbd-1.4.1+20200819.4a02ef2/Makefile.am 2020-08-19 15:37:20.000000000 +0200 +++ new/sbd-1.4.2+20201202.0446439/Makefile.am 2020-12-02 21:26:13.000000000 +0100 @@ -3,7 +3,8 @@ # .gz because github doesn't support .xz yet :-( # this is modified # -TAG ?= $(shell git log --pretty="format:%H" -n 1 || sed -n -e "s/%global commit //p" sbd.spec)$(shell test -n "$$(git status -s)" && echo -n "-mod") +TAG ?= $(shell git log --pretty="format:%H" -n 1 || sed -n -e "s/%global longcommit\s*//p" sbd.spec)$(shell test -n "$$(git status -s)" && echo -n "-mod") +SPEC_VERSION ?= $(shell sed -n -e "s/Version:\s*//p" sbd.spec) distdir = $(PACKAGE)-$(TAG) TARFILE = $(distdir).tar.gz DIST_ARCHIVES = $(TARFILE) @@ -23,8 +24,9 @@ MOCK_OPTIONS ?= --resultdir=$(RPM_ROOT)/mock --no-cleanup-after BUILD_COUNTER ?= build.counter -LAST_COUNT = $(shell test ! -e $(BUILD_COUNTER) && echo 0; test -e $(BUILD_COUNTER) && cat $(BUILD_COUNTER)) -COUNT = $(shell expr 1 + $(LAST_COUNT)) +COUNT = $(shell expr 1 + 0$(shell cat $(BUILD_COUNTER))) + +COMMIT_COUNTER ?= $(shell git describe --tags --long --always --match v$(SPEC_VERSION) | cut -f 2 -d-) TESTS = tests/regressions.sh export SBD_BINARY := src/sbd @@ -33,6 +35,9 @@ EXTRA_DIST = sbd.spec tests/regressions.sh man/sbd.8.pod.in +pkgconfigdir = $(datadir)/pkgconfig +pkgconfig_DATA = sbd.pc + export: rm -f $(PACKAGE)-HEAD.tar.* if test "$(KEEP_EXISTING_TAR)" != "yes"; then \ @@ -43,7 +48,7 @@ echo `date`: Using existing tarball: $(TARFILE); \ else \ rm -f $(PACKAGE).tar.*; \ - (git archive --prefix=$(distdir)/ $(shell echo $(TAG)|cut -f1 -d-) || tar -c --transform="s,^,$(distdir)/," --exclude="*.tar.*" --exclude="$(distdir)" --exclude="*.o" --exclude="*.8" --exclude="config.*" --exclude="libtool" --exclude="ltmain.sh*" --exclude="Makefile" --exclude="Makefile.in" --exclude="stamp-*" --exclude="*.service" --exclude="sbd" --exclude="*.m4" --exclude="*.cache" --exclude="configure" --exclude="*.list" --exclude="depcomp" --exclude="install-sh" --exclude="missing" --exclude="compile" --exclude="sbd.sh" --exclude="sbd.sysconfig" --exclude="~" --exclude="*.swp" --exclude="*.patch" --exclude="*.diff" --exclude="*.orig" --exclude="*.rej" --exclude="*.rpm" --exclude="*.pod" --exclude=".deps" --exclude="test-driver" *) | gzip > $(TARFILE); \ + (git archive --prefix=$(distdir)/ $(shell echo $(TAG)|cut -f1 -d-) || tar -c --transform="s,^,$(distdir)/," --exclude="*.tar.*" --exclude="$(distdir)" --exclude="*.o" --exclude="*.8" --exclude="config.*" --exclude="libtool" --exclude="ltmain.sh*" --exclude="Makefile" --exclude="Makefile.in" --exclude="stamp-*" --exclude="*.service" --exclude="sbd" --exclude="*.m4" --exclude="*.cache" --exclude="configure" --exclude="*.list" --exclude="depcomp" --exclude="install-sh" --exclude="missing" --exclude="compile" --exclude="sbd.sh" --exclude="sbd.sysconfig" --exclude="~" --exclude="*.swp" --exclude="*.patch" --exclude="*.diff" --exclude="*.orig" --exclude="*.rej" --exclude="*.rpm" --exclude="*.pod" --exclude=".deps" --exclude="test-driver" --exclude="sbd.pc" --exclude="build.counter" *) | gzip > $(TARFILE); \ if test -n "$$(git status -s)" || test "$(INJECT_GIT_COMMIT)" = "yes"; then \ if test -n "$$(git status -s)"; then git diff HEAD --name-only|grep -v "^\."|xargs -n1 git diff HEAD > uncommitted.diff; fi; \ rm -rf $(distdir); tar -xzf $(TARFILE); rm $(TARFILE); \ @@ -63,13 +68,16 @@ rm -rf $(distdir) mkdir $(distdir) cp $(PACKAGE).spec $(distdir) - sed -i 's/global\ commit.*/global\ commit\ $(TAG)/' $(distdir)/$(PACKAGE).spec + sed -i 's/global\ longcommit.*/global\ longcommit\ $(TAG)/' $(distdir)/$(PACKAGE).spec + if [ -e $(BUILD_COUNTER) ]; then \ + sed -i 's/global\ build_counter.*/global\ build_counter\ $(COUNT)/' $(distdir)/$(PACKAGE).spec; \ + echo $(COUNT) > $(BUILD_COUNTER); \ + fi + if [ -n $(COMMIT_COUNTER) ]; then \ + sed -i 's/global\ commit_counter.*/global\ commit_counter\ $(COMMIT_COUNTER)/' $(distdir)/$(PACKAGE).spec; \ + fi srpm: export spec - if [ -e $(BUILD_COUNTER) ]; then \ - sed -i 's/global\ buildnum.*/global\ buildnum\ $(COUNT)/' $(distdir)/$(PACKAGE).spec; \ - echo $(COUNT) > $(BUILD_COUNTER); \ - fi rpmbuild $(RPM_OPTS) -bs $(distdir)/$(PACKAGE).spec rpm: export spec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.4.1+20200819.4a02ef2/README.md new/sbd-1.4.2+20201202.0446439/README.md --- old/sbd-1.4.1+20200819.4a02ef2/README.md 2020-08-19 15:37:20.000000000 +0200 +++ new/sbd-1.4.2+20201202.0446439/README.md 2020-12-02 21:26:13.000000000 +0100 @@ -3,7 +3,7 @@ A highly reliable fencing or Shoot-the-other-node-in-the-head (STONITH) mechanism that works by utilizing shared storage. The component works with Pacemaker clusters, and is currently known to -compile and function on Pacemaker 1.1.7+ and corosync 1.4.x or 2.3.x. +compile and function on Pacemaker 1.1.7+ or 2.0.0+ and corosync 1.4.x, 2.3.x or 3.0.x. Please see https://github.com/clusterlabs/sbd/blob/master/man/sbd.8.pod.in & https://github.com/clusterlabs/sbd/blob/master/src/sbd.sysconfig for the full documentation. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.4.1+20200819.4a02ef2/ROADMAP new/sbd-1.4.2+20201202.0446439/ROADMAP --- old/sbd-1.4.1+20200819.4a02ef2/ROADMAP 2020-08-19 15:37:20.000000000 +0200 +++ new/sbd-1.4.2+20201202.0446439/ROADMAP 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -- Provide fence_sbd wrapper for use with pacemaker clusters that do not - support cluster-glue fencing agents - -- systemd integration for the start-up scripts - -- Support for corosync >1.4.x in the non-plugin mode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.4.1+20200819.4a02ef2/configure.ac new/sbd-1.4.2+20201202.0446439/configure.ac --- old/sbd-1.4.1+20200819.4a02ef2/configure.ac 2020-08-19 15:37:20.000000000 +0200 +++ new/sbd-1.4.2+20201202.0446439/configure.ac 2020-12-02 21:26:13.000000000 +0100 @@ -20,7 +20,7 @@ dnl checks for system services AC_INIT([sbd], - [1.4.1], + [1.4.2], [[email protected]]) m4_include([tests-opt.m4]) AC_CANONICAL_HOST @@ -345,7 +345,7 @@ AC_SUBST(SBD_SYNC_RESOURCE_STARTUP_SYSCONFIG) dnl The Makefiles and shell scripts we output -AC_CONFIG_FILES([Makefile src/Makefile agent/Makefile man/Makefile agent/sbd src/sbd.service src/sbd_remote.service src/sbd.sh src/sbd.sysconfig]) +AC_CONFIG_FILES([Makefile src/Makefile agent/Makefile man/Makefile agent/sbd src/sbd.service src/sbd_remote.service src/sbd.sh src/sbd.sysconfig sbd.pc]) AC_CONFIG_SUBDIRS([tests]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.4.1+20200819.4a02ef2/sbd.pc.in new/sbd-1.4.2+20201202.0446439/sbd.pc.in --- old/sbd-1.4.1+20200819.4a02ef2/sbd.pc.in 1970-01-01 01:00:00.000000000 +0100 +++ new/sbd-1.4.2+20201202.0446439/sbd.pc.in 2020-12-02 21:26:13.000000000 +0100 @@ -0,0 +1,7 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +confdir=@CONFIGDIR@ + +Name: @PACKAGE@ +Version: @VERSION@ +Description: @PACKAGE@ build information required for downstream projects diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.4.1+20200819.4a02ef2/sbd.spec new/sbd-1.4.2+20201202.0446439/sbd.spec --- old/sbd-1.4.1+20200819.4a02ef2/sbd.spec 2020-08-19 15:37:20.000000000 +0200 +++ new/sbd-1.4.2+20201202.0446439/sbd.spec 2020-12-02 21:26:13.000000000 +0100 @@ -15,11 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%global commit aca7907c1973f331a4f192a0d50e6443840daab6 -%global shortcommit %(echo %{commit}|cut -c1-8) -%global modified %(echo %{commit}-|cut -f2 -d-) -%global github_owner beekhof -%global buildnum 1 +%global longcommit bfeee963f7363720da91a018045ca6746d822ba0 +%global shortcommit %(echo %{longcommit}|cut -c1-8) +%global modified %(echo %{longcommit}-|cut -f2 -d-) +%global github_owner Clusterlabs +%global commit_counter 0 +%global build_counter 1 +%global buildnum %(expr %{commit_counter} + %{build_counter}) %ifarch s390x s390 # minimum timeout on LPAR diag288 watchdog is 15s @@ -35,10 +37,10 @@ Summary: Storage-based death License: GPLv2+ Group: System Environment/Daemons -Version: 1.4.1 +Version: 1.4.2 Release: 99.%{buildnum}.%{shortcommit}.%{modified}git%{?dist} Url: https://github.com/%{github_owner}/%{name} -Source0: https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz +Source0: https://github.com/%{github_owner}/%{name}/archive/%{longcommit}/%{name}-%{longcommit}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -82,7 +84,7 @@ %prep ########################################################### # %setup -n sbd-%{version} -q -%setup -q -n %{name}-%{commit} +%setup -q -n %{name}-%{longcommit} ########################################################### %build @@ -137,6 +139,7 @@ %config(noreplace) %{_sysconfdir}/sysconfig/sbd %{_sbindir}/sbd %{_datadir}/sbd +%{_datadir}/pkgconfig/sbd.pc %exclude %{_datadir}/sbd/regressions.sh %doc %{_mandir}/man8/sbd* %if %{defined _unitdir} @@ -152,6 +155,45 @@ %{_libdir}/libsbdtestbed* %changelog +* Wed Dec 2 2020 <[email protected]> - 1.4.2-99.1.bfeee963.git +- improve build/CI-friendlyness +- * travis: switch to F32 as build-host +- switch to F32 & leap-15.2 +- changes for mock-2.0 +- turn off loop-devices & device-mapper on x86_64 targets because +- of changes in GCE +- * regressions.sh: get timeouts from disk-header to go with proper defaults +- for architecture +- * use configure for watchdog-default-timeout & others +- * ship sbd.pc with basic sbd build information for downstream packages +- to use +- * add number of commits since version-tag to build-counter + +- add robustness against misconfiguration / improve documentation +- * add environment section to man-page previously just available in +- template-config +- * inform the user to restart the sbd service after disk-initialization +- * refuse to start if any of the configured device names is invalid +- * add handshake to sync startup/shutdown with pacemakerd +- Previously sbd just waited for the cib-connnection to show up/go away +- which isn't robust at all. +- The new feature needs new pacemakerd-api as counterpart. +- Thus build checks for presence of pacemakerd-api. +- To simplify downstream adoption behavior is configurable at runtime +- via configure-file with a build-time-configurable default. +- * refuse to start if qdevice-sync_timeout doesn't match watchdog-timeout +- Needed in particular as qdevice-sync_timeout delays quorum-state-update +- and has a default of 30s that doesn't match the 5s watchdog-timeout +- default. + +- Fix: sbd-pacemaker: handle new no_quorum_demote + robustness against new +- policies added +- Fix: agent: correctly compare string values when calculating timeout +- Fix: scheduling: overhaul the whole thing +- * prevent possible lockup when format in proc changes +- * properly get and handle scheduler policy & prio +- * on SCHED_RR failing push to the max with SCHED_OTHER + * Tue Nov 19 2019 <[email protected]> - 1.4.1-99.1.aca7907c.git - improvements/clarifications in documentation - properly finalize cmap connection when disconnected from cluster diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.4.1+20200819.4a02ef2/src/sbd-md.c new/sbd-1.4.2+20201202.0446439/src/sbd-md.c --- old/sbd-1.4.1+20200819.4a02ef2/src/sbd-md.c 2020-08-19 15:37:20.000000000 +0200 +++ new/sbd-1.4.2+20201202.0446439/src/sbd-md.c 2020-12-02 21:26:13.000000000 +0100 @@ -720,6 +720,7 @@ } fprintf(stdout, "Device %s is initialized.\n", s->devname); } + fprintf(stdout, "Did you check sbd service down on all nodes before? If not do so now and restart afterwards.\n"); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sbd-1.4.1+20200819.4a02ef2/tests/configure.ac new/sbd-1.4.2+20201202.0446439/tests/configure.ac --- old/sbd-1.4.1+20200819.4a02ef2/tests/configure.ac 2020-08-19 15:37:20.000000000 +0200 +++ new/sbd-1.4.2+20201202.0446439/tests/configure.ac 2020-12-02 21:26:13.000000000 +0100 @@ -20,7 +20,7 @@ dnl checks for system services AC_INIT([sbd], - [1.4.1], + [1.4.2], [[email protected]]) m4_include([../tests-opt.m4]) AC_CANONICAL_HOST _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
