From 6b92a9dec3bc9db71a11176c89e80cd91babe23a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 09 2022 09:40:26 +0000 Subject: import rhc-0.2.1-8.el9_0 --- diff --git a/SOURCES/0001-feat-default-config-file-location.patch b/SOURCES/0001-feat-default-config-file-location.patch index 07ab750..7afda51 100644 --- a/SOURCES/0001-feat-default-config-file-location.patch +++ b/SOURCES/0001-feat-default-config-file-location.patch @@ -22,7 +22,7 @@ fs.Var(&logLevel, "log-level", "log verbosity level (error (default), warn, info, debug, trace)") fs.Var(&allowPatterns, "allow-pattern", "regular expression pattern to allow package operations\n(can be specified multiple times)") - _ = fs.String("config", "", "path to `file` containing configuration values (optional)") -+ _ = fs.String("config", filepath.Join("etc", "rhc", "workers", fs.Name()+".toml"), "path to `file` containing configuration values (optional)") ++ _ = fs.String("config", filepath.Join("/", "etc", "rhc", "workers", "rhc-package-manager.toml"), "path to `file` containing configuration values (optional)") ff.Parse(fs, os.Args[1:], ff.WithEnvVarPrefix("YGG"), ff.WithConfigFileFlag("config"), ff.WithConfigFileParser(fftoml.Parser)) diff --git a/SPECS/rhc.spec b/SPECS/rhc.spec index 0433013..436be16 100644 --- a/SPECS/rhc.spec +++ b/SPECS/rhc.spec @@ -8,7 +8,7 @@ Name: rhc Version: 0.2.1 -Release: 5%{?dist} +Release: 8%{?dist} Epoch: 1 Summary: rhc connects the system to Red Hat hosted services License: GPLv3 @@ -106,7 +106,7 @@ make %{makeflags} \ cd %{_builddir}/%{name}/yggdrasil-worker-package-manager %{__install} -D -m 755 rhc-package-manager-worker %{buildroot}%{_libexecdir}/%{name}/ -%{__install} -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/%{name}/workers/rhc-package-manager-worker.toml +%{__install} -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/%{name}/workers/rhc-package-manager.toml cd %{_builddir}/%{name}/%{name}-%{version} make %{makeflags} \ @@ -119,7 +119,7 @@ make %{makeflags} \ %{_bindir}/%{name} %{_sbindir}/%{name}d %config(noreplace) %{_sysconfdir}/%{name}/config.toml -%config(noreplace) %{_sysconfdir}/%{name}/workers/rhc-package-manager-worker.toml +%config(noreplace) %{_sysconfdir}/%{name}/workers/rhc-package-manager.toml %{_unitdir}/%{name}d.service %{_datadir}/bash-completion/completions/* %{_mandir}/man1/* @@ -131,6 +131,15 @@ make %{makeflags} \ %changelog +* Fri Jun 3 2022 Link Dupont - 0.2.1-8 +- Use correct file name when installing (RHBZ#2083361) + +* Fri Jun 3 2022 Link Dupont - 0.2.1-7 +- Correct default config file name (RHBZ#2083361) + +* Mon May 09 2022 Link Dupont - 0.2.1-6 +- Correct default config file path (RHBZ#2083361) + * Tue Mar 1 2022 Link Dupont - 0.2.1-5 - Ensure worker is built with hardening compiler flags (RHBZ#2059471)