summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2024-08-03 05:24:22 +0000
committerCoprDistGit <infra@openeuler.org>2024-08-03 05:24:22 +0000
commit3308e330cb1f21dc2a3af9a08437d6734dbdf0c9 (patch)
treee1ff9c0cea91e5871c7504e31545e13b1b725dfc
parent36ecc03ffa294ce4f208ef2cd3eb1cea0ed72bc0 (diff)
automatic import of boothopeneuler24.03_LTS
-rw-r--r--.gitignore1
-rw-r--r--booth.spec453
-rw-r--r--rhel-specific-0001-config-Add-enable-authfile-option.patch106
-rw-r--r--sources1
4 files changed, 561 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index e69de29..a6de3b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/booth-1.1.tar.gz
diff --git a/booth.spec b/booth.spec
new file mode 100644
index 0000000..a64fbc4
--- /dev/null
+++ b/booth.spec
@@ -0,0 +1,453 @@
+# RPMs are split as follows:
+# * booth:
+# - envelope package serving as a syntactic shortcut to install
+# booth-site (with architecture reliably preserved)
+# * booth-core:
+# - package serving as a base for booth-{arbitrator,site},
+# carrying also basic documentation, license, etc.
+# * booth-arbitrator:
+# - package to be installed at a machine accessible within HA cluster(s),
+# but not (necessarily) a member of any, hence no dependency
+# on anything from cluster stack is required
+# * booth-site:
+# - package to be installed at a cluster member node
+# (requires working cluster environment to be useful)
+# * booth-test:
+# - files for testing booth
+#
+# TODO:
+# wireshark-dissector.lua currently of no use (rhbz#1259623), but if/when
+# this no longer persists, add -wireshark package (akin to libvirt-wireshark)
+
+%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
+%global gname haclient
+
+# Disable automatic compilation of Python files in extra directories
+%global _python_bytecompile_extra 0
+
+%global github_owner ClusterLabs
+
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}}
+# https://fedoraproject.org/wiki/EPEL:Packaging?rd=Packaging:EPEL#The_.25license_tag
+%{!?_licensedir:%global license %doc}
+
+%global test_path %{_datadir}/booth/tests
+
+Name: booth
+Version: 1.1
+Release: 1%{?dist}
+Summary: Ticket Manager for Multi-site Clusters
+License: GPLv2+
+Url: https://github.com/%{github_owner}/%{name}
+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
+
+# direct build process dependencies
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: coreutils
+BuildRequires: make
+## ./autogen.sh
+BuildRequires: /bin/sh
+# general build dependencies
+BuildRequires: asciidoctor
+BuildRequires: gcc
+BuildRequires: pkgconfig
+# linking dependencies
+BuildRequires: libgcrypt-devel
+BuildRequires: libxml2-devel
+## just for <pacemaker/crm/services.h> include
+BuildRequires: pacemaker-libs-devel
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: zlib-devel
+## logging provider
+BuildRequires: pkgconfig(libqb)
+## random2range provider
+BuildRequires: pkgconfig(glib-2.0)
+## nametag provider
+BuildRequires: pkgconfig(libsystemd)
+# check scriptlet (for hostname and killall respectively)
+BuildRequires: hostname psmisc
+BuildRequires: python3-devel
+# For generating tests
+BuildRequires: sed
+# spec file specifics
+## for _unitdir, systemd_requires and specific scriptlet macros
+BuildRequires: systemd
+## for autosetup
+BuildRequires: git
+%if 0%{?with_run_build_tests}
+# check scriptlet (for perl and ss)
+BuildRequires: perl-interpreter iproute
+%endif
+
+# this is for a composite-requiring-its-components arranged
+# as an empty package (empty files section) requiring subpackages
+# (_isa so as to preserve the architecture)
+Requires: %{name}-core%{?_isa}
+Requires: %{name}-site
+%files
+%license COPYING
+%dir %{_datadir}/pkgconfig
+%{_datadir}/pkgconfig/booth.pc
+
+%description
+Booth manages tickets which authorize cluster sites located
+in geographically dispersed locations to run resources.
+It facilitates support of geographically distributed
+clustering in Pacemaker.
+
+# SUBPACKAGES #
+
+%package core
+Summary: Booth core files (executables, etc.)
+# for booth-keygen (chown, dd)
+Requires: coreutils
+# deal with pre-split arrangement
+Conflicts: %{name} < 1.0-1
+
+%description core
+Core files (executables, etc.) for Booth, ticket manager for
+multi-site clusters.
+
+%package arbitrator
+Summary: Booth support for running as an arbitrator
+BuildArch: noarch
+Requires: %{name}-core = %{version}-%{release}
+%{?systemd_requires}
+# deal with pre-split arrangement
+Conflicts: %{name} < 1.0-1
+
+%description arbitrator
+Support for running Booth, ticket manager for multi-site clusters,
+as an arbitrator.
+
+%post arbitrator
+%systemd_post booth-arbitrator.service
+
+%preun arbitrator
+%systemd_preun booth-arbitrator.service
+
+%postun arbitrator
+%systemd_postun_with_restart booth-arbitrator.service
+
+%package site
+Summary: Booth support for running as a full-fledged site
+BuildArch: noarch
+Requires: %{name}-core = %{version}-%{release}
+# for crm_{resource,simulate,ticket} utilities
+Requires: pacemaker >= 1.1.8
+# for ocf-shellfuncs and other parts of OCF shell-based environment
+Requires: resource-agents
+# deal with pre-split arrangement
+Conflicts: %{name} < 1.0-1
+
+%description site
+Support for running Booth, ticket manager for multi-site clusters,
+as a full-fledged site.
+
+%package test
+Summary: Test scripts for Booth
+BuildArch: noarch
+# runtests.py suite (for hostname and killall respectively)
+Requires: hostname psmisc
+# any of the following internal dependencies will pull -core package
+## for booth@booth.service
+Requires: %{name}-arbitrator = %{version}-%{release}
+## for booth-site and service-runnable scripts
+## (and /usr/lib/ocf/resource.d/booth)
+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
+
+%description test
+Automated tests for running Booth, ticket manager for multi-site clusters.
+
+# BUILD #
+
+%prep
+%autosetup -n %{name}-%{version} -S git_am
+
+%build
+./autogen.sh
+%{configure} \
+ --with-initddir=%{_initrddir} \
+ --docdir=%{_pkgdocdir} \
+ --enable-user-flags \
+ %{?with_html_man:--with-html_man} \
+ %{!?with_glue:--without-glue} \
+ PYTHON=%{__python3}
+%{make_build}
+
+%install
+%{make_install}
+mkdir -p %{buildroot}/%{_unitdir}
+cp -a -t %{buildroot}/%{_unitdir} \
+ -- conf/booth@.service conf/booth-arbitrator.service
+install -D -m 644 -t %{buildroot}/%{_mandir}/man8 \
+ -- docs/boothd.8
+ln -s boothd.8 %{buildroot}/%{_mandir}/man8/booth.8
+cp -a -t %{buildroot}/%{_pkgdocdir} \
+ -- ChangeLog README-testing conf/booth.conf.example
+# drop what we don't package anyway (COPYING added via tarball-relative path)
+rm -rf %{buildroot}/%{_initrddir}/booth-arbitrator
+rm -rf %{buildroot}/%{_pkgdocdir}/README.upgrade-from-v0.1
+rm -rf %{buildroot}/%{_pkgdocdir}/COPYING
+# tests
+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
+ln -s -t %{buildroot}/%{test_path}/src \
+ -- %{_sbindir}/boothd
+# Generate runtests.py and boothtestenv.py
+sed -e 's#PYTHON_SHEBANG#%{__python3} -Es#g' \
+ -e 's#TEST_SRC_DIR#%{test_path}/test#g' \
+ -e 's#TEST_BUILD_DIR#%{test_path}/test#g' \
+ %{buildroot}/%{test_path}/test/runtests.py.in > %{buildroot}/%{test_path}/test/runtests.py
+
+chmod +x %{buildroot}/%{test_path}/test/runtests.py
+
+sed -e 's#PYTHON_SHEBANG#%{__python3} -Es#g' \
+ -e 's#TEST_SRC_DIR#%{test_path}/test#g' \
+ -e 's#TEST_BUILD_DIR#%{test_path}/test#g' \
+ %{buildroot}/%{test_path}/test/boothtestenv.py.in > %{buildroot}/%{test_path}/test/boothtestenv.py
+
+# https://fedoraproject.org/wiki/Packaging:Python_Appendix#Manual_byte_compilation
+%py_byte_compile %{__python3} %{buildroot}/%{test_path}
+
+%check
+# alternatively: test/runtests.py
+%if 0%{?with_run_build_tests}
+VERBOSE=1 make check
+%endif
+
+%files core
+%license COPYING
+%doc %{_pkgdocdir}/AUTHORS
+%doc %{_pkgdocdir}/ChangeLog
+%doc %{_pkgdocdir}/README
+%doc %{_pkgdocdir}/booth.conf.example
+# core command(s) + man pages
+%{_sbindir}/booth*
+%{_mandir}/man8/booth*.8*
+# configuration
+%dir %{_sysconfdir}/booth
+%exclude %{_sysconfdir}/booth/booth.conf.example
+
+%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/
+%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/cores
+
+# Generated html docs
+%if 0%{?with_html_man}
+%{_pkgdocdir}/booth-keygen.8.html
+%{_pkgdocdir}/boothd.8.html
+%endif
+
+%files arbitrator
+%{_unitdir}/booth@.service
+%{_unitdir}/booth-arbitrator.service
+
+%files site
+# OCF (agent + a helper)
+## /usr/lib/ocf/resource.d/pacemaker provided by pacemaker
+%{_usr}/lib/ocf/resource.d/pacemaker/booth-site
+%dir %{_usr}/lib/ocf/lib/booth
+ %{_usr}/lib/ocf/lib/booth/geo_attr.sh
+# geostore (command + OCF agent)
+%{_sbindir}/geostore
+%{_mandir}/man8/geostore.8*
+## /usr/lib/ocf/resource.d provided by resource-agents
+%dir %{_usr}/lib/ocf/resource.d/booth
+ %{_usr}/lib/ocf/resource.d/booth/geostore
+# helper (possibly used in the configuration hook)
+%dir %{_datadir}/booth
+ %{_datadir}/booth/service-runnable
+
+# Generated html docs
+%if 0%{?with_html_man}
+%{_pkgdocdir}/geostore.8.html
+%endif
+
+%files test
+%doc %{_pkgdocdir}/README-testing
+# /usr/share/booth provided by -site
+%{test_path}
+# /usr/lib/ocf/resource.d/booth provided by -site
+%{_usr}/lib/ocf/resource.d/booth/sharedrsc
+
+%changelog
+* Thu Nov 23 2023 Jan Friesse <jfriesse@redhat.com> - 1.1-1
+- Resolves: RHEL-15268
+- Resolves: RHEL-7029
+
+- New upstream release (RHEL-15268)
+- Upstream releases should now be released regularly, so convert spec
+ to use them instead of git snapshots (RHEL-15268)
+- Fix exit code on grant/revoke command error (RHEL-7029)
+
+* Mon Nov 21 2022 Jan Friesse <jfriesse@redhat.com> - 1.0-283.1.9d4029a.git
+- Resolves: rhbz#2135866
+
+- Update to current snapshot (commit 9d4029a) (rhbz#2135866)
+
+* Tue Oct 25 2022 Jan Friesse <jfriesse@redhat.com> - 1.0-251.5.bfb2f92.git
+- Resolves: rhbz#2133833
+
+- unit file: Remove Alias directive
+
+* Tue Aug 09 2022 Jan Friesse <jfriesse@redhat.com> - 1.0-251.4.bfb2f92.git
+- Related: rhbz#2111669
+
+- Remove template unit from systemd_(post|preun|postun_with_restart) macro
+
+* Wed Aug 03 2022 Jan Friesse <jfriesse@redhat.com> - 1.0-251.3.bfb2f92.git
+- Resolves: rhbz#2111669
+
+- Fix authfile directive handling in booth config file
+ (fixes CVE-2022-2553)
+- Add enable-authfile option
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.0-251.2.bfb2f92.git
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+ Related: rhbz#1991688
+
+* Thu May 20 2021 Jan Friesse <jfriesse@redhat.com> - 1.0-251.1.bfb2f92.git
+- Related: rhbz#1961216
+
+- Rebase to newest upstream snapshot
+
+* Tue May 18 2021 Jan Friesse <jfriesse@redhat.com> - 1.0-249.1.977726e.git
+- Resolves: rhbz#1961216
+
+- Do not include unit-test by default
+- Rebase to newest upstream snapshot
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.0-239.3.52ec255.git
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* 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
+- Implement new versioning scheme
+
+* Tue Sep 29 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-6.ac1d34c.git.5
+- Remove net-tools (netstat) dependency and replace it with iproute (ss)
+- 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
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jun 3 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-6.ac1d34c.git.3
+- Do not link with the pcmk libraries
+- 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
+- Update to current snapshot (commit ac1d34c) to fix test suite
+
+* Mon Jun 1 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-5.385cc25.git.3
+- Add CI tests
+- Enable gating
+- Fix hardcoded-library-path
+
+* Mon Jun 1 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-5.385cc25.git.2
+- Package /var/lib/booth where booth can chroot
+
+* Thu May 28 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-5.385cc25.git.1
+- Fix test subpackage generating
+
+* Wed May 27 2020 Jan Friesse <jfriesse@redhat.com> - 1.0-5.385cc25.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
+ (commit f2d38ce), including:
+ . support for solely manually managed tickets (9a365f9)
+ . use asciidoctor instead of asciidoc for generating man pages (65e6a6b)
+- switch to using Python 3 for the tests instead of Python 2
+ (behind unversioned "python" references; rhbz#1555651)
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2.570876d.git.6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* 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
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-2.570876d.git.1
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Wed May 25 2016 Jan Pokorný <jpokorny+rpm-booth@fedoraproject.org> - 1.0-3.570876d.git
+- update per the changesets recently accepted by the upstream
+ (memory/resource leaks fixes, patches previously attached separately
+ that make unit test pass, internal cleanups, etc.)
+
+* Thu May 05 2016 Jan Pokorný <jpokorny+rpm-booth@fedoraproject.org> - 1.0-2.eb4256a.git
+- update a subset of out-of-tree patches per
+ https://github.com/ClusterLabs/booth/pull/22#issuecomment-216936987
+- pre-inclusion cleanups in the spec (apply systemd scriptlet operations
+ with booth-arbitrator, avoid overloading file implicitly considered %%doc
+ as %%license)
+ Resolves: rhbz#1314865
+ Related: rhbz#1333509
+
+* Thu Apr 28 2016 Jan Pokorný <jpokorny+rpm-booth@fedoraproject.org> - 1.0-1.eb4256a.git
+- initial build
diff --git a/rhel-specific-0001-config-Add-enable-authfile-option.patch b/rhel-specific-0001-config-Add-enable-authfile-option.patch
new file mode 100644
index 0000000..606f1fe
--- /dev/null
+++ b/rhel-specific-0001-config-Add-enable-authfile-option.patch
@@ -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
+
diff --git a/sources b/sources
new file mode 100644
index 0000000..cdb5e2e
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+cd27a5a6cc5b3dc024408e0b2a2b8d86 booth-1.1.tar.gz