From a715eb1982c359efab79beb33774b63192f1cc19 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Fri, 10 Nov 2023 13:48:49 +0100
Subject: [PATCH] podman-4.7.2-1.el9

- update to https://github.com/containers/podman/releases/tag/v4.7.2
- remove gvisor from podman and depend on external one
- Related: Jira:RHEL-2112

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 podman.spec | 50 +++++++++-----------------------------------------
 sources     |  3 +--
 2 files changed, 10 insertions(+), 43 deletions(-)

diff --git a/podman.spec b/podman.spec
index 592edf0..8b862b9 100644
--- a/podman.spec
+++ b/podman.spec
@@ -4,21 +4,18 @@
 GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**};
 
 %global import_path github.com/containers/podman
-%global branch v4.6.1-rhel
+#%%global branch v4.6.1-rhel
 %global commit0 68e7ae09d941e31d8f234af6a9534866b31aa141
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global cataver 0.1.7
 #%%global dnsnamever 1.3.0
 %global commit_dnsname 18822f9a4fb35d1349eb256f4cd2bfd372474d84
 %global shortcommit_dnsname %(c=%{commit_dnsname}; echo ${c:0:7})
-%global gvproxyrepo gvisor-tap-vsock
-%global gvproxyver 0.6.1
-%global commit_gvproxy 407efb5dcdb0f4445935f7360535800b60447544
 
 Epoch: 2
 Name: podman
-Version: 4.6.1
-Release: 6%{?dist}
+Version: 4.7.2
+Release: 1%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 URL: https://%{name}.io/
@@ -30,7 +27,6 @@ Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcom
 Source1: https://github.com/openSUSE/catatonit/archive/v%{cataver}.tar.gz
 #Source2: https://github.com/containers/dnsname/archive/v%%{dnsnamever}.tar.gz
 Source2: https://github.com/containers/dnsname/archive/%{commit_dnsname}/dnsname-%{shortcommit_dnsname}.tar.gz
-Source4: https://github.com/containers/gvisor-tap-vsock/archive/%{commit_gvproxy}/gvisor-tap-vsock-%{commit_gvproxy}.tar.gz
 # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
 ExclusiveArch: %{go_arches}
 Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
@@ -118,7 +114,7 @@ variables, or in containers.conf.
 %package plugins
 Summary: Plugins for %{name}
 Requires: dnsmasq
-Recommends: %{name}-gvproxy = %{epoch}:%{version}-%{release}
+Recommends: gvisor-tap-vsock
 
 %description plugins
 This plugin sets up the use of dnsmasq on a given CNI network so
@@ -147,15 +143,6 @@ Requires: git-daemon
 
 This package contains system tests for %{name}
 
-%package gvproxy
-Summary: Go replacement for libslirp and VPNKit
-
-%description gvproxy
-A replacement for libslirp and VPNKit, written in pure Go.
-It is based on the network stack of gVisor. Compared to libslirp,
-gvisor-tap-vsock brings a configurable DNS server and
-dynamic port forwarding.
-
 %prep
 %if 0%{?branch:1}
 %autosetup -Sgit -n containers-%{name}-%{shortcommit0}
@@ -169,7 +156,6 @@ pushd catatonit-%{cataver}
 sed -i '$d' configure.ac
 popd
 tar fx %{SOURCE2}
-tar fx %{SOURCE4}
 
 # this is shipped by skopeo: containers-common subpackage
 rm -rf docs/source/markdown/containers-mounts.conf.5.md
@@ -244,17 +230,6 @@ export GOPATH=$(pwd)/_build:$(pwd)
 %gobuild -o bin/dnsname github.com/containers/dnsname/plugins/meta/dnsname
 popd
 
-pushd gvisor-tap-vsock-%{commit_gvproxy}
-mkdir _build
-pushd _build
-mkdir -p src/github.com/containers
-ln -s ../../../../ src/github.com/containers/gvisor-tap-vsock
-popd
-ln -s vendor src
-export GOPATH=$(pwd)/_build:$(pwd)
-%gobuild -o bin/gvproxy github.com/containers/gvisor-tap-vsock/cmd/gvproxy
-popd
-
 %install
 PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \
         install.bin \
@@ -292,12 +267,6 @@ pushd dnsname-%{commit_dnsname}
 %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install
 popd
 
-# install gvproxy
-pushd gvisor-tap-vsock-%{commit_gvproxy}
-install -dp %{buildroot}%{_libexecdir}/%{name}
-install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/%{name}
-popd
-
 %check
 %if 0%{?with_check}
 # Since we aren't packaging up the vendor directory we need to link
@@ -389,13 +358,12 @@ fi
 %license LICENSE
 %{_datadir}/%{name}/test
 
-%files gvproxy
-%license gvisor-tap-vsock-%{commit_gvproxy}/LICENSE
-%doc gvisor-tap-vsock-%{commit_gvproxy}/README.md
-%dir %{_libexecdir}/%{name}
-%{_libexecdir}/%{name}/gvproxy
-
 %changelog
+* Fri Nov 10 2023 Jindrich Novy <jnovy@redhat.com> - 2:4.7.2-1
+- update to https://github.com/containers/podman/releases/tag/v4.7.2
+- remove gvisor from podman and depend on external one
+- Related: Jira:RHEL-2112
+
 * Fri Sep 29 2023 Jindrich Novy <jnovy@redhat.com> - 2:4.6.1-6
 - update to the latest content of https://github.com/containers/podman/tree/v4.6.1-rhel
   (https://github.com/containers/podman/commit/68e7ae0)
diff --git a/sources b/sources
index ce44ec7..2cb044a 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 SHA512 (v0.1.7.tar.gz) = 7d3174c60e1c8bd1f4b95b7751ccbe01cac63265060f18914b53311f68f7b4c63c693604f348ccfac5db4a96939169f835fbbbd614803b18062053d94f7dca67
 SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8
-SHA512 (gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz) = 8b9e687c8be7063641839b5764787ae82561635ae6410585a3c70552bed741e6a63154f55d0209a6408861d5ee76619a765e70b2deda37d38802f6e5b57f2a4c
-SHA512 (v4.6.1-rhel-68e7ae0.tar.gz) = 59ab785eda412a86160f90442f2612a48f53f43571dd39bcba0e419ac26f9636e943b44e15167144afa577a3cf9457ab9ef951a93357596ac08f7a6fc06f58c8
+SHA512 (podman-4.7.2-68e7ae0.tar.gz) = 39536cf28e9d32d622d066c298a3a890016cb90f569e0c2b4ea20a0d00a0c19e37309cd9ef1edca3cc2e03813d30c2c669b9dd65a23aa88c7654143f82fa61df