From c8b9ca2a37c62e67d59ce1c2423bfac348f43850 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 18 2023 07:42:18 +0000 Subject: import rhc-worker-script-0.5-1.el7_9 --- diff --git a/.gitignore b/.gitignore index 63a8388..7fb15f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/rhc-worker-script-0.4.tar.gz +SOURCES/rhc-worker-script-0.5.tar.gz diff --git a/.rhc-worker-script.metadata b/.rhc-worker-script.metadata index 7e72f65..0f897bd 100644 --- a/.rhc-worker-script.metadata +++ b/.rhc-worker-script.metadata @@ -1 +1 @@ -0f9cf1948f4687b32d50b6de3077231af3b81738 SOURCES/rhc-worker-script-0.4.tar.gz +6449d10da6eeea1414559f82b2d595fdaf45d4ae SOURCES/rhc-worker-script-0.5.tar.gz diff --git a/SPECS/rhc-worker-script.spec b/SPECS/rhc-worker-script.spec index 49e79e4..77d2274 100644 --- a/SPECS/rhc-worker-script.spec +++ b/SPECS/rhc-worker-script.spec @@ -17,20 +17,20 @@ %define go_arches x86_64 %endif -%global use_go_toolset_1_16 0%{?rhel} == 7 && !%{defined centos} +%global use_go_toolset_1_19 0%{?rhel} == 7 && !%{defined centos} Name: %{repo_name} -Version: 0.4 -Release: 2%{?dist} +Version: 0.5 +Release: 1%{?dist} Summary: Worker executing scripts on hosts managed by Red Hat Insights License: GPLv3+ URL: https://github.com/%{repo_orgname}/%{repo_name} -Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz ExclusiveArch: %{go_arches} -%if %{use_go_toolset_1_16} -BuildRequires: go-toolset-1.16-golang +%if %{use_go_toolset_1_19} +BuildRequires: go-toolset-1.19-golang %else BuildRequires: golang %endif @@ -49,8 +49,8 @@ ln -fs $(pwd)/src _gopath/src/%{binary_name}-%{version} ln -fs $(pwd)/vendor _gopath/src/%{binary_name}-%{version}/vendor export GOPATH=$(pwd)/_gopath pushd _gopath/src/%{binary_name}-%{version} -%if %{use_go_toolset_1_16} -scl enable go-toolset-1.16 -- %{gobuild} +%if %{use_go_toolset_1_19} +scl enable go-toolset-1.19 -- %{gobuild} %else %{gobuild} %endif @@ -65,15 +65,36 @@ install -d %{buildroot}%{_sharedstatedir}/%{binary_name}/ install -D -m 755 _gopath/src/%{binary_name}-%{version}/%{binary_name}-%{version} %{buildroot}%{rhc_libexecdir}/%{binary_name} install -D -d -m 755 %{buildroot}%{rhc_worker_conf_dir} +cat <%{buildroot}%{rhc_worker_conf_dir}/rhc-worker-script.yml +# recipient directive to register with dispatcher +directive: "%{name}" + +# whether to verify incoming yaml files +verify_yaml: true + +# perform the insights-client GPG check on the insights-core egg +insights_core_gpg_check: true + +# temporary directory in which the temporary script will be placed and executed. +temporary_worker_directory: "/var/lib/rhc-worker-script" +EOF + + %files %{rhc_libexecdir}/%{binary_name} %license LICENSE %doc README.md +%config %{rhc_worker_conf_dir}/rhc-worker-script.yml %changelog -* Tue Sep 19 2023 Rodolfo Olivieri 0.4-2 -- Remove s390x and ppc64le architectures from the build +* Mon Oct 16 2023 Rodolfo Olivieri 0.5-1 +- Rebuild against newer golang which addresses CVE-2023-39325 and CVE-2023-44487 +- Fix OpenScanHub defects related to runtime code +- Update specfile to include default config file +- Improve logging when config file can't be used and default values are used instead +- Move the logging init to be before anything else +- Improve logging when insights_core_gpg_check is disabled * Thu Aug 10 2023 Rodolfo Olivieri 0.4-1 - Update specfile binary name generation