From 0a9765e2f38ac72990277922a425a5b7104bd0d8 Mon Sep 17 00:00:00 2001 From: "Eric D. Helms" Date: Mon, 3 Jun 2024 10:24:26 -0400 Subject: [PATCH 1/3] Check GPG key on Candlepin repository --- packages/katello/katello-repos/katello-repos.spec | 5 ++++- packages/katello/katello-repos/katello.repo | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/katello/katello-repos/katello-repos.spec b/packages/katello/katello-repos/katello-repos.spec index 1f475af2f8..639450a892 100644 --- a/packages/katello/katello-repos/katello-repos.spec +++ b/packages/katello/katello-repos/katello-repos.spec @@ -6,7 +6,7 @@ %global prereleasesource nightly %global prerelease %{?prereleasesource:.}%{?prereleasesource} -%global release 2 +%global release 3 Name: katello-repos Version: 4.14 @@ -73,6 +73,9 @@ rm -rf %{buildroot} %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-candlepin %changelog +* Mon Jun 03 2024 Eric D. Helms - 4.14-0.3.nightly +- Set Candlepin repo gpgcheck to true + * Mon Jun 03 2024 Evgeni Golov - 4.14-0.2.nightly - Update Candlepin 4.4 key diff --git a/packages/katello/katello-repos/katello.repo b/packages/katello/katello-repos/katello.repo index ae7787235e..9309ba1044 100644 --- a/packages/katello/katello-repos/katello.repo +++ b/packages/katello/katello-repos/katello.repo @@ -15,7 +15,7 @@ name=Candlepin: an open source entitlement management system. baseurl=https://yum.theforeman.org/candlepin/@CANDLEPIN_VERSION@/@DIST@/$basearch/ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-candlepin enabled=1 -gpgcheck=@REPO_GPGCHECK@ +gpgcheck=1 [pulpcore] name=pulpcore: Fetch, Upload, Organize, and Distribute Software Packages. @@ -38,7 +38,7 @@ name=Katello Candlepin source baseurl=https://yum.theforeman.org/candlepin/@REPO_VERSION@/@DIST@/source/ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-candlepin enabled=0 -gpgcheck=@REPO_GPGCHECK@ +gpgcheck=1 [pulpcore-source] name=pulpcore source From 0dd0d090db367098f21725434dfbfac42023c07b Mon Sep 17 00:00:00 2001 From: Eric Helms Date: Mon, 5 Aug 2024 15:31:53 -0400 Subject: [PATCH 2/3] Update packages/katello/katello-repos/katello.repo Co-authored-by: Evgeni Golov --- packages/katello/katello-repos/katello.repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/katello/katello-repos/katello.repo b/packages/katello/katello-repos/katello.repo index 9309ba1044..20266199f2 100644 --- a/packages/katello/katello-repos/katello.repo +++ b/packages/katello/katello-repos/katello.repo @@ -36,7 +36,7 @@ gpgcheck=@REPO_GPGCHECK@ [candlepin-source] name=Katello Candlepin source baseurl=https://yum.theforeman.org/candlepin/@REPO_VERSION@/@DIST@/source/ -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-candlepin +gpgkey=https://yum.theforeman.org/candlepin/@CANDLEPIN_VERSION@/RPM-GPG-KEY-candlepin enabled=0 gpgcheck=1 From 46036dca34f4c7fba037694ba669fc235a996259 Mon Sep 17 00:00:00 2001 From: Eric Helms Date: Mon, 5 Aug 2024 15:32:04 -0400 Subject: [PATCH 3/3] Update packages/katello/katello-repos/katello.repo Co-authored-by: Evgeni Golov --- packages/katello/katello-repos/katello.repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/katello/katello-repos/katello.repo b/packages/katello/katello-repos/katello.repo index 20266199f2..a19caa7a4b 100644 --- a/packages/katello/katello-repos/katello.repo +++ b/packages/katello/katello-repos/katello.repo @@ -35,7 +35,7 @@ gpgcheck=@REPO_GPGCHECK@ [candlepin-source] name=Katello Candlepin source -baseurl=https://yum.theforeman.org/candlepin/@REPO_VERSION@/@DIST@/source/ +baseurl=https://yum.theforeman.org/candlepin/@CANDLEPIN_VERSION@/@DIST@/source/ gpgkey=https://yum.theforeman.org/candlepin/@CANDLEPIN_VERSION@/RPM-GPG-KEY-candlepin enabled=0 gpgcheck=1