From bb8fd6c8cbff2e0a33fb83b0644ecc4787f48a89 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Wed, 3 Mar 2021 13:48:02 -0500
Subject: [PATCH] import podman-1.6.4-26.module+el8.3.0+10188+4c10031c

---
 .gitignore        |  2 +-
 .podman.metadata  |  2 +-
 SPECS/podman.spec | 26 +++++++++++++++++++++++---
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 255ec91..205658d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/podman-90ef753.tar.gz
+SOURCES/v1.6.4-rhel-bcbbbc4.tar.gz
diff --git a/.podman.metadata b/.podman.metadata
index 5218f3c..cfefcaf 100644
--- a/.podman.metadata
+++ b/.podman.metadata
@@ -1 +1 @@
-d1569abddfa97ffee554298f4b83e5f260d613c3 SOURCES/podman-90ef753.tar.gz
+22b238c694a87bb760fcd7611511315f09a501c8 SOURCES/v1.6.4-rhel-bcbbbc4.tar.gz
diff --git a/SPECS/podman.spec b/SPECS/podman.spec
index 1672ec4..4680c82 100644
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@@ -18,6 +18,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 %define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**};
 %endif
 
+%global branch v1.6.4-rhel
 %global provider github
 %global provider_tld com
 %global project containers
@@ -26,18 +27,22 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path %{provider_prefix}
 %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit0 90ef753e901dff13d273b87524a336e3644f1f55
+%global commit0 bcbbbc433e74476e6ec9410e422b1b6450fe7718
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Name: podman
 Version: 1.6.4
-Release: 24%{?dist}
+Release: 26%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0
 URL: https://%{name}.io/
 # Build fails with: No matching package to install: 'golang >= 1.12.12-4' on i686
 ExcludeArch: i686
-Source0: %{git0}/archive/%{commit0}/podman-%{shortcommit0}.tar.gz
+%if 0%{?branch:1}
+Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
+%else
+Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
+%endif
 Provides: %{name}-manpages = %{version}-%{release}
 Obsoletes: %{name}-manpages < %{version}-%{release}
 BuildRequires: golang >= 1.12.12-4
@@ -218,7 +223,11 @@ Requires: jq
 This package contains system tests for %{name}
 
 %prep
+%if 0%{?branch:1}
+%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
+%else
 %autosetup -Sgit -n %{name}-%{commit0}
+%endif
 
 sed -i 's/install.bin: podman/install.bin:/' Makefile
 sed -i 's/install.man: docs/install.man:/' Makefile
@@ -337,6 +346,17 @@ exit 0
 %{_datadir}/%{name}/test
 
 %changelog
+* Tue Mar 02 2021 Jindrich Novy <jnovy@redhat.com> - 1.6.4-26
+- update to the latest content of https://github.com/containers/podman/tree/v1.6.4-rhel
+  (https://github.com/containers/podman/commit/bcbbbc4)
+- Related: #1920382
+
+* Fri Feb 12 2021 Jindrich Novy <jnovy@redhat.com> - 1.6.4-25
+- fix CVE-2021-20188
+- update to the latest content of https://github.com/containers/podman/tree/v1.6.4-rhel
+  (https://github.com/containers/podman/commit/2c7b579)
+- Related: #1920382
+
 * Fri Jan 08 2021 Jindrich Novy <jnovy@redhat.com> - 1.6.4-24
 - fix "podman exec is fragile in the presence of signals [rhel-8.3.0.z]"
 - Resolves: #1913294