From 19c989016e5f8ce4db9381ddd9ccd5637adcd6f6 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Wed, 20 Jul 2022 11:37:12 +0200 Subject: [PATCH 01/24] Rebase to newest upstream snapshot This version fixes a critical bug that caused the authfile directive to be ignored. After installing the patched version, nodes may stop communicating. Solution is to either remove authfile from configuration file or update all other nodes. Signed-off-by: Jan Friesse --- booth.spec | 9 ++++++++- sources | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/booth.spec b/booth.spec index 0a00d2a..3080019 100644 --- a/booth.spec +++ b/booth.spec @@ -28,7 +28,7 @@ # This will be used to fill booth_ver, booth_numcomm and booth_sha1. # It is important to keep abbrev to get full length sha1! When updating source use # `spectool -g booth.spec` to download source. -%global git_describe_str v1.0-262-gd0ac26cc0c2fb4069c2d095cc0bbe3f94f02c05e +%global git_describe_str v1.0-266-gf288d5949073986a29d0286caec16c721e8e632a # Set this to 1 when rebasing (changing git_describe_str) and increase otherwise %global release 1 @@ -310,6 +310,13 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Wed Jul 20 2022 Jan Friesse - 1.0-266.1.f288d59.git +- Rebase to newest upstream snapshot +- This version fixes a critical bug that caused the authfile directive + to be ignored. After installing the patched version, nodes may stop + communicating. Solution is to either remove authfile from configuration + file or update all other nodes. + * Thu May 19 2022 Jan Friesse - 1.0-262.1.d0ac26c.git - Rebase to newest upstream snapshot diff --git a/sources b/sources index 1b611a5..aa22c66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (booth-1.0-262-d0ac26c.tar.gz) = 71f95d33e2c4351651b2e8daab151821eccbfb2f34d5cbb826f999c0c706cdc2c335698e479e63d2d852ed7cd360239b9eeb695533474c91c6681e6b8b5f7dbc +SHA512 (booth-1.0-266-f288d59.tar.gz) = 83e62008c03497902787ca702a472890debdec8126848ac6fed164a925d7cfa57c3db173e045e34942723c3814cbe1fc91ad3de3c9a4b4988c27005f799942fc From b5637a2724ec98f4a77a0209f25095408e6d8a33 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 22:11:31 +0000 Subject: [PATCH 02/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- booth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/booth.spec b/booth.spec index 3080019..b436af4 100644 --- a/booth.spec +++ b/booth.spec @@ -31,7 +31,7 @@ %global git_describe_str v1.0-266-gf288d5949073986a29d0286caec16c721e8e632a # Set this to 1 when rebasing (changing git_describe_str) and increase otherwise -%global release 1 +%global release 2 # Run shell script to parse git_describe str into version, numcomm and sha1 hash %global booth_ver %(s=%{git_describe_str}; vver=${s%%%%-*}; echo ${vver:1}) @@ -310,6 +310,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.0-266.2.f288d59.git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jul 20 2022 Jan Friesse - 1.0-266.1.f288d59.git - Rebase to newest upstream snapshot - This version fixes a critical bug that caused the authfile directive From fdb039e201973af1dd7df6f6a0710e5ae4e65cb2 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Thu, 28 Jul 2022 12:29:00 +0200 Subject: [PATCH 03/24] Fix CVE-2022-2553 - Fix authfile directive handling in booth config file (fixes CVE-2022-2553) - Add enable-authfile option - Resolves: rhbz#2111667 Signed-off-by: Jan Friesse --- ...or-main-substitute-is_auth_req-macro.patch | 30 +++++ 0001-config-Add-enable-authfile-option.patch | 106 ++++++++++++++++++ booth.spec | 9 +- 3 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 0001-Revert-Refactor-main-substitute-is_auth_req-macro.patch create mode 100644 0001-config-Add-enable-authfile-option.patch diff --git a/0001-Revert-Refactor-main-substitute-is_auth_req-macro.patch b/0001-Revert-Refactor-main-substitute-is_auth_req-macro.patch new file mode 100644 index 0000000..3ab2586 --- /dev/null +++ b/0001-Revert-Refactor-main-substitute-is_auth_req-macro.patch @@ -0,0 +1,30 @@ +From 35bf0b7b048d715f671eb68974fb6b4af6528c67 Mon Sep 17 00:00:00 2001 +From: Jan Friesse +Date: Mon, 4 Jul 2022 09:39:47 +0200 +Subject: [PATCH] Revert "Refactor: main: substitute is_auth_req macro" + +This reverts commit da79b8ba28ad4837a0fee13e5f8fb6f89fe0e24c. + +authfile != authkey + +Signed-off-by: Jan Friesse +--- + src/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main.c b/src/main.c +index b50a883..b4a174f 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -364,7 +364,7 @@ static int setup_config(int type) + if (rv < 0) + goto out; + +- if (is_auth_req()) { ++ if (booth_conf->authfile[0] != '\0') { + rv = read_authkey(); + if (rv < 0) + goto out; +-- +2.37.1 + diff --git a/0001-config-Add-enable-authfile-option.patch b/0001-config-Add-enable-authfile-option.patch new file mode 100644 index 0000000..a3adc72 --- /dev/null +++ b/0001-config-Add-enable-authfile-option.patch @@ -0,0 +1,106 @@ +From 466246c2fa8ea1bcc06593fbf7b900d0665606b1 Mon Sep 17 00:00:00 2001 +From: Jan Friesse +Date: Tue, 26 Jul 2022 18:39:38 +0200 +Subject: [PATCH] config: Add enable-authfile option + +This option enables (or disables) usage of authfile. Can be 'yes' or 'no'. +Default is 'no'. + +Booth usage of authfile was broken for long time (since commit +da79b8ba28ad4837a0fee13e5f8fb6f89fe0e24c). + +Pcs was adding authfile by default, but it was not used. Once booth bug +was fixed problem appears because mixed clusters (with fixed version and +without fixed one) stops working. + +This non-upstream option is added and used to allow use of +authfile without breaking compatibility for clusters +consisting of mixed versions (usually happens before all nodes are +updated) of booth (user have to explicitly +enable usage of authfile). + +This patch is transitional and will be removed in future major version of +distribution. + +Signed-off-by: Jan Friesse +--- + docs/boothd.8.txt | 7 +++++++ + src/config.c | 17 +++++++++++++++++ + src/config.h | 1 + + src/main.c | 2 +- + 4 files changed, 26 insertions(+), 1 deletion(-) + +diff --git a/docs/boothd.8.txt b/docs/boothd.8.txt +index f58f27e..12f66f9 100644 +--- a/docs/boothd.8.txt ++++ b/docs/boothd.8.txt +@@ -230,6 +230,13 @@ will always bind and listen to both UDP and TCP ports. + parameter to a higher value. The time skew test is performed + only in concert with authentication. + ++*'enable-authfile'*:: ++ Enables (or disables) usage of authfile. Can be 'yes' or 'no'. ++ Default is 'no'. ++ This is non-upstream option used to allow use of authfile without ++ breaking compatibility for clusters consisting of mixed ++ versions of booth. ++ + *'site'*:: + Defines a site Raft member with the given IP. Sites can + acquire tickets. The sites' IP should be managed by the cluster. +diff --git a/src/config.c b/src/config.c +index 8e41553..b9df3e3 100644 +--- a/src/config.c ++++ b/src/config.c +@@ -729,6 +729,23 @@ no_value: + booth_conf->maxtimeskew = atoi(val); + continue; + } ++ ++ if (strcmp(key, "enable-authfile") == 0) { ++ if (strcasecmp(val, "yes") == 0 || ++ strcasecmp(val, "on") == 0 || ++ strcasecmp(val, "1") == 0) { ++ booth_conf->enable_authfile = 1; ++ } else if (strcasecmp(val, "no") == 0 || ++ strcasecmp(val, "off") == 0 || ++ strcasecmp(val, "0") == 0) { ++ booth_conf->enable_authfile = 0; ++ } else { ++ error = "Expected yes/no value for enable-authfile"; ++ goto err; ++ } ++ ++ continue; ++ } + #endif + + if (strcmp(key, "site") == 0) { +diff --git a/src/config.h b/src/config.h +index bca73bc..da1e917 100644 +--- a/src/config.h ++++ b/src/config.h +@@ -297,6 +297,7 @@ struct booth_config { + struct stat authstat; + char authkey[BOOTH_MAX_KEY_LEN]; + int authkey_len; ++ int enable_authfile; + /** Maximum time skew between peers allowed */ + int maxtimeskew; + +diff --git a/src/main.c b/src/main.c +index b4a174f..0fdb295 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -364,7 +364,7 @@ static int setup_config(int type) + if (rv < 0) + goto out; + +- if (booth_conf->authfile[0] != '\0') { ++ if (booth_conf->authfile[0] != '\0' && booth_conf->enable_authfile) { + rv = read_authkey(); + if (rv < 0) + goto out; +-- +2.37.1 + diff --git a/booth.spec b/booth.spec index 0a00d2a..c4f1f41 100644 --- a/booth.spec +++ b/booth.spec @@ -31,7 +31,7 @@ %global git_describe_str v1.0-262-gd0ac26cc0c2fb4069c2d095cc0bbe3f94f02c05e # Set this to 1 when rebasing (changing git_describe_str) and increase otherwise -%global release 1 +%global release 2 # Run shell script to parse git_describe str into version, numcomm and sha1 hash %global booth_ver %(s=%{git_describe_str}; vver=${s%%%%-*}; echo ${vver:1}) @@ -62,6 +62,8 @@ Summary: Ticket Manager for Multi-site Clusters License: GPLv2+ Url: https://github.com/%{github_owner}/%{name} Source0: https://github.com/%{github_owner}/%{name}/archive/%{booth_short_sha1}/%{booth_archive_name}.tar.gz +Patch0: 0001-Revert-Refactor-main-substitute-is_auth_req-macro.patch +Patch1: 0001-config-Add-enable-authfile-option.patch # direct build process dependencies BuildRequires: autoconf @@ -310,6 +312,11 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Thu Jul 28 2022 Jan Friesse - 1.0-262.2.d0ac26c.git +- Fix authfile directive handling in booth config file + (fixes CVE-2022-2553) +- Add enable-authfile option + * Thu May 19 2022 Jan Friesse - 1.0-262.1.d0ac26c.git - Rebase to newest upstream snapshot From 654dae39a92d7609ad8d90be40c9420eeff0e17c Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Tue, 9 Aug 2022 09:57:03 +0200 Subject: [PATCH 04/24] Remove template unit from systemd_* macro Signed-off-by: Jan Friesse --- booth.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/booth.spec b/booth.spec index b436af4..1153645 100644 --- a/booth.spec +++ b/booth.spec @@ -31,7 +31,7 @@ %global git_describe_str v1.0-266-gf288d5949073986a29d0286caec16c721e8e632a # Set this to 1 when rebasing (changing git_describe_str) and increase otherwise -%global release 2 +%global release 3 # Run shell script to parse git_describe str into version, numcomm and sha1 hash %global booth_ver %(s=%{git_describe_str}; vver=${s%%%%-*}; echo ${vver:1}) @@ -144,13 +144,13 @@ Support for running Booth, ticket manager for multi-site clusters, as an arbitrator. %post arbitrator -%systemd_post booth@.service booth-arbitrator.service +%systemd_post booth-arbitrator.service %preun arbitrator -%systemd_preun booth@.service booth-arbitrator.service +%systemd_preun booth-arbitrator.service %postun arbitrator -%systemd_postun_with_restart booth@.service booth-arbitrator.service +%systemd_postun_with_restart booth-arbitrator.service %package site Summary: Booth support for running as a full-fledged site @@ -310,6 +310,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Tue Aug 09 2022 Jan Friesse - 1.0-266.3.f288d59.git +- Remove template unit from systemd_(post|preun|postun_with_restart) macro + * Wed Jul 20 2022 Fedora Release Engineering - 1.0-266.2.f288d59.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From e383d1fdf8f4ea99d68500faa881ea8a3328e136 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Thu, 29 Sep 2022 10:09:29 +0200 Subject: [PATCH 05/24] Remove Alias directive from booth@.service unit Signed-off-by: Jan Friesse --- 0001-unit-file-Remove-Alias-directive.patch | 30 +++++++++++++++++++++ booth.rpmlintrc | 4 +-- booth.spec | 6 ++++- 3 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 0001-unit-file-Remove-Alias-directive.patch diff --git a/0001-unit-file-Remove-Alias-directive.patch b/0001-unit-file-Remove-Alias-directive.patch new file mode 100644 index 0000000..9457836 --- /dev/null +++ b/0001-unit-file-Remove-Alias-directive.patch @@ -0,0 +1,30 @@ +From dd090510d7fba88c41adc1b70804c1c79b036736 Mon Sep 17 00:00:00 2001 +From: Jan Friesse +Date: Tue, 27 Sep 2022 18:50:31 +0200 +Subject: [PATCH] unit file: Remove Alias directive + +Recent change in systemd made imposible to enable booth@.service any +longer - more details in BZ +https://bugzilla.redhat.com/show_bug.cgi?id=2128998. Solution is to +delete Alias directive. + +Signed-off-by: Jan Friesse +--- + conf/booth@.service.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/conf/booth@.service.in b/conf/booth@.service.in +index e516194..e4b8fbc 100644 +--- a/conf/booth@.service.in ++++ b/conf/booth@.service.in +@@ -8,7 +8,6 @@ ConditionFileNotEmpty=/etc/booth/%i.conf + Conflicts=pacemaker.service + + [Install] +-Alias=boothd + WantedBy=multi-user.target + + [Service] +-- +2.27.0 + diff --git a/booth.rpmlintrc b/booth.rpmlintrc index ae1945c..a123536 100644 --- a/booth.rpmlintrc +++ b/booth.rpmlintrc @@ -17,7 +17,7 @@ addFilter(r'booth-(site|test)\.[^:]+: (W|E): only-non-binary-in-usr-lib') # dangling symlink is ok for geostore and boothd (they actually points to booth binary) addFilter(r'booth-site\.[^:]+: (W|E): dangling-symlink /usr/sbin/geostore /usr/sbin/boothd') -addFilter(r'booth-test\.[^:]+: (W|E): dangling-symlink /usr/share/booth/tests/src/boothd /usr/sbin/boothd') +#addFilter(r'booth-test\.[^:]+: (W|E): dangling-symlink /usr/share/booth/tests/src/boothd /usr/sbin/boothd') # booth unit test is distributed non-executable by upstream -addFilter(r'booth-test\.[^:]+: (W|E): non-executable-script /usr/share/booth/tests/unit-test.py') +#addFilter(r'booth-test\.[^:]+: (W|E): non-executable-script /usr/share/booth/tests/unit-test.py') diff --git a/booth.spec b/booth.spec index 1153645..386d09f 100644 --- a/booth.spec +++ b/booth.spec @@ -31,7 +31,7 @@ %global git_describe_str v1.0-266-gf288d5949073986a29d0286caec16c721e8e632a # Set this to 1 when rebasing (changing git_describe_str) and increase otherwise -%global release 3 +%global release 4 # Run shell script to parse git_describe str into version, numcomm and sha1 hash %global booth_ver %(s=%{git_describe_str}; vver=${s%%%%-*}; echo ${vver:1}) @@ -62,6 +62,7 @@ Summary: Ticket Manager for Multi-site Clusters License: GPLv2+ Url: https://github.com/%{github_owner}/%{name} Source0: https://github.com/%{github_owner}/%{name}/archive/%{booth_short_sha1}/%{booth_archive_name}.tar.gz +Patch1: 0001-unit-file-Remove-Alias-directive.patch # direct build process dependencies BuildRequires: autoconf @@ -310,6 +311,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Thu Sep 29 2022 Jan Friesse - 1.0-266.4.f288d59.git +- Remove Alias directive from booth@.service unit file + * Tue Aug 09 2022 Jan Friesse - 1.0-266.3.f288d59.git - Remove template unit from systemd_(post|preun|postun_with_restart) macro From a77082924e9ffb826288688af5ce78ba550f2d0e Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Thu, 29 Sep 2022 10:18:42 +0200 Subject: [PATCH 06/24] Remove Alias directive from booth@.service unit Signed-off-by: Jan Friesse --- 0001-unit-file-Remove-Alias-directive.patch | 30 +++++++++++++++++++++ booth.spec | 6 ++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0001-unit-file-Remove-Alias-directive.patch diff --git a/0001-unit-file-Remove-Alias-directive.patch b/0001-unit-file-Remove-Alias-directive.patch new file mode 100644 index 0000000..9457836 --- /dev/null +++ b/0001-unit-file-Remove-Alias-directive.patch @@ -0,0 +1,30 @@ +From dd090510d7fba88c41adc1b70804c1c79b036736 Mon Sep 17 00:00:00 2001 +From: Jan Friesse +Date: Tue, 27 Sep 2022 18:50:31 +0200 +Subject: [PATCH] unit file: Remove Alias directive + +Recent change in systemd made imposible to enable booth@.service any +longer - more details in BZ +https://bugzilla.redhat.com/show_bug.cgi?id=2128998. Solution is to +delete Alias directive. + +Signed-off-by: Jan Friesse +--- + conf/booth@.service.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/conf/booth@.service.in b/conf/booth@.service.in +index e516194..e4b8fbc 100644 +--- a/conf/booth@.service.in ++++ b/conf/booth@.service.in +@@ -8,7 +8,6 @@ ConditionFileNotEmpty=/etc/booth/%i.conf + Conflicts=pacemaker.service + + [Install] +-Alias=boothd + WantedBy=multi-user.target + + [Service] +-- +2.27.0 + diff --git a/booth.spec b/booth.spec index c4f1f41..b690cc1 100644 --- a/booth.spec +++ b/booth.spec @@ -31,7 +31,7 @@ %global git_describe_str v1.0-262-gd0ac26cc0c2fb4069c2d095cc0bbe3f94f02c05e # Set this to 1 when rebasing (changing git_describe_str) and increase otherwise -%global release 2 +%global release 3 # Run shell script to parse git_describe str into version, numcomm and sha1 hash %global booth_ver %(s=%{git_describe_str}; vver=${s%%%%-*}; echo ${vver:1}) @@ -64,6 +64,7 @@ Url: https://github.com/%{github_owner}/%{name} Source0: https://github.com/%{github_owner}/%{name}/archive/%{booth_short_sha1}/%{booth_archive_name}.tar.gz Patch0: 0001-Revert-Refactor-main-substitute-is_auth_req-macro.patch Patch1: 0001-config-Add-enable-authfile-option.patch +Patch2: 0001-unit-file-Remove-Alias-directive.patch # direct build process dependencies BuildRequires: autoconf @@ -312,6 +313,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Thu Sep 29 2022 Jan Friesse - 1.0-262.3.d0ac26c.git +- Remove Alias directive from booth@.service unit file + * Thu Jul 28 2022 Jan Friesse - 1.0-262.2.d0ac26c.git - Fix authfile directive handling in booth config file (fixes CVE-2022-2553) From 57a42bb54e25fed1a08b356eec676d541bebe33c Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Thu, 29 Sep 2022 10:34:28 +0200 Subject: [PATCH 07/24] Improve rpmlintrc Signed-off-by: Jan Friesse --- booth.rpmlintrc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/booth.rpmlintrc b/booth.rpmlintrc index a123536..a0a2c1c 100644 --- a/booth.rpmlintrc +++ b/booth.rpmlintrc @@ -1,6 +1,7 @@ -# no-documentation is fine for booth-arbitrator and booth (virtual package) +# no-documentation is fine for booth-arbitrator and booth (virtual package) and debug packages addFilter(r'booth-arbitrator\.[^:]+: W: no-documentation') addFilter(r'booth\.[^:]+: W: no-documentation') +addFilter(r'booth-debugsource\.[^:]+: W: no-documentation') # permissions for chroot addFilter(r'booth-core\.[^:]+: (E|W): non-standard-dir-perm /var/lib/booth 750') @@ -17,7 +18,10 @@ addFilter(r'booth-(site|test)\.[^:]+: (W|E): only-non-binary-in-usr-lib') # dangling symlink is ok for geostore and boothd (they actually points to booth binary) addFilter(r'booth-site\.[^:]+: (W|E): dangling-symlink /usr/sbin/geostore /usr/sbin/boothd') -#addFilter(r'booth-test\.[^:]+: (W|E): dangling-symlink /usr/share/booth/tests/src/boothd /usr/sbin/boothd') +addFilter(r'booth-test\.[^:]+: (W|E): dangling-symlink /usr/share/booth/tests/src/boothd /usr/sbin/boothd') -# booth unit test is distributed non-executable by upstream -#addFilter(r'booth-test\.[^:]+: (W|E): non-executable-script /usr/share/booth/tests/unit-test.py') +# Ignore all errors in debuginfo packages +addFilter(r'booth-core-debuginfo\.[^:]+: (W|E):') + +# booth-arbitrator contains just unit files +addFilter(r'booth-arbitrator\.[^:]+: (W|E): only-non-binary-in-usr-lib') From 157c0b0f889edd03ee500f86eeec9f31d5f5f61d Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 30 Sep 2022 16:41:47 +0200 Subject: [PATCH 08/24] Rebase to newest upstream snapshot Signed-off-by: Jan Friesse --- 0001-unit-file-Remove-Alias-directive.patch | 30 --------------------- booth.spec | 8 +++--- sources | 2 +- 3 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 0001-unit-file-Remove-Alias-directive.patch diff --git a/0001-unit-file-Remove-Alias-directive.patch b/0001-unit-file-Remove-Alias-directive.patch deleted file mode 100644 index 9457836..0000000 --- a/0001-unit-file-Remove-Alias-directive.patch +++ /dev/null @@ -1,30 +0,0 @@ -From dd090510d7fba88c41adc1b70804c1c79b036736 Mon Sep 17 00:00:00 2001 -From: Jan Friesse -Date: Tue, 27 Sep 2022 18:50:31 +0200 -Subject: [PATCH] unit file: Remove Alias directive - -Recent change in systemd made imposible to enable booth@.service any -longer - more details in BZ -https://bugzilla.redhat.com/show_bug.cgi?id=2128998. Solution is to -delete Alias directive. - -Signed-off-by: Jan Friesse ---- - conf/booth@.service.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/conf/booth@.service.in b/conf/booth@.service.in -index e516194..e4b8fbc 100644 ---- a/conf/booth@.service.in -+++ b/conf/booth@.service.in -@@ -8,7 +8,6 @@ ConditionFileNotEmpty=/etc/booth/%i.conf - Conflicts=pacemaker.service - - [Install] --Alias=boothd - WantedBy=multi-user.target - - [Service] --- -2.27.0 - diff --git a/booth.spec b/booth.spec index 386d09f..e5e3be0 100644 --- a/booth.spec +++ b/booth.spec @@ -28,10 +28,10 @@ # This will be used to fill booth_ver, booth_numcomm and booth_sha1. # It is important to keep abbrev to get full length sha1! When updating source use # `spectool -g booth.spec` to download source. -%global git_describe_str v1.0-266-gf288d5949073986a29d0286caec16c721e8e632a +%global git_describe_str v1.0-272-g7acb75787196c25e66a0f749f690888bad066bf4 # Set this to 1 when rebasing (changing git_describe_str) and increase otherwise -%global release 4 +%global release 1 # Run shell script to parse git_describe str into version, numcomm and sha1 hash %global booth_ver %(s=%{git_describe_str}; vver=${s%%%%-*}; echo ${vver:1}) @@ -62,7 +62,6 @@ Summary: Ticket Manager for Multi-site Clusters License: GPLv2+ Url: https://github.com/%{github_owner}/%{name} Source0: https://github.com/%{github_owner}/%{name}/archive/%{booth_short_sha1}/%{booth_archive_name}.tar.gz -Patch1: 0001-unit-file-Remove-Alias-directive.patch # direct build process dependencies BuildRequires: autoconf @@ -311,6 +310,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Fri Sep 30 2022 Jan Friesse - 1.0-272.1.7acb757.git +- Rebase to newest upstream snapshot + * Thu Sep 29 2022 Jan Friesse - 1.0-266.4.f288d59.git - Remove Alias directive from booth@.service unit file diff --git a/sources b/sources index aa22c66..ea7b2c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (booth-1.0-266-f288d59.tar.gz) = 83e62008c03497902787ca702a472890debdec8126848ac6fed164a925d7cfa57c3db173e045e34942723c3814cbe1fc91ad3de3c9a4b4988c27005f799942fc +SHA512 (booth-1.0-272-7acb757.tar.gz) = 08d8930e7a14756ddc18ff5bcbe7e51496826df0cdb744941107fb6f1b6c05eefc909f12fcb269076a5ecc1d38f4ad35c40f022cccc66e685be99408371310d9 From 7d7721ffa53fa6c8760bf83afca15bc08e7f4e16 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Mon, 21 Nov 2022 16:25:07 +0100 Subject: [PATCH 09/24] Rebase to newest upstream snapshot Signed-off-by: Jan Friesse --- booth.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/booth.spec b/booth.spec index e5e3be0..4ce0809 100644 --- a/booth.spec +++ b/booth.spec @@ -28,7 +28,7 @@ # This will be used to fill booth_ver, booth_numcomm and booth_sha1. # It is important to keep abbrev to get full length sha1! When updating source use # `spectool -g booth.spec` to download source. -%global git_describe_str v1.0-272-g7acb75787196c25e66a0f749f690888bad066bf4 +%global git_describe_str v1.0-283-g9d4029aa14323a7f3b496215d25e40bd14f33632 # Set this to 1 when rebasing (changing git_describe_str) and increase otherwise %global release 1 @@ -310,6 +310,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Mon Nov 21 2022 Jan Friesse - 1.0-283.1.9d4029a.git +- Rebase to newest upstream snapshot + * Fri Sep 30 2022 Jan Friesse - 1.0-272.1.7acb757.git - Rebase to newest upstream snapshot diff --git a/sources b/sources index ea7b2c5..7e9c107 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (booth-1.0-272-7acb757.tar.gz) = 08d8930e7a14756ddc18ff5bcbe7e51496826df0cdb744941107fb6f1b6c05eefc909f12fcb269076a5ecc1d38f4ad35c40f022cccc66e685be99408371310d9 +SHA512 (booth-1.0-283-9d4029a.tar.gz) = 628a3e1e128d0fdcd4600d8d4b46220363575bda83c85cd43bfe940a2a29a9176490342261354138f8d4c593b611cf0282653c1e4b3d4b4841d99ef31ba45ada From 60703dfc8c8c0aa802096dece5d9bdc695d1ab8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 23:05:26 +0000 Subject: [PATCH 10/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- booth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/booth.spec b/booth.spec index 4ce0809..9e235c4 100644 --- a/booth.spec +++ b/booth.spec @@ -31,7 +31,7 @@ %global git_describe_str v1.0-283-g9d4029aa14323a7f3b496215d25e40bd14f33632 # Set this to 1 when rebasing (changing git_describe_str) and increase otherwise -%global release 1 +%global release 2 # Run shell script to parse git_describe str into version, numcomm and sha1 hash %global booth_ver %(s=%{git_describe_str}; vver=${s%%%%-*}; echo ${vver:1}) @@ -310,6 +310,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.0-283.2.9d4029a.git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Nov 21 2022 Jan Friesse - 1.0-283.1.9d4029a.git - Rebase to newest upstream snapshot From 4e2392507fd3c734e594c1c25ef57e8d5777438e Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Tue, 6 Jun 2023 11:00:55 +0200 Subject: [PATCH 11/24] Migrated to SPDX license Signed-off-by: Jan Friesse --- booth.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/booth.spec b/booth.spec index 9e235c4..8482165 100644 --- a/booth.spec +++ b/booth.spec @@ -31,7 +31,7 @@ %global git_describe_str v1.0-283-g9d4029aa14323a7f3b496215d25e40bd14f33632 # Set this to 1 when rebasing (changing git_describe_str) and increase otherwise -%global release 2 +%global release 3 # Run shell script to parse git_describe str into version, numcomm and sha1 hash %global booth_ver %(s=%{git_describe_str}; vver=${s%%%%-*}; echo ${vver:1}) @@ -59,7 +59,7 @@ Name: booth Version: %{booth_ver} Release: %{booth_numcomm}.%{release}.%{booth_short_sha1}.git%{?dist} Summary: Ticket Manager for Multi-site Clusters -License: GPLv2+ +License: GPL-2.0-or-later Url: https://github.com/%{github_owner}/%{name} Source0: https://github.com/%{github_owner}/%{name}/archive/%{booth_short_sha1}/%{booth_archive_name}.tar.gz @@ -310,6 +310,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Tue Jun 06 2023 Jan Friesse - 1.0-283.3.9d4029a.git +- migrated to SPDX license + * Wed Jan 18 2023 Fedora Release Engineering - 1.0-283.2.9d4029a.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d1dc7ab52bff837ddfb255e1493d06b77a9a8a54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 14:50:33 +0000 Subject: [PATCH 12/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- booth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/booth.spec b/booth.spec index 8482165..3d34ea3 100644 --- a/booth.spec +++ b/booth.spec @@ -31,7 +31,7 @@ %global git_describe_str v1.0-283-g9d4029aa14323a7f3b496215d25e40bd14f33632 # Set this to 1 when rebasing (changing git_describe_str) and increase otherwise -%global release 3 +%global release 4 # Run shell script to parse git_describe str into version, numcomm and sha1 hash %global booth_ver %(s=%{git_describe_str}; vver=${s%%%%-*}; echo ${vver:1}) @@ -310,6 +310,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.0-283.4.9d4029a.git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 06 2023 Jan Friesse - 1.0-283.3.9d4029a.git - migrated to SPDX license From 3838e60516e2c4ada00e3e9df2be60b87e00dd06 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Wed, 18 Oct 2023 17:23:25 +0200 Subject: [PATCH 13/24] New upstream release Signed-off-by: Jan Friesse --- booth.spec | 29 +++++++++-------------------- sources | 2 +- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/booth.spec b/booth.spec index 3d34ea3..e66a21e 100644 --- a/booth.spec +++ b/booth.spec @@ -24,22 +24,6 @@ %bcond_with run_build_tests %bcond_with include_unit_test -# set following to the result of `git describe --abbrev=128 $commit` -# This will be used to fill booth_ver, booth_numcomm and booth_sha1. -# It is important to keep abbrev to get full length sha1! When updating source use -# `spectool -g booth.spec` to download source. -%global git_describe_str v1.0-283-g9d4029aa14323a7f3b496215d25e40bd14f33632 - -# Set this to 1 when rebasing (changing git_describe_str) and increase otherwise -%global release 4 - -# Run shell script to parse git_describe str into version, numcomm and sha1 hash -%global booth_ver %(s=%{git_describe_str}; vver=${s%%%%-*}; echo ${vver:1}) -%global booth_numcomm %(s=%{git_describe_str}; t=${s#*-}; echo ${t%%%%-*}) -%global booth_sha1 %(s=%{git_describe_str}; t=${s##*-}; echo ${t:1}) -%global booth_short_sha1 %(s=%{booth_sha1}; echo ${s:0:7}) -%global booth_archive_name %{name}-%{booth_ver}-%{booth_numcomm}-%{booth_short_sha1} - ## User and group to use for nonprivileged services (should be in sync with pacemaker) %global uname hacluster %global gname haclient @@ -56,12 +40,12 @@ %global test_path %{_datadir}/booth/tests Name: booth -Version: %{booth_ver} -Release: %{booth_numcomm}.%{release}.%{booth_short_sha1}.git%{?dist} +Version: 1.1 +Release: 1%{?dist} Summary: Ticket Manager for Multi-site Clusters License: GPL-2.0-or-later Url: https://github.com/%{github_owner}/%{name} -Source0: https://github.com/%{github_owner}/%{name}/archive/%{booth_short_sha1}/%{booth_archive_name}.tar.gz +Source0: https://github.com/%{github_owner}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz # direct build process dependencies BuildRequires: autoconf @@ -192,7 +176,7 @@ Automated tests for running Booth, ticket manager for multi-site clusters. # BUILD # %prep -%autosetup -n %{name}-%{booth_sha1} -S git_am +%autosetup -n %{name}-%{version} -S git_am %build ./autogen.sh @@ -310,6 +294,11 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Wed Oct 18 2023 Jan Friesse - 1.1-1 +- New upstream release +- Upstream releases should now be released regularly, so convert spec + to use them instead of git snapshots + * Wed Jul 19 2023 Fedora Release Engineering - 1.0-283.4.9d4029a.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 7e9c107..a79876c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (booth-1.0-283-9d4029a.tar.gz) = 628a3e1e128d0fdcd4600d8d4b46220363575bda83c85cd43bfe940a2a29a9176490342261354138f8d4c593b611cf0282653c1e4b3d4b4841d99ef31ba45ada +SHA512 (booth-1.1.tar.gz) = dacc3258dd9a5f0dd72406eae753fb4900922bd2d906817a28c9ece7d7a1caaf5fd16959f8dff450382105358f2898c594171ae229ccd94e4d07f49668b0410d From aa5db6bc108fdf4f3b895a93c625735748f7a4d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:37:10 +0000 Subject: [PATCH 14/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- booth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/booth.spec b/booth.spec index e66a21e..faee685 100644 --- a/booth.spec +++ b/booth.spec @@ -41,7 +41,7 @@ Name: booth Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ticket Manager for Multi-site Clusters License: GPL-2.0-or-later Url: https://github.com/%{github_owner}/%{name} @@ -294,6 +294,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Oct 18 2023 Jan Friesse - 1.1-1 - New upstream release - Upstream releases should now be released regularly, so convert spec From 30c181b1bf96dc0e0637e9fadd97e076372a82b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 00:42:48 +0000 Subject: [PATCH 15/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- booth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/booth.spec b/booth.spec index faee685..6f7068f 100644 --- a/booth.spec +++ b/booth.spec @@ -41,7 +41,7 @@ Name: booth Version: 1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Ticket Manager for Multi-site Clusters License: GPL-2.0-or-later Url: https://github.com/%{github_owner}/%{name} @@ -294,6 +294,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9bab0b35941cdf11e79311dbe5d5c8910b756636 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 7 Jun 2024 08:51:54 +0200 Subject: [PATCH 16/24] New upstream release Signed-off-by: Jan Friesse --- booth.spec | 14 ++++++-------- sources | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/booth.spec b/booth.spec index 6f7068f..f105247 100644 --- a/booth.spec +++ b/booth.spec @@ -22,7 +22,6 @@ %bcond_with html_man %bcond_with glue %bcond_with run_build_tests -%bcond_with include_unit_test ## User and group to use for nonprivileged services (should be in sync with pacemaker) %global uname hacluster @@ -40,8 +39,8 @@ %global test_path %{_datadir}/booth/tests Name: booth -Version: 1.1 -Release: 3%{?dist} +Version: 1.2 +Release: 1%{?dist} Summary: Ticket Manager for Multi-site Clusters License: GPL-2.0-or-later Url: https://github.com/%{github_owner}/%{name} @@ -59,7 +58,7 @@ BuildRequires: asciidoctor BuildRequires: gcc BuildRequires: pkgconfig # linking dependencies -BuildRequires: libgcrypt-devel +BuildRequires: gnutls-devel BuildRequires: libxml2-devel ## just for include BuildRequires: pacemaker-libs-devel @@ -208,10 +207,6 @@ mkdir -p %{buildroot}/%{test_path} # Copy tests from tarball cp -a -t %{buildroot}/%{test_path} \ -- conf test -%if 0%{?with_include_unit_test} -cp -a -t %{buildroot}/%{test_path} \ - -- unit-tests script/unit-test.py -%endif chmod +x %{buildroot}/%{test_path}/test/booth_path chmod +x %{buildroot}/%{test_path}/test/live_test.sh mkdir -p %{buildroot}/%{test_path}/src @@ -294,6 +289,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Fri Jun 07 2024 Jan Friesse - 1.2-1 +- New upstream release + * Tue Jan 23 2024 Fedora Release Engineering - 1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index a79876c..67b588e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (booth-1.1.tar.gz) = dacc3258dd9a5f0dd72406eae753fb4900922bd2d906817a28c9ece7d7a1caaf5fd16959f8dff450382105358f2898c594171ae229ccd94e4d07f49668b0410d +SHA512 (booth-1.2.tar.gz) = b63217e561fd5e8ede1ba432ec6b4ef6efb73dc16a501814cf07b82f87a23c3f734ebf09c56a5d521668ee57ed02be48d257aabb1d2e3c4840f1219ef13d3fde From 10f558600c515975a487d1f24b64cd7f070a6890 Mon Sep 17 00:00:00 2001 From: Jan Friesse Date: Fri, 7 Jun 2024 17:50:28 +0200 Subject: [PATCH 17/24] Remove include_unit_test leftover Signed-off-by: Jan Friesse --- booth.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/booth.spec b/booth.spec index f105247..46be67f 100644 --- a/booth.spec +++ b/booth.spec @@ -163,9 +163,6 @@ Requires: %{name}-arbitrator = %{version}-%{release} Requires: %{name}-site = %{version}-%{release} Requires: gdb Requires: %{__python3} -%if 0%{?with_include_unit_test} -Requires: python3-pexpect -%endif # runtests.py suite (for perl and ss) Requires: perl-interpreter iproute From 9cfe41e4cb76a06f7528811e7583c8267a1495c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:31:15 +0000 Subject: [PATCH 18/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- booth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/booth.spec b/booth.spec index 46be67f..cc59bde 100644 --- a/booth.spec +++ b/booth.spec @@ -40,7 +40,7 @@ Name: booth Version: 1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ticket Manager for Multi-site Clusters License: GPL-2.0-or-later Url: https://github.com/%{github_owner}/%{name} @@ -286,6 +286,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Jan Friesse - 1.2-1 - New upstream release From a5992c0c6ebf856968b7a5b236b93a9b81fb1f86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 12:46:29 +0000 Subject: [PATCH 19/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- booth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/booth.spec b/booth.spec index cc59bde..16a5a36 100644 --- a/booth.spec +++ b/booth.spec @@ -40,7 +40,7 @@ Name: booth Version: 1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Ticket Manager for Multi-site Clusters License: GPL-2.0-or-later Url: https://github.com/%{github_owner}/%{name} @@ -286,6 +286,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 940a96107103cb4f35a0c239939c44712c61bd41 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:50:02 +0000 Subject: [PATCH 20/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- booth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/booth.spec b/booth.spec index 16a5a36..49124cc 100644 --- a/booth.spec +++ b/booth.spec @@ -40,7 +40,7 @@ Name: booth Version: 1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Ticket Manager for Multi-site Clusters License: GPL-2.0-or-later Url: https://github.com/%{github_owner}/%{name} @@ -286,6 +286,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b67eb9fd30eb83de8a4b84a6f0b167cacea24881 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:40:20 +0200 Subject: [PATCH 21/24] Rebuilt for Python 3.14.0rc2 bytecode --- booth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/booth.spec b/booth.spec index 49124cc..490a193 100644 --- a/booth.spec +++ b/booth.spec @@ -40,7 +40,7 @@ Name: booth Version: 1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Ticket Manager for Multi-site Clusters License: GPL-2.0-or-later Url: https://github.com/%{github_owner}/%{name} @@ -286,6 +286,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Fri Aug 15 2025 Python Maint - 1.2-5 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Jul 23 2025 Fedora Release Engineering - 1.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 59251abe216a4ecb9fe7e068284032ed23b2e9e7 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Thu, 21 Aug 2025 19:19:14 +0200 Subject: [PATCH 22/24] Convert STI tests to TMT (rhbz#2382867) --- .fmf/version | 1 + booth.spec | 3 +++ plans.fmf | 13 +++++++++++++ tests/main.fmf | 3 +++ tests/tests.yml | 9 --------- 5 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 .fmf/version create mode 100644 plans.fmf create mode 100644 tests/main.fmf delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/booth.spec b/booth.spec index 490a193..ab74ba2 100644 --- a/booth.spec +++ b/booth.spec @@ -286,6 +286,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Thu Aug 21 2025 Cristian Le +- Convert STI tests to TMT (rhbz#2382867) + * Fri Aug 15 2025 Python Maint - 1.2-5 - Rebuilt for Python 3.14.0rc2 bytecode diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..eb36cda --- /dev/null +++ b/plans.fmf @@ -0,0 +1,13 @@ +summary: Run all tests +discover: + how: fmf +prepare: + - name: Disable installing everything from srpm + how: install + exclude: ".*" + - name: Install the main test package + how: install + package: + - booth-test +execute: + how: tmt diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..6e8835d --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,3 @@ +/upstream: + summary: Run upstream tests + test: ./upstream/runtest.sh diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 8ee75ea..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,9 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - tests: - - upstream - required_packages: - - booth-test From 676cc02d31e2f8338226be538e487b2af52f4816 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:09:18 +0200 Subject: [PATCH 23/24] Rebuilt for Python 3.14.0rc3 bytecode --- booth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/booth.spec b/booth.spec index ab74ba2..8a7166e 100644 --- a/booth.spec +++ b/booth.spec @@ -40,7 +40,7 @@ Name: booth Version: 1.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Ticket Manager for Multi-site Clusters License: GPL-2.0-or-later Url: https://github.com/%{github_owner}/%{name} @@ -286,6 +286,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Fri Sep 19 2025 Python Maint - 1.2-6 +- Rebuilt for Python 3.14.0rc3 bytecode + * Thu Aug 21 2025 Cristian Le - Convert STI tests to TMT (rhbz#2382867) From 48221721238cf603f4fa488ac84172eafb18e9a7 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Wed, 1 Oct 2025 14:27:04 +0200 Subject: [PATCH 24/24] Ensure test is executable --- tests/upstream/runtest.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tests/upstream/runtest.sh diff --git a/tests/upstream/runtest.sh b/tests/upstream/runtest.sh old mode 100644 new mode 100755