From 5a3d5b5f9945efee5067a21183d260cc4ec0ef15 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 08 2022 11:45:51 +0000
Subject: import containers-common-1-43.module+el8.7.0+17064+3b31f55c


---

diff --git a/.containers-common.metadata b/.containers-common.metadata
index e69de29..d153956 100644
--- a/.containers-common.metadata
+++ b/.containers-common.metadata
@@ -0,0 +1 @@
+a72daf8585b41529269cdffcca3a0b3d4e2f21cd SOURCES/RPM-GPG-KEY-redhat-beta
diff --git a/.gitignore b/.gitignore
index e69de29..8caeece 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+SOURCES/RPM-GPG-KEY-redhat-beta
diff --git a/SOURCES/default.yaml b/SOURCES/default.yaml
index fa2ea36..a7f3d28 100644
--- a/SOURCES/default.yaml
+++ b/SOURCES/default.yaml
@@ -1,8 +1,8 @@
 # This is a default registries.d configuration file.  You may
 # add to this file or create additional files in registries.d/.
 #
-# lookaside: indicates a location that is read and write
-# lookaside-staging: indicates a location that is only for write
+# lookaside: for reading/writing simple signing signatures
+# lookaside-staging: for writing simple signing signatures, preferred over lookaside
 #
 # lookaside and lookaside-staging take a value of the following:
 #   lookaside:  {schema}://location
@@ -10,10 +10,12 @@
 # For reading signatures, schema may be http, https, or file.
 # For writing signatures, schema may only be file.
 
-# This is the default signature write location for docker registries.
+# The default locations are built-in, for both reading and writing:
+# /var/lib/containers/sigstore for root, or
+# ~/.local/share/containers/sigstore for non-root users.
 default-docker:
-#  lookaside: file:///var/lib/containers/sigstore
-  lookaside-staging: file:///var/lib/containers/sigstore
+#  lookaside: https://…
+#  lookaside-staging: file:///…
 
 # The 'docker' indicator here is the start of the configuration
 # for docker registries.
@@ -21,6 +23,6 @@ default-docker:
 # docker:
 #
 #   privateregistry.com:
-#    lookaside: http://privateregistry.com/sigstore/
+#    lookaside: https://privateregistry.com/sigstore/
 #    lookaside-staging: /mnt/nfs/privateregistry/sigstore
 
diff --git a/SPECS/containers-common.spec b/SPECS/containers-common.spec
index ff213c1..ff234dc 100644
--- a/SPECS/containers-common.spec
+++ b/SPECS/containers-common.spec
@@ -4,7 +4,7 @@
 # pick the oldest version on c/image, c/common, c/storage vendored in
 # podman/skopeo/podman.
 %global skopeo_branch main
-%global image_branch v5.22.0
+%global image_branch v5.22.1
 %global common_branch v0.49.1
 %global storage_branch v1.42.0
 %global shortnames_branch main
@@ -12,7 +12,7 @@
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 40%{?dist}
+Release: 43%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 # arch limitation because of go-md2man (missing on i686)
@@ -62,6 +62,7 @@ Source25: https://raw.githubusercontent.com/containers/skopeo/%{skopeo_branch}/d
 # FIXME: fix the branch once these are available via regular c/common branch
 Source26: https://raw.githubusercontent.com/containers/common/main/docs/Containerfile.5.md
 Source27: https://raw.githubusercontent.com/containers/common/main/docs/containerignore.5.md
+Source28: RPM-GPG-KEY-redhat-beta
 
 # scripts used for synchronization with upstream and shortname generation
 Source100: update.sh
@@ -92,6 +93,7 @@ install -m0644 %{SOURCE20} %{buildroot}%{_sysconfdir}/containers/registries.conf
 %if !0%{?rhel} || 0%{?centos}
 install -dp %{buildroot}%{_sysconfdir}/pki/rpm-gpg
 install -m0644 %{SOURCE21} %{buildroot}%{_sysconfdir}/pki/rpm-gpg
+install -m0644 %{SOURCE28} %{buildroot}%{_sysconfdir}/pki/rpm-gpg
 %endif
 install -dp %{buildroot}%{_sysconfdir}/containers/registries.d
 install -m0644 %{SOURCE22} %{buildroot}%{_sysconfdir}/containers/registries.d
@@ -150,6 +152,7 @@ EOF
 %dir %{_sysconfdir}/containers/registries.conf.d
 %if !0%{?rhel} || 0%{?centos}
 %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta
 %endif
 %config(noreplace) %{_sysconfdir}/containers/policy.json
 %config(noreplace) %{_sysconfdir}/containers/storage.conf
@@ -169,6 +172,18 @@ EOF
 %{_datadir}/rhel/secrets/*
 
 %changelog
+* Thu Oct 20 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-43
+- update vendored components and configuration files
+- Resolves: #2136438
+
+* Thu Oct 13 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-42
+- add beta GPG key
+- Resolves: #2125686
+
+* Thu Oct 13 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-41
+- update vendored components and configuration files
+- Resolves: #2125241
+
 * Tue Aug 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-40
 - add beta keys to default-policy.json
 - Related: #2061390