Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[1.19] Fix GPG handling of repositories #2819

Closed
wants to merge 1 commit into from
Closed

[1.19] Fix GPG handling of repositories #2819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 19 additions & 0 deletions packages/foreman/foreman-release-scl/copr.gpg
View file
Open in desktop
@@ -0,0 +1,19 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----

mQENBFpM6DoBCAChKiB5VJLfVyABQ+mR3rKrZSZg+rebHWdfx2U5VQBoKPytd2zT
yRwrosv4C7nZOvWsroQ6kAb8DaYxGsZgueiCScZUUPEO7A0KHuwFKhoiy7Uirele
Y/zmaYn1tUfUDFKeLo5IwX8fP5SA0YXtNLu1iGT6KbpesrwMUAyLfeUCT7ufYvZV
C641kShOO68wfq/IMEnZ3mde1bn0QzDqbYy9LGKPV9Cxw4xUFxYhUt1w0y5AeBC9
1P/7xa8XE6JahLDz4Ms7bTig49SbsNLZDwLlhDs0LCiwedislU5sxkESOumOkpcl
dPcdWV+8KkCybsrDmIiRq8ab9rg+qh/hJ67BABEBAAG0WkB0aGVmb3JlbWFuX3Rm
bS1yb3I1MS1zdGFnaW5nIChOb25lKSA8QHRoZWZvcmVtYW4jdGZtLXJvcjUxLXN0
YWdpbmdAY29wci5mZWRvcmFob3N0ZWQub3JnPokBVAQTAQgAPhYhBMLQE6TN2YSP
B3LT0HpwD8rVPj+qBQJaTOg6AhsvBQkJZgGABQsJCAcCBhUICQoLAgQWAgMBAh4B
AheAAAoJEHpwD8rVPj+qV2EH/RYlHHZYVJ1K5AM+2Gacx8b+StPUjX+uqfcBBKDK
lDE3VB3xnOYUMbN6hoTrmB29Qj/uBtCvi0rhwKLbcXtGXn4CfNAj59JvLEbqvSnb
3snxuI+3wablTpuYISFV+YE4q95DE/DQ5lnAL7XIfZcv5cm7kmXFS44Sj+jhcJ14
kOGCWZeEc+DZRn6FrsTu3AojOxylPPIZDz2SEp+IdS2n3TzPO/1ws3RlEWpwdEwc
BuT0o8iblzs+IBfM95YkW26Ctl3cwfgfIg+0VbqpeTwUccWGmiTAg1Y69CQXBHf+
EcuidQ7e1ySZtlXrXopRy6gp2D5aPillyPIASWEgKnsSRaA=
=kSxR
-----END PGP PUBLIC KEY BLOCK-----
12 changes: 10 additions & 2 deletions packages/foreman/foreman-release-scl/foreman-release-scl.spec
View file
Open in desktop
@@ -1,12 +1,13 @@
Name: foreman-release-scl
Version: 5
Release: 2%{?dist}
Version: 6
Release: 1%{?dist}

Summary: Foreman Software Collections repositories meta-package
Group: Applications/System
License: GPLv3+
URL: https://theforeman.org
Source0: tfm-ror51.repo
Source1: copr.gpg

BuildArch: noarch

Expand All @@ -25,10 +26,17 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/yum.repos.d

install -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/yum.repos.d/

install -Dpm0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-foreman-rails

%files
%config %{_sysconfdir}/yum.repos.d/*.repo
%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-foreman-rails

%changelog
* Tue Jul 31 2018 Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl> - 6-1
- Add GPG checking
- Bump to version 6 so we're always newer than 1.18

* Tue Jul 17 2018 Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl> - 5-2
- Point to 1.19 repositories

Expand Down
4 changes: 2 additions & 2 deletions packages/foreman/foreman-release-scl/tfm-ror51.repo
View file
Open in desktop
Expand Up @@ -2,5 +2,5 @@
name=Rails 5.1 SCL
baseurl=https://yum.theforeman.org/rails/foreman-1.19/el7/$basearch
enabled=1
gpgcheck=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-foreman
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-copr
4 changes: 2 additions & 2 deletions packages/foreman/foreman/foreman-plugins.repo
View file
Open in desktop
Expand Up @@ -2,12 +2,12 @@
name=Foreman plugins 1.19
baseurl=https://yum.theforeman.org/plugins/1.19/$DIST/$basearch
enabled=1
gpgcheck=1
gpgcheck=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-foreman

[foreman-plugins-source]
name=Foreman plugins 1.19 - source
baseurl=https://yum.theforeman.org/plugins/1.19/$DIST/source
enabled=0
gpgcheck=1
gpgcheck=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-foreman
1 change: 1 addition & 0 deletions packages/foreman/foreman/foreman.spec
View file
Open in desktop
Expand Up @@ -36,6 +36,7 @@ Source11: %{executor_service_name}.service
BuildArch: noarch

Conflicts: foreman-tasks < 0.11.0-2
Conflicts: foreman-release-scl < 6-1

Requires: %{?scl_prefix_ruby}ruby(release)
Requires: %{?scl_prefix_ruby}rubygems
Expand Down