@@ -45,10 +45,16 @@ Suggests: fuse-overlayfs
4545URL: https://github.com/%{project }/%{repo }
4646Source0: %{url }/archive/refs/tags/common/v%{version }.tar.gz
4747Source1: https://raw.githubusercontent.com/containers/shortnames/refs/heads/main/shortnames.conf
48- # Fetch RPM-GPG-KEY-redhat-release from the authoritative source instead of storing
49- # a copy in repo or dist-git. Depending on distribution-gpg-keys rpm is also
50- # not an option because that package doesn't exist on CentOS Stream.
48+ # Fetch Red Hat keys from the authoritative source instead of storing a copy in
49+ # repo or dist-git. Depending on distribution-gpg-keys is also not an option
50+ # because that package doesn't exist on CentOS Stream and/or it may not ship the
51+ # keys we need.
52+ # RPM-GPG-KEY-redhat-release
5153Source2: https://access.redhat.com/security/data/fd431d51.txt
54+ # SIGSTORE-redhat-release3
55+ Source3: https://security.access.redhat.com/data/63405576.txt
56+ # REKOR-signing-key
57+ # Source4
5258
5359%description
5460This package contains common configuration files and documentation for container
@@ -107,14 +113,15 @@ touch %{buildroot}%{_prefix}/lib/containers/storage/overlay-layers/layers.lock
107113
108114install -Dp -m0644 %{SOURCE1 } %{buildroot }%{_sysconfdir }/containers/registries.conf.d/000-shortnames.conf
109115install -Dp -m0644 image/default.yaml %{buildroot }%{_sysconfdir }/containers/registries.d/default.yaml
110- install -Dp -m0644 image/default- policy.json %{buildroot }%{_sysconfdir }/containers/policy.json
116+ install -Dp -m0644 common/rpm/ policy.json %{buildroot }%{_sysconfdir }/containers/policy.json
111117install -Dp -m0644 image/registries.conf %{buildroot }%{_sysconfdir }/containers/registries.conf
112118install -Dp -m0644 storage/storage.conf %{buildroot }%{_datadir }/containers/storage.conf
113119
114- # RPM-GPG-KEY-redhat-release already exists on rhel envs, install only on
120+ # These keys already exist on rhel envs, install only on
115121# fedora and centos
116122%if %{defined fedora } || %{defined centos }
117123install -Dp -m0644 %{SOURCE2 } %{buildroot }%{_sysconfdir }/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
124+ install -Dp -m0644 %{SOURCE3 } %{buildroot }%{_sysconfdir }/pki/sigstore/SIGSTORE-redhat-release3
118125%endif
119126
120127install -Dp -m0644 common/contrib/redhat/registry.access.redhat.com.yaml -t %{buildroot }%{_sysconfdir }/containers/registries.d
@@ -162,6 +169,7 @@ ln -s ../../../..%{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/
162169%config(noreplace) %{_sysconfdir }/containers/registries.conf.d/000-shortnames.conf
163170%if 0%{?fedora } || 0%{?centos }
164171%{_sysconfdir }/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
172+ %{_sysconfdir }/pki/sigstore/SIGSTORE-redhat-release3
165173%endif
166174%config(noreplace) %{_sysconfdir }/containers/registries.d/default.yaml
167175%config(noreplace) %{_sysconfdir }/containers/registries.d/registry.redhat.io.yaml
0 commit comments