From 0d90b306a7718ec498901370359baea612843959 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Fri, 23 Sep 2022 10:09:22 +0000 Subject: [PATCH] Auto sync2gitlab import of booth-1.0-199.2.ac1d34c.git.el8.src.rpm --- booth.spec | 12 ++++++------ ...-Refactor-main-substitute-is_auth_req-macro.patch | 0 ...2111668-2-config-Add-enable-authfile-option.patch | 0 3 files changed, 6 insertions(+), 6 deletions(-) rename bz2113967-1-Revert-Refactor-main-substitute-is_auth_req-macro.patch => bz2111668-1-Revert-Refactor-main-substitute-is_auth_req-macro.patch (100%) rename bz2113967-2-config-Add-enable-authfile-option.patch => bz2111668-2-config-Add-enable-authfile-option.patch (100%) diff --git a/booth.spec b/booth.spec index 2720f22..eae04f6 100644 --- a/booth.spec +++ b/booth.spec @@ -30,7 +30,7 @@ %global git_describe_str v1.0-199-gac1d34ce172678a8f5ba415e976cf2366d45e15e # 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}) @@ -56,15 +56,15 @@ 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: 0001-build-Do-not-link-with-pcmk-libraries.patch Patch1: 0002-pacemaker-Handle-updated-exit-code-of-crm_ticket.patch -Patch2: bz2113967-1-Revert-Refactor-main-substitute-is_auth_req-macro.patch -Patch3: bz2113967-2-config-Add-enable-authfile-option.patch +Patch2: bz2111668-1-Revert-Refactor-main-substitute-is_auth_req-macro.patch +Patch3: bz2111668-2-config-Add-enable-authfile-option.patch # direct build process dependencies BuildRequires: autoconf @@ -305,8 +305,8 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog -* Thu Aug 04 2022 Jan Friesse - 1.0-199.1.ac1d34c.git.1 -- Resolves: rhbz#2113967 +* Wed Aug 03 2022 Jan Friesse - 1.0-199.2.ac1d34c.git +- Resolves: rhbz#2111668 - Fix authfile directive handling in booth config file (fixes CVE-2022-2553) diff --git a/bz2113967-1-Revert-Refactor-main-substitute-is_auth_req-macro.patch b/bz2111668-1-Revert-Refactor-main-substitute-is_auth_req-macro.patch similarity index 100% rename from bz2113967-1-Revert-Refactor-main-substitute-is_auth_req-macro.patch rename to bz2111668-1-Revert-Refactor-main-substitute-is_auth_req-macro.patch diff --git a/bz2113967-2-config-Add-enable-authfile-option.patch b/bz2111668-2-config-Add-enable-authfile-option.patch similarity index 100% rename from bz2113967-2-config-Add-enable-authfile-option.patch rename to bz2111668-2-config-Add-enable-authfile-option.patch