From a665ba2434facb36e41bd2d02341d985ffb153ca Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 16 Dec 2021 10:24:07 +0000 Subject: [PATCH] import sbd-1.5.1-1.el8 --- .gitignore | 2 +- .sbd.metadata | 2 +- ...ctly-derive-package-version-from-git.patch | 41 ----- ...uisitor-functionize-striping-leading.patch | 43 ------ ...or-tell-the-actual-watchdog-device-s.patch | 29 ---- ...or-tolerate-and-strip-any-leading-sp.patch | 146 ------------------ SPECS/sbd.spec | 18 ++- 7 files changed, 12 insertions(+), 269 deletions(-) delete mode 100644 SOURCES/0001-Build-Fix-correctly-derive-package-version-from-git.patch delete mode 100644 SOURCES/0002-Refactor-sbd-inquisitor-functionize-striping-leading.patch delete mode 100644 SOURCES/0003-Log-sbd-inquisitor-tell-the-actual-watchdog-device-s.patch delete mode 100644 SOURCES/0004-Fix-sbd-inquisitor-tolerate-and-strip-any-leading-sp.patch diff --git a/.gitignore b/.gitignore index 89a11ea..e5a6da8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/sbd-d7f447d689da52897e190114c448d1129f3c5f72.tar.gz +SOURCES/sbd-6bb085f5704dd4c3841c79504f2aed2228e6d76a.tar.gz diff --git a/.sbd.metadata b/.sbd.metadata index 2ea9987..de6e46c 100644 --- a/.sbd.metadata +++ b/.sbd.metadata @@ -1 +1 @@ -7506baf3940101bc1472036cb6d5e05d7f0cb92c SOURCES/sbd-d7f447d689da52897e190114c448d1129f3c5f72.tar.gz +50c4fbd14ecf01d05a1bcf014aaa3ab128930d03 SOURCES/sbd-6bb085f5704dd4c3841c79504f2aed2228e6d76a.tar.gz diff --git a/SOURCES/0001-Build-Fix-correctly-derive-package-version-from-git.patch b/SOURCES/0001-Build-Fix-correctly-derive-package-version-from-git.patch deleted file mode 100644 index c58ed54..0000000 --- a/SOURCES/0001-Build-Fix-correctly-derive-package-version-from-git.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 956f3558d4b619fb19eaa040614dfaf9a226d514 Mon Sep 17 00:00:00 2001 -From: Klaus Wenninger -Date: Mon, 28 Jun 2021 17:37:44 +0200 -Subject: [PATCH] Build: Fix: correctly derive package version from git - ---- - Makefile.am | 4 ++-- - sbd.spec | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index e614754..5d53c4c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -73,8 +73,8 @@ spec: - 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)-1/' $(distdir)/$(PACKAGE).spec; \ -+ if [ -n "$(COMMIT_COUNTER)" ]; then \ -+ sed -i 's/global\ commit_counter.*/global\ commit_counter\ $(COMMIT_COUNTER)/' $(distdir)/$(PACKAGE).spec; \ - fi - - srpm: export spec -diff --git a/sbd.spec b/sbd.spec -index 776e48b..0498db1 100644 ---- a/sbd.spec -+++ b/sbd.spec -@@ -20,7 +20,7 @@ - %global modified %(echo %{longcommit}-|cut -f2 -d-) - %global github_owner Clusterlabs - %global commit_counter 0 --%global build_counter 1 -+%global build_counter 0 - %global buildnum %(expr %{commit_counter} + %{build_counter}) - - %ifarch s390x s390 --- -1.8.3.1 - diff --git a/SOURCES/0002-Refactor-sbd-inquisitor-functionize-striping-leading.patch b/SOURCES/0002-Refactor-sbd-inquisitor-functionize-striping-leading.patch deleted file mode 100644 index 84ed7c2..0000000 --- a/SOURCES/0002-Refactor-sbd-inquisitor-functionize-striping-leading.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8438c244cc2066fbe9c598a6392e8935cf017d97 Mon Sep 17 00:00:00 2001 -From: "Gao,Yan" -Date: Fri, 25 Jun 2021 15:02:14 +0200 -Subject: [PATCH] Refactor: sbd-inquisitor: functionize striping leading spaces - of an option value - ---- - src/sbd-inquisitor.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/sbd-inquisitor.c b/src/sbd-inquisitor.c -index 4fec2fd..53ddfa3 100644 ---- a/src/sbd-inquisitor.c -+++ b/src/sbd-inquisitor.c -@@ -40,9 +40,8 @@ bool sync_resource_startup = false; - int parse_device_line(const char *line); - - static const char * --get_env_option(const char *option) -+sanitize_option_value(const char *value) - { -- const char *value = getenv(option); - size_t max = 0; - size_t lpc = 0; - -@@ -61,6 +60,14 @@ get_env_option(const char *option) - return (strlen(value + lpc) > 0 ? (value + lpc) : NULL); - } - -+static const char * -+get_env_option(const char *option) -+{ -+ const char *value = getenv(option); -+ -+ return sanitize_option_value(value); -+} -+ - static int - recruit_servant(const char *devname, pid_t pid) - { --- -1.8.3.1 - diff --git a/SOURCES/0003-Log-sbd-inquisitor-tell-the-actual-watchdog-device-s.patch b/SOURCES/0003-Log-sbd-inquisitor-tell-the-actual-watchdog-device-s.patch deleted file mode 100644 index 8bef6e6..0000000 --- a/SOURCES/0003-Log-sbd-inquisitor-tell-the-actual-watchdog-device-s.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c1bb2a4d8c8ec66c72da3ec080f23b1f858a66af Mon Sep 17 00:00:00 2001 -From: "Gao,Yan" -Date: Mon, 28 Jun 2021 13:35:56 +0200 -Subject: [PATCH] Log: sbd-inquisitor: tell the actual watchdog device - specified with `-w` - ---- - src/sbd-inquisitor.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sbd-inquisitor.c b/src/sbd-inquisitor.c -index 53ddfa3..2cf09ac 100644 ---- a/src/sbd-inquisitor.c -+++ b/src/sbd-inquisitor.c -@@ -1042,10 +1042,10 @@ int main(int argc, char **argv, char **envp) - W_count++; - break; - case 'w': -- cl_log(LOG_NOTICE, "Using watchdog device '%s'", watchdogdev); - free(watchdogdev); - watchdogdev = strdup(optarg); - watchdogdev_is_default = false; -+ cl_log(LOG_NOTICE, "Using watchdog device '%s'", watchdogdev); - break; - case 'd': - #if SUPPORT_SHARED_DISK --- -1.8.3.1 - diff --git a/SOURCES/0004-Fix-sbd-inquisitor-tolerate-and-strip-any-leading-sp.patch b/SOURCES/0004-Fix-sbd-inquisitor-tolerate-and-strip-any-leading-sp.patch deleted file mode 100644 index 1904bb8..0000000 --- a/SOURCES/0004-Fix-sbd-inquisitor-tolerate-and-strip-any-leading-sp.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 1c72cf23561deeb69b04891f3fc4d0613f73fbb0 Mon Sep 17 00:00:00 2001 -From: "Gao,Yan" -Date: Fri, 25 Jun 2021 15:21:38 +0200 -Subject: [PATCH] Fix: sbd-inquisitor: tolerate and strip any leading spaces of - command line option values - -Somehow an user's own monitoring agent doesn't well parse an SBD_DEVICE -setting with spaces between the device names: - -SBD_DEVICE="/dev/; /dev/; /dev/" - -And eventually it calls an sbd command: - -`sbd list -d " /dev/"` - --- A space is prefixed to the device name which is quoted. - -Of course it could be easily fixed in the setting or their agent. But -OTOH, sbd'd better tolerate and strip any leading spaces of command line -option values. ---- - src/sbd-inquisitor.c | 41 +++++++++++++++++++++++++---------------- - 1 file changed, 25 insertions(+), 16 deletions(-) - -diff --git a/src/sbd-inquisitor.c b/src/sbd-inquisitor.c -index 2cf09ac..944a353 100644 ---- a/src/sbd-inquisitor.c -+++ b/src/sbd-inquisitor.c -@@ -999,6 +999,15 @@ int main(int argc, char **argv, char **envp) - } - - while ((c = getopt(argc, argv, "czC:DPRTWZhvw:d:n:p:1:2:3:4:5:t:I:F:S:s:r:")) != -1) { -+ /* Call it before checking optarg for NULL to make coverity happy */ -+ const char *sanitized_optarg = sanitize_option_value(optarg); -+ -+ if (optarg && sanitized_optarg == NULL) { -+ fprintf(stderr, "Invalid value \"%s\" for option -%c\n", optarg, c); -+ exit_status = -2; -+ goto out; -+ } -+ - switch (c) { - case 'D': - break; -@@ -1011,11 +1020,11 @@ int main(int argc, char **argv, char **envp) - cl_log(LOG_INFO, "Realtime mode deactivated."); - break; - case 'S': -- start_mode = atoi(optarg); -+ start_mode = atoi(sanitized_optarg); - cl_log(LOG_INFO, "Start mode set to: %d", (int)start_mode); - break; - case 's': -- timeout_startup = atoi(optarg); -+ timeout_startup = atoi(sanitized_optarg); - cl_log(LOG_INFO, "Start timeout set to: %d", (int)timeout_startup); - break; - case 'v': -@@ -1043,13 +1052,13 @@ int main(int argc, char **argv, char **envp) - break; - case 'w': - free(watchdogdev); -- watchdogdev = strdup(optarg); -+ watchdogdev = strdup(sanitized_optarg); - watchdogdev_is_default = false; - cl_log(LOG_NOTICE, "Using watchdog device '%s'", watchdogdev); - break; - case 'd': - #if SUPPORT_SHARED_DISK -- if (recruit_servant(optarg, 0) != 0) { -+ if (recruit_servant(sanitized_optarg, 0) != 0) { - fprintf(stderr, "Invalid device: %s\n", optarg); - exit_status = -1; - goto out; -@@ -1070,48 +1079,48 @@ int main(int argc, char **argv, char **envp) - disk_priority = 0; - break; - case 'n': -- local_uname = strdup(optarg); -+ local_uname = strdup(sanitized_optarg); - cl_log(LOG_INFO, "Overriding local hostname to %s", local_uname); - break; - case 'p': -- pidfile = strdup(optarg); -+ pidfile = strdup(sanitized_optarg); - cl_log(LOG_INFO, "pidfile set to %s", pidfile); - break; - case 'C': -- timeout_watchdog_crashdump = atoi(optarg); -+ timeout_watchdog_crashdump = atoi(sanitized_optarg); - cl_log(LOG_INFO, "Setting crashdump watchdog timeout to %d", - (int)timeout_watchdog_crashdump); - break; - case '1': -- timeout_watchdog = atoi(optarg); -+ timeout_watchdog = atoi(sanitized_optarg); - break; - case '2': -- timeout_allocate = atoi(optarg); -+ timeout_allocate = atoi(sanitized_optarg); - break; - case '3': -- timeout_loop = atoi(optarg); -+ timeout_loop = atoi(sanitized_optarg); - break; - case '4': -- timeout_msgwait = atoi(optarg); -+ timeout_msgwait = atoi(sanitized_optarg); - break; - case '5': -- timeout_watchdog_warn = atoi(optarg); -+ timeout_watchdog_warn = atoi(sanitized_optarg); - do_calculate_timeout_watchdog_warn = false; - cl_log(LOG_INFO, "Setting latency warning to %d", - (int)timeout_watchdog_warn); - break; - case 't': -- servant_restart_interval = atoi(optarg); -+ servant_restart_interval = atoi(sanitized_optarg); - cl_log(LOG_INFO, "Setting servant restart interval to %d", - (int)servant_restart_interval); - break; - case 'I': -- timeout_io = atoi(optarg); -+ timeout_io = atoi(sanitized_optarg); - cl_log(LOG_INFO, "Setting IO timeout to %d", - (int)timeout_io); - break; - case 'F': -- servant_restart_count = atoi(optarg); -+ servant_restart_count = atoi(sanitized_optarg); - cl_log(LOG_INFO, "Servant restart count set to %d", - (int)servant_restart_count); - break; -@@ -1119,7 +1128,7 @@ int main(int argc, char **argv, char **envp) - if (timeout_action) { - free(timeout_action); - } -- timeout_action = strdup(optarg); -+ timeout_action = strdup(sanitized_optarg); - break; - case 'h': - usage(); --- -1.8.3.1 - diff --git a/SPECS/sbd.spec b/SPECS/sbd.spec index 59c0ffc..398f72c 100644 --- a/SPECS/sbd.spec +++ b/SPECS/sbd.spec @@ -15,11 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%global longcommit d7f447d689da52897e190114c448d1129f3c5f72 +%global longcommit 6bb085f5704dd4c3841c79504f2aed2228e6d76a %global shortcommit %(echo %{longcommit}|cut -c1-8) %global modified %(echo %{longcommit}-|cut -f2 -d-) %global github_owner Clusterlabs -%global buildnum 2 +%global buildnum 1 %ifarch s390x s390 # minimum timeout on LPAR diag288 watchdog is 15s @@ -49,14 +49,10 @@ Name: sbd Summary: Storage-based death License: GPLv2+ Group: System Environment/Daemons -Version: 1.5.0 +Version: 1.5.1 Release: %{buildnum}%{?dist} Url: https://github.com/%{github_owner}/%{name} Source0: https://github.com/%{github_owner}/%{name}/archive/%{longcommit}/%{name}-%{longcommit}.tar.gz -Patch0: 0001-Build-Fix-correctly-derive-package-version-from-git.patch -Patch1: 0002-Refactor-sbd-inquisitor-functionize-striping-leading.patch -Patch2: 0003-Log-sbd-inquisitor-tell-the-actual-watchdog-device-s.patch -Patch3: 0004-Fix-sbd-inquisitor-tolerate-and-strip-any-leading-sp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -110,7 +106,8 @@ regression-testing sbd. export CFLAGS="$RPM_OPT_FLAGS -Wall -Werror" %configure --with-watchdog-timeout-default=%{watchdog_timeout_default} \ --with-sync-resource-startup-default=%{?with_sync_resource_startup_default:yes}%{!?with_sync_resource_startup_default:no} \ - --with-sync-resource-startup-sysconfig=%{sync_resource_startup_sysconfig} + --with-sync-resource-startup-sysconfig=%{sync_resource_startup_sysconfig} \ + --with-runstatedir=%{_rundir} make %{?_smp_mflags} ########################################################### @@ -185,6 +182,11 @@ fi %{_libdir}/libsbdtestbed* %changelog +* Wed Dec 1 2021 Klaus Wenninger - 1.5.1-1 +- rebase to upstream v1.5.1 + + Resolves: rhbz#2013256 + * Wed Aug 18 2021 Klaus Wenninger - 1.5.0-2 - reverted watchdog_timeout_default to 5s (slipped in via an unreleased change on 8.4.0 branch)