From b30c39db4e7247b5aa6a644d6c3acfd368d52189 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Fri, 11 Mar 2022 20:43:05 +0000
Subject: [PATCH] import podman-3.0.1-7.module+el8.6.0+12937+c86eb8d2

---
 .gitignore        |  2 +-
 .podman.metadata  |  2 +-
 SPECS/podman.spec | 36 +++++++++++++++++++-----------------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7362a89..51c2d31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 SOURCES/v0.1.5.tar.gz
 SOURCES/v1.1.1.tar.gz
-SOURCES/v3.0.1-rhel-ad1aaba.tar.gz
+SOURCES/v3.0.1-rhel-4f91b37.tar.gz
diff --git a/.podman.metadata b/.podman.metadata
index 40f0f1c..c8aabe1 100644
--- a/.podman.metadata
+++ b/.podman.metadata
@@ -1,3 +1,3 @@
 4502491739693bd1b1d108d9af545f69a3bd424b SOURCES/v0.1.5.tar.gz
 3d883ef197eeb1a602dfef79ee1027847cfd40a4 SOURCES/v1.1.1.tar.gz
-51614e209e85f259aaec4528377c5e2d8e269c87 SOURCES/v3.0.1-rhel-ad1aaba.tar.gz
+2937847d6c1485648d19468fe1530f2fee7589b5 SOURCES/v3.0.1-rhel-4f91b37.tar.gz
diff --git a/SPECS/podman.spec b/SPECS/podman.spec
index 9a54d6e..475177d 100644
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@@ -14,14 +14,14 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 
 %global import_path github.com/containers/podman
 %global branch v3.0.1-rhel
-%global commit0 ad1aaba8df96cb25e12fe28ec96f3c131e572e3e
+%global commit0 4f91b3737fbb2deae78cdb3120a7a4611ceef1da
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global cataver 0.1.5
 %global dnsnamever 1.1.1
 
 Name: podman
 Version: 3.0.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
@@ -338,27 +338,29 @@ exit 0
 %{_datadir}/%{name}/test
 
 %changelog
-* Thu Mar 18 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-6
-- update to the latest content of https://github.com/containers/podman/tree/v3.0.1-rhel
-  (https://github.com/containers/podman/commit/ad1aaba)
-- Resolves: #1921128
-- Resolves: #1936927
-- Resolves: #1938234
+* Mon Oct 11 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-7
+- add missing docker man pages
+- Related: #2009106
 
-* Thu Mar 11 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-5
+* Fri Oct 08 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-6
 - update to the latest content of https://github.com/containers/podman/tree/v3.0.1-rhel
-  (https://github.com/containers/podman/commit/fcca86d)
-- Resolves: #1936927
+  (https://github.com/containers/podman/commit/4f91b37)
+- Related: #2009106
 
-* Thu Mar 11 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-4
+* Tue Aug 31 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-5
 - update to the latest content of https://github.com/containers/podman/tree/v3.0.1-rhel
-  (https://github.com/containers/podman/commit/c67172a)
-- Resolves: #1935376
+  (https://github.com/containers/podman/commit/2bed76e)
+- fixes CVE-2021-3602
+- Related: #1977943
 
-* Tue Mar 02 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-3
+* Mon Aug 30 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-4
 - update to the latest content of https://github.com/containers/podman/tree/v3.0.1-rhel
-  (https://github.com/containers/podman/commit/7a71903)
-- Resolves: #1931545
+  (https://github.com/containers/podman/commit/eebd611)
+- Related: #1934415
+
+* Wed Mar 03 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-3
+- remove docker man page as it was removed upstream
+- Related: #1934415
 
 * Mon Feb 22 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-2
 - update to the latest content of https://github.com/containers/podman/tree/v3.0