Compare commits
No commits in common. "imports/c10s/booth-1.2-2.el10" and "c8" have entirely different histories.
imports/c1
...
c8
7
.gitignore
vendored
7
.gitignore
vendored
@ -1,6 +1 @@
|
|||||||
/booth-*.tar.gz
|
SOURCES/booth-1.1.tar.gz
|
||||||
/booth-*.rpm
|
|
||||||
/booth-*/
|
|
||||||
|
|
||||||
*~
|
|
||||||
*.sw?
|
|
||||||
|
37
SOURCES/RHEL-32613-1-attr-Fix-reading-of-server_reply.patch
Normal file
37
SOURCES/RHEL-32613-1-attr-Fix-reading-of-server_reply.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
From 4bdd96d767fc38239c4fac9e95404da99f61ac65 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jan Friesse <jfriesse@redhat.com>
|
||||||
|
Date: Wed, 21 Feb 2024 17:40:11 +0100
|
||||||
|
Subject: [PATCH 1/4] attr: Fix reading of server_reply
|
||||||
|
|
||||||
|
read_server_reply first reads boothc header and then rest of packet
|
||||||
|
which contains hmac info. This should go in memory right after
|
||||||
|
boothc_header and not after full length of packet, because full length
|
||||||
|
of packet already contains hmac info.
|
||||||
|
|
||||||
|
Solution is to simply use length of header and not length of packet.
|
||||||
|
|
||||||
|
Longer term and better solution would be to drop read_server_reply
|
||||||
|
completely and use recv_auth which is used for everything else but attr
|
||||||
|
set and delete.
|
||||||
|
|
||||||
|
Signed-off-by: Jan Friesse <jfriesse@redhat.com>
|
||||||
|
---
|
||||||
|
src/attr.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/attr.c b/src/attr.c
|
||||||
|
index 44061e3..bc154f0 100644
|
||||||
|
--- a/src/attr.c
|
||||||
|
+++ b/src/attr.c
|
||||||
|
@@ -142,7 +142,7 @@ static int read_server_reply(
|
||||||
|
return -2;
|
||||||
|
}
|
||||||
|
len = ntohl(header->length);
|
||||||
|
- rv = tpt->recv(site, msg+len, len-sizeof(*header));
|
||||||
|
+ rv = tpt->recv(site, msg+sizeof(*header), len-sizeof(*header));
|
||||||
|
if (rv < 0) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
@ -0,0 +1,65 @@
|
|||||||
|
From 91fcfb5708f829ecff7d098ed4c0fc8f2da6d599 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jan Friesse <jfriesse@redhat.com>
|
||||||
|
Date: Wed, 21 Feb 2024 18:12:28 +0100
|
||||||
|
Subject: [PATCH 2/4] auth: Check result of gcrypt gcry_md_get_algo_dlen
|
||||||
|
|
||||||
|
When unknown hash is passed to gcry_md_get_algo_dlen 0 is returned. This
|
||||||
|
value is then used for memcmp so wrong hmac might be accepted as
|
||||||
|
correct.
|
||||||
|
|
||||||
|
Signed-off-by: Jan Friesse <jfriesse@redhat.com>
|
||||||
|
---
|
||||||
|
src/auth.c | 16 +++++++++++++---
|
||||||
|
1 file changed, 13 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/auth.c b/src/auth.c
|
||||||
|
index 8f86b9a..a3b3d20 100644
|
||||||
|
--- a/src/auth.c
|
||||||
|
+++ b/src/auth.c
|
||||||
|
@@ -28,6 +28,11 @@ int calc_hmac(const void *data, size_t datalen,
|
||||||
|
{
|
||||||
|
static gcry_md_hd_t digest;
|
||||||
|
gcry_error_t err;
|
||||||
|
+ int hlen;
|
||||||
|
+
|
||||||
|
+ hlen = gcry_md_get_algo_dlen(hid);
|
||||||
|
+ if (!hlen)
|
||||||
|
+ return -1;
|
||||||
|
|
||||||
|
if (!digest) {
|
||||||
|
err = gcry_md_open(&digest, hid, GCRY_MD_FLAG_HMAC);
|
||||||
|
@@ -42,7 +47,7 @@ int calc_hmac(const void *data, size_t datalen,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
gcry_md_write(digest, data, datalen);
|
||||||
|
- memcpy(result, gcry_md_read(digest, 0), gcry_md_get_algo_dlen(hid));
|
||||||
|
+ memcpy(result, gcry_md_read(digest, 0), hlen);
|
||||||
|
gcry_md_reset(digest);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
@@ -54,15 +59,20 @@ int verify_hmac(const void *data, size_t datalen,
|
||||||
|
{
|
||||||
|
unsigned char *our_hmac;
|
||||||
|
int rc;
|
||||||
|
+ int hlen;
|
||||||
|
+
|
||||||
|
+ hlen = gcry_md_get_algo_dlen(hid);
|
||||||
|
+ if (!hlen)
|
||||||
|
+ return -1;
|
||||||
|
|
||||||
|
- our_hmac = malloc(gcry_md_get_algo_dlen(hid));
|
||||||
|
+ our_hmac = malloc(hlen);
|
||||||
|
if (!our_hmac)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
rc = calc_hmac(data, datalen, hid, our_hmac, key, keylen);
|
||||||
|
if (rc)
|
||||||
|
goto out_free;
|
||||||
|
- rc = memcmp(our_hmac, hmac, gcry_md_get_algo_dlen(hid));
|
||||||
|
+ rc = memcmp(our_hmac, hmac, hlen);
|
||||||
|
|
||||||
|
out_free:
|
||||||
|
if (our_hmac)
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
@ -0,0 +1,106 @@
|
|||||||
|
From 87c8545816cca03d19c2f3ef54031940f7e19d50 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jan Friesse <jfriesse@redhat.com>
|
||||||
|
Date: Fri, 18 Nov 2022 11:57:46 +0100
|
||||||
|
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 <jfriesse@redhat.com>
|
||||||
|
---
|
||||||
|
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 0f3d2c1..c7a8413 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.
|
||||||
|
+
|
||||||
|
'debug'::
|
||||||
|
Specifies the debug output level. Alternative to
|
||||||
|
command line argument. Effective only for 'daemon'
|
||||||
|
diff --git a/src/config.c b/src/config.c
|
||||||
|
index f0ca4aa..e1f25f0 100644
|
||||||
|
--- a/src/config.c
|
||||||
|
+++ b/src/config.c
|
||||||
|
@@ -732,6 +732,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.27.0
|
||||||
|
|
@ -22,6 +22,7 @@
|
|||||||
%bcond_with html_man
|
%bcond_with html_man
|
||||||
%bcond_with glue
|
%bcond_with glue
|
||||||
%bcond_with run_build_tests
|
%bcond_with run_build_tests
|
||||||
|
%bcond_without include_unit_test
|
||||||
|
|
||||||
## User and group to use for nonprivileged services (should be in sync with pacemaker)
|
## User and group to use for nonprivileged services (should be in sync with pacemaker)
|
||||||
%global uname hacluster
|
%global uname hacluster
|
||||||
@ -39,12 +40,15 @@
|
|||||||
%global test_path %{_datadir}/booth/tests
|
%global test_path %{_datadir}/booth/tests
|
||||||
|
|
||||||
Name: booth
|
Name: booth
|
||||||
Version: 1.2
|
Version: 1.1
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}.1
|
||||||
Summary: Ticket Manager for Multi-site Clusters
|
Summary: Ticket Manager for Multi-site Clusters
|
||||||
License: GPL-2.0-or-later
|
License: GPLv2+
|
||||||
Url: https://github.com/%{github_owner}/%{name}
|
Url: https://github.com/%{github_owner}/%{name}
|
||||||
Source0: https://github.com/%{github_owner}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/%{github_owner}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
||||||
|
Patch0: rhel-specific-0001-config-Add-enable-authfile-option.patch
|
||||||
|
Patch1: RHEL-32613-1-attr-Fix-reading-of-server_reply.patch
|
||||||
|
Patch2: RHEL-32613-2-auth-Check-result-of-gcrypt-gcry_md_get_algo_dlen.patch
|
||||||
|
|
||||||
# direct build process dependencies
|
# direct build process dependencies
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
@ -54,11 +58,11 @@ BuildRequires: make
|
|||||||
## ./autogen.sh
|
## ./autogen.sh
|
||||||
BuildRequires: /bin/sh
|
BuildRequires: /bin/sh
|
||||||
# general build dependencies
|
# general build dependencies
|
||||||
BuildRequires: asciidoctor
|
BuildRequires: asciidoc
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
# linking dependencies
|
# linking dependencies
|
||||||
BuildRequires: gnutls-devel
|
BuildRequires: libgcrypt-devel
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
## just for <pacemaker/crm/services.h> include
|
## just for <pacemaker/crm/services.h> include
|
||||||
BuildRequires: pacemaker-libs-devel
|
BuildRequires: pacemaker-libs-devel
|
||||||
@ -81,8 +85,8 @@ BuildRequires: systemd
|
|||||||
## for autosetup
|
## for autosetup
|
||||||
BuildRequires: git
|
BuildRequires: git
|
||||||
%if 0%{?with_run_build_tests}
|
%if 0%{?with_run_build_tests}
|
||||||
# check scriptlet (for perl and ss)
|
# check scriptlet (for perl and netstat)
|
||||||
BuildRequires: perl-interpreter iproute
|
BuildRequires: perl-interpreter net-tools
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# this is for a composite-requiring-its-components arranged
|
# this is for a composite-requiring-its-components arranged
|
||||||
@ -163,8 +167,11 @@ Requires: %{name}-arbitrator = %{version}-%{release}
|
|||||||
Requires: %{name}-site = %{version}-%{release}
|
Requires: %{name}-site = %{version}-%{release}
|
||||||
Requires: gdb
|
Requires: gdb
|
||||||
Requires: %{__python3}
|
Requires: %{__python3}
|
||||||
# runtests.py suite (for perl and ss)
|
%if 0%{?with_include_unit_test}
|
||||||
Requires: perl-interpreter iproute
|
Requires: python3-pexpect
|
||||||
|
%endif
|
||||||
|
# runtests.py suite (for perl and netstat)
|
||||||
|
Requires: perl-interpreter net-tools
|
||||||
|
|
||||||
%description test
|
%description test
|
||||||
Automated tests for running Booth, ticket manager for multi-site clusters.
|
Automated tests for running Booth, ticket manager for multi-site clusters.
|
||||||
@ -204,6 +211,10 @@ mkdir -p %{buildroot}/%{test_path}
|
|||||||
# Copy tests from tarball
|
# Copy tests from tarball
|
||||||
cp -a -t %{buildroot}/%{test_path} \
|
cp -a -t %{buildroot}/%{test_path} \
|
||||||
-- conf test
|
-- 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/booth_path
|
||||||
chmod +x %{buildroot}/%{test_path}/test/live_test.sh
|
chmod +x %{buildroot}/%{test_path}/test/live_test.sh
|
||||||
mkdir -p %{buildroot}/%{test_path}/src
|
mkdir -p %{buildroot}/%{test_path}/src
|
||||||
@ -286,162 +297,78 @@ VERBOSE=1 make check
|
|||||||
%{_usr}/lib/ocf/resource.d/booth/sharedrsc
|
%{_usr}/lib/ocf/resource.d/booth/sharedrsc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.2-2
|
* Tue Apr 30 2024 Jan Friesse <jfriesse@redhat.com> - 1.1-1.1
|
||||||
- Bump release for June 2024 mass rebuild
|
- Resolves: RHEL-32613
|
||||||
|
|
||||||
* Fri Jun 07 2024 Jan Friesse <jfriesse@redhat.com> - 1.2-1
|
- attr: Fix reading of server_reply
|
||||||
- Resolves: RHEL-22016
|
- auth: Check result of gcrypt gcry_md_get_algo_dlen (fixes CVE-2024-3049)
|
||||||
- Resolves: RHEL-40410
|
|
||||||
|
|
||||||
- New upstream release (RHEL-40410)
|
* Thu Nov 23 2023 Jan Friesse <jfriesse@redhat.com> - 1.1-1
|
||||||
- Add support for GnuTLS and stop using libgcrypt (RHEL-22016)
|
- Resolves: RHEL-15265
|
||||||
|
|
||||||
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-3
|
- New upstream release (RHEL-15265)
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Oct 18 2023 Jan Friesse <jfriesse@redhat.com> - 1.1-1
|
|
||||||
- New upstream release
|
|
||||||
- Upstream releases should now be released regularly, so convert spec
|
- Upstream releases should now be released regularly, so convert spec
|
||||||
to use them instead of git snapshots
|
to use them instead of git snapshots (RHEL-15265)
|
||||||
|
|
||||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-283.4.9d4029a.git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jun 06 2023 Jan Friesse <jfriesse@redhat.com> - 1.0-283.3.9d4029a.git
|
|
||||||
- migrated to SPDX license
|
|
||||||
|
|
||||||
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-283.2.9d4029a.git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Nov 21 2022 Jan Friesse <jfriesse@redhat.com> - 1.0-283.1.9d4029a.git
|
* Mon Nov 21 2022 Jan Friesse <jfriesse@redhat.com> - 1.0-283.1.9d4029a.git
|
||||||
- Rebase to newest upstream snapshot
|
- Resolves: rhbz#2135865
|
||||||
|
|
||||||
* Fri Sep 30 2022 Jan Friesse <jfriesse@redhat.com> - 1.0-272.1.7acb757.git
|
- Update to current snapshot (commit 9d4029a) (rhbz#2135865)
|
||||||
- Rebase to newest upstream snapshot
|
|
||||||
|
|
||||||
* Thu Sep 29 2022 Jan Friesse <jfriesse@redhat.com> - 1.0-266.4.f288d59.git
|
* Wed Aug 03 2022 Jan Friesse <jfriesse@redhat.com> - 1.0-199.2.ac1d34c.git
|
||||||
- Remove Alias directive from booth@.service unit file
|
- Resolves: rhbz#2111668
|
||||||
|
|
||||||
* Tue Aug 09 2022 Jan Friesse <jfriesse@redhat.com> - 1.0-266.3.f288d59.git
|
- Fix authfile directive handling in booth config file
|
||||||
- Remove template unit from systemd_(post|preun|postun_with_restart) macro
|
(fixes CVE-2022-2553)
|
||||||
|
- Add enable-authfile option
|
||||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-266.2.f288d59.git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 20 2022 Jan Friesse <jfriesse@redhat.com> - 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 <jfriesse@redhat.com> - 1.0-262.1.d0ac26c.git
|
|
||||||
- Rebase to newest upstream snapshot
|
|
||||||
|
|
||||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-251.3.bfb2f92.git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-251.2.bfb2f92.git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu May 20 2021 Jan Friesse <jfriesse@redhat.com> - 1.0-251.1.bfb2f92.git
|
|
||||||
- Rebase to newest upstream snapshot
|
|
||||||
|
|
||||||
* Tue May 18 2021 Jan Friesse <jfriesse@redhat.com> - 1.0-249.1.977726e.git
|
|
||||||
- Do not include unit-test by default
|
|
||||||
- Rebase to newest upstream snapshot
|
|
||||||
|
|
||||||
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.0-239.3.52ec255.git
|
|
||||||
- Rebuilt for updated systemd-rpm-macros
|
|
||||||
See https://pagure.io/fesco/issue/2583.
|
|
||||||
|
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-239.2.52ec255.git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Nov 23 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-239.1.52ec255.git
|
|
||||||
- Rebase to newest upstream snapshot
|
|
||||||
|
|
||||||
* Thu Oct 15 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-237.2.dd88847.git
|
|
||||||
- Fix dist macro
|
|
||||||
|
|
||||||
* Thu Oct 15 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-237.1.dd88847.git
|
|
||||||
- Rebase to newest upstream snapshot
|
|
||||||
|
|
||||||
* Thu Oct 15 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-199.1.ac1d34c.git
|
* Thu Oct 15 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-199.1.ac1d34c.git
|
||||||
- Implement new versioning scheme
|
- Resolves: rhbz#1873948
|
||||||
|
- Resolves: rhbz#1768172
|
||||||
|
|
||||||
* Tue Sep 29 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-6.ac1d34c.git.5
|
- Fix versioning scheme to handle updates better
|
||||||
- Remove net-tools (netstat) dependency and replace it with iproute (ss)
|
- Handle updated exit code of crm_ticket
|
||||||
- Disable running tests during build by default (conditional run_build_tests)
|
|
||||||
|
|
||||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-6.ac1d34c.git.4
|
* Wed Jun 3 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-6.ac1d34c.git.2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
- Related: rhbz#1835831
|
||||||
|
|
||||||
* Wed Jun 3 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-6.ac1d34c.git.3
|
|
||||||
- Do not link with the pcmk libraries
|
- Do not link with the pcmk libraries
|
||||||
- Generate runtests.py and boothtestenv.py with -Es as make check does
|
- Generate runtests.py and boothtestenv.py with -Es as make check does
|
||||||
|
|
||||||
* Tue Jun 2 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-6.ac1d34c.git.2
|
|
||||||
- Require the Python interpreter directly instead of using the package name
|
|
||||||
|
|
||||||
* Tue Jun 2 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-6.ac1d34c.git.1
|
* Tue Jun 2 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-6.ac1d34c.git.1
|
||||||
- Update to current snapshot (commit ac1d34c) to fix test suite
|
- Resolves: rhbz#1602455
|
||||||
|
- Resolves: rhbz#1682122
|
||||||
|
- Resolves: rhbz#1768369
|
||||||
|
- Resolves: rhbz#1835831
|
||||||
|
|
||||||
* Mon Jun 1 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-5.385cc25.git.3
|
- Update to current snapshot (commit ac1d34c) to fix test suite,
|
||||||
|
build warnings and build with gcc10
|
||||||
|
- Fix hardcoded-library-path
|
||||||
|
- Package /var/lib/booth where booth can chroot
|
||||||
|
- Add '?dist' macro to release field
|
||||||
|
- Pass full path of Python3 to configure
|
||||||
- Add CI tests
|
- Add CI tests
|
||||||
- Enable gating
|
- Enable gating
|
||||||
- Fix hardcoded-library-path
|
|
||||||
|
|
||||||
* Mon Jun 1 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-5.385cc25.git.2
|
* Wed Sep 19 2018 Tomas Orsava <torsava@redhat.com> - 1.0-5.f2d38ce.git
|
||||||
- Package /var/lib/booth where booth can chroot
|
- Require the Python interpreter directly instead of using the package name
|
||||||
|
- Related: rhbz#1619153
|
||||||
|
|
||||||
* Thu May 28 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-5.385cc25.git.1
|
* Thu Jul 19 2018 Jan Pokorný <jpokorny+rpm-booth@redhat.com> - 1.0-4.f2d38ce.git
|
||||||
- Fix test subpackage generating
|
- revert back to using asciidoc instead of asciidoctor for generating man pages
|
||||||
|
(rhbz#1603119)
|
||||||
|
- fix some issues in the shell scripts (rhbz#1602455)
|
||||||
|
|
||||||
* Wed May 27 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-5.385cc25.git
|
* Mon Jul 16 2018 Jan Pokorný <jpokorny+rpm-booth@redhat.com> - 1.0-3.f2d38ce.git
|
||||||
- Update to current snapshot (commit 385cc25) to fix build warnings
|
|
||||||
|
|
||||||
* Wed May 13 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-4.5d837d2.git.2
|
|
||||||
- Rebuild for the new libqb
|
|
||||||
|
|
||||||
* Mon May 4 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-4.5d837d2.git.1
|
|
||||||
- Add '?dist' macro to release field
|
|
||||||
|
|
||||||
* Mon May 4 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-4.5d837d2.git
|
|
||||||
- Update to current snapshot (commit 5d837d2) to build with gcc10
|
|
||||||
- Pass full path of Python3 to configure
|
|
||||||
|
|
||||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-3.f2d38ce.git.3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-3.f2d38ce.git.2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-3.f2d38ce.git.1
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jul 13 2018 Jan Pokorný <jpokorny+rpm-booth@fedoraproject.org> - 1.0-3.f2d38ce.git
|
|
||||||
- update for another, current snapshot beyond booth-1.0
|
- update for another, current snapshot beyond booth-1.0
|
||||||
(commit f2d38ce), including:
|
(commit f2d38ce), including:
|
||||||
. support for solely manually managed tickets (9a365f9)
|
. support for solely manually managed tickets (9a365f9)
|
||||||
. use asciidoctor instead of asciidoc for generating man pages (65e6a6b)
|
. use asciidoctor instead of asciidoc for generating man pages (65e6a6b)
|
||||||
- switch to using Python 3 for the tests instead of Python 2
|
- switch to using Python 3 for the tests instead of Python 2
|
||||||
(behind unversioned "python" references; rhbz#1555651)
|
(behind unversioned "python" references; rhbz#1590856)
|
||||||
|
|
||||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2.570876d.git.6
|
* Thu Jun 21 2018 Troy Dawson <tdawson@redhat.com> - 1.0-2.570876d.git.3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
- Fix python shebangs (#1580601)
|
||||||
|
|
||||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2.570876d.git.5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2.570876d.git.4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2.570876d.git.3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2.570876d.git.2
|
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2.570876d.git.2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
@ -1,27 +0,0 @@
|
|||||||
# 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')
|
|
||||||
addFilter(r'booth-core\.[^:]+: (E|W): non-standard-dir-perm /var/lib/booth/cores 750')
|
|
||||||
|
|
||||||
# booth is just metapackage
|
|
||||||
addFilter(r'booth\.[^:]+: (W|E): no-binary')
|
|
||||||
|
|
||||||
# pc should be in devel but it is not really devel file
|
|
||||||
addFilter(r'booth\.[^:]+: W: devel-file-in-non-devel-package /usr/share/pkgconfig/booth.pc')
|
|
||||||
|
|
||||||
# booth-(site|test) installs just scripts in /usr/lib
|
|
||||||
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')
|
|
||||||
|
|
||||||
# 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')
|
|
15
gating.yaml
15
gating.yaml
@ -1,15 +0,0 @@
|
|||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- fedora-*
|
|
||||||
decision_context: bodhi_update_push_testing
|
|
||||||
subject_type: koji_build
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
|
||||||
|
|
||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- fedora-*
|
|
||||||
decision_context: bodhi_update_push_stable
|
|
||||||
subject_type: koji_build
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
|
1
sources
1
sources
@ -1 +0,0 @@
|
|||||||
SHA512 (booth-1.2.tar.gz) = b63217e561fd5e8ede1ba432ec6b4ef6efb73dc16a501814cf07b82f87a23c3f734ebf09c56a5d521668ee57ed02be48d257aabb1d2e3c4840f1219ef13d3fde
|
|
3
tests/.gitignore
vendored
3
tests/.gitignore
vendored
@ -1,3 +0,0 @@
|
|||||||
# Ignore tests runs/artefacts.
|
|
||||||
artifacts/**
|
|
||||||
**/*.retry
|
|
@ -1,9 +0,0 @@
|
|||||||
- hosts: localhost
|
|
||||||
roles:
|
|
||||||
- role: standard-test-basic
|
|
||||||
tags:
|
|
||||||
- classic
|
|
||||||
tests:
|
|
||||||
- upstream
|
|
||||||
required_packages:
|
|
||||||
- booth-test
|
|
@ -1,6 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -xe
|
|
||||||
set -o pipefail
|
|
||||||
|
|
||||||
/usr/share/booth/tests/test/runtests.py --allow-root-user
|
|
Loading…
Reference in New Issue
Block a user