diff --git a/SOURCES/bz2113970-1-Revert-Refactor-main-substitute-is_auth_req-macro.patch b/SOURCES/bz2111669-1-Revert-Refactor-main-substitute-is_auth_req-macro.patch similarity index 100% rename from SOURCES/bz2113970-1-Revert-Refactor-main-substitute-is_auth_req-macro.patch rename to SOURCES/bz2111669-1-Revert-Refactor-main-substitute-is_auth_req-macro.patch diff --git a/SOURCES/bz2113970-2-config-Add-enable-authfile-option.patch b/SOURCES/bz2111669-2-config-Add-enable-authfile-option.patch similarity index 100% rename from SOURCES/bz2113970-2-config-Add-enable-authfile-option.patch rename to SOURCES/bz2111669-2-config-Add-enable-authfile-option.patch diff --git a/SPECS/booth.spec b/SPECS/booth.spec index dd02aa6..57843b1 100644 --- a/SPECS/booth.spec +++ b/SPECS/booth.spec @@ -31,7 +31,7 @@ %global git_describe_str v1.0-251-gbfb2f924c07db823f5c934d1aafbc5181bb25148 # 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}) @@ -57,13 +57,13 @@ Name: booth Version: %{booth_ver} -Release: %{booth_numcomm}.%{release}.%{booth_short_sha1}.git%{?dist}.1 +Release: %{booth_numcomm}.%{release}.%{booth_short_sha1}.git%{?dist} 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: bz2113970-1-Revert-Refactor-main-substitute-is_auth_req-macro.patch -Patch1: bz2113970-2-config-Add-enable-authfile-option.patch +Patch0: bz2111669-1-Revert-Refactor-main-substitute-is_auth_req-macro.patch +Patch1: bz2111669-2-config-Add-enable-authfile-option.patch # direct build process dependencies BuildRequires: autoconf @@ -312,13 +312,13 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog -* Tue Aug 09 2022 Jan Friesse - 1.0-251.3.bfb2f92.git.1 -- Related: rhbz#2113970 +* Tue Aug 09 2022 Jan Friesse - 1.0-251.4.bfb2f92.git +- Related: rhbz#2111669 - Remove template unit from systemd_(post|preun|postun_with_restart) macro -* Thu Aug 04 2022 Jan Friesse - 1.0-251.2.bfb2f92.git.1 -- Resolves: rhbz#2113970 +* Wed Aug 03 2022 Jan Friesse - 1.0-251.3.bfb2f92.git +- Resolves: rhbz#2111669 - Fix authfile directive handling in booth config file (fixes CVE-2022-2553)