From fcf06a26cd2ee9c4f7ea067457c940fd55a7fe4e Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Wed, 27 Nov 2024 03:55:37 +0100
Subject: [PATCH] gvisor-tap-vsock-0.8.0-1.el9

- update to https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.8.0
- Related: RHEL-60277

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 gvisor-tap-vsock.spec | 64 +++++++++++++++++++++++++++++++++++--------
 sources               |  2 +-
 2 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/gvisor-tap-vsock.spec b/gvisor-tap-vsock.spec
index 655608d..249280a 100644
--- a/gvisor-tap-vsock.spec
+++ b/gvisor-tap-vsock.spec
@@ -9,12 +9,30 @@
 
 %global gomodulesmode GO111MODULE=on
 
+%global _gvisor_installdir %{_libexecdir}/podman
+
+%global desc_gvforwarder Forward traffic from a tap interface over vsock
+
 Name: gvisor-tap-vsock
+%if %{defined copr_username}
+Epoch: 103
+%else
 Epoch: 6
-Version: 0.7.5
+%endif
+# DO NOT TOUCH the Version string!
+# The TRUE source of this specfile is:
+# https://github.com/containers/podman/blob/main/rpm/podman.spec
+# If that's what you're reading, Version must be 0, and will be updated by Packit for
+# copr and koji builds.
+# If you're reading this on dist-git, the version is automatically filled in by Packit.
+Version: 0.8.0
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND MIT
 Release: 1%{?dist}
+%if %{defined golang_arches_future}
 ExclusiveArch: %{golang_arches_future}
+%else
+ExclusiveArch: aarch64 ppc64le s390x x86_64
+%endif
 Summary: Go replacement for libslirp and VPNKit
 URL: https://github.com/containers/%{name}
 # All SourceN files fetched from upstream
@@ -25,17 +43,34 @@ BuildRequires: glibc-devel
 BuildRequires: glibc-static
 BuildRequires: golang
 BuildRequires: git-core
+%if %{defined rhel} && 0%{?rhel} == 8
+BuildRequires: go-srpm-macros
+%else
 BuildRequires: go-rpm-macros
+%endif
 BuildRequires: make
+%if %{defined copr_username}
+Obsoletes: podman-gvproxy < 102:4.7.0-1
+%else
 Obsoletes: podman-gvproxy < 5:4.7.0-1
+%endif
 Provides: podman-gvproxy = %{epoch}:%{version}-%{release}
+Requires: %{name}-gvforwarder = %{epoch}:%{version}-%{release}
 
 %description
 A replacement for libslirp and VPNKit, written in pure Go.
-It is based on the network stack of gVisor and is used to provide
-networking for podman-machine virtual machines. Compared to libslirp,
-gvisor-tap-vsock brings a configurable DNS server and dynamic
-port forwarding.
+It is based on the network stack of gVisor. Compared to libslirp,
+gvisor-tap-vsock brings a configurable DNS server and
+dynamic port forwarding.
+
+%package gvforwarder
+Summary: %{desc_gvforwarder}
+Provides: gvforwarder = %{epoch}:%{version}-%{release}
+Obsoletes: %{name} < 6:0.7.0-6
+Recommends: %{name} = %{epoch}:%{version}-%{release}
+
+%description gvforwarder
+%{desc_gvforwarder}
 
 %prep
 %autosetup -Sgit -n %{name}-%{version}
@@ -62,9 +97,9 @@ LDFLAGS=''
 
 %install
 # install gvproxy
-install -dp %{buildroot}%{_libexecdir}/podman
-install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/podman
-install -p -m0755 bin/gvforwarder %{buildroot}%{_libexecdir}/podman
+install -dp %{buildroot}%{_gvisor_installdir}
+install -p -m0755 bin/gvproxy %{buildroot}%{_gvisor_installdir}
+install -p -m0755 bin/gvforwarder %{buildroot}%{_gvisor_installdir}
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
@@ -72,11 +107,18 @@ install -p -m0755 bin/gvforwarder %{buildroot}%{_libexecdir}/podman
 %files
 %license LICENSE
 %doc README.md
-%dir %{_libexecdir}/podman
-%{_libexecdir}/podman/gvproxy
-%{_libexecdir}/podman/gvforwarder
+%dir %{_gvisor_installdir}
+%{_gvisor_installdir}/gvproxy
+
+%files gvforwarder
+%dir %{_gvisor_installdir}
+%{_gvisor_installdir}/gvforwarder
 
 %changelog
+* Wed Nov 27 2024 Jindrich Novy <jnovy@redhat.com> - 6:0.8.0-1
+- update to https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.8.0
+- Related: RHEL-60277
+
 * Tue Aug 27 2024 Jindrich Novy <jnovy@redhat.com> - 6:0.7.5-1
 - update to https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.7.5
 - Related: RHEL-27608
diff --git a/sources b/sources
index 3948928..78c3aee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v0.7.5.tar.gz) = 2b3cbc2f9495bcfb0b8fff468e9d80701b58b3db07cf7ad8ca33846b63a69bba0c479f568d34cfe2828d7515201009eaf7cdcccb53d0bd03a1098c4c0c01be0a
+SHA512 (v0.8.0.tar.gz) = 25020c7cf9abd229c5b8e9b1a385c2e935c30bbccb72a95de66c12b9d4ee768171b785dd6566738f0fff77d5c6c91752f78be731f1b76f0345626a516014b3ea