.gitignore

@@ -1 +1 @@
-SOURCES/v0.7.5.tar.gz
+SOURCES/v0.8.1.tar.gz

.gvisor-tap-vsock.metadata

@@ -1 +1 @@
-eeb9cdbd83165f98f2f9198935b9fa402d848836 SOURCES/v0.7.5.tar.gz
+31e965b2f14abe43a66597f4069221191269ae21 SOURCES/v0.8.1.tar.gz

SPECS/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.1
 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
+It is based on the network stack of gVisor. Compared to libslirp,
-networking for podman-machine virtual machines. Compared to libslirp,
+gvisor-tap-vsock brings a configurable DNS server and
-gvisor-tap-vsock brings a configurable DNS server and dynamic
+dynamic port forwarding.
-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 -dp %{buildroot}%{_gvisor_installdir}
-install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/podman
+install -p -m0755 bin/gvproxy %{buildroot}%{_gvisor_installdir}
-install -p -m0755 bin/gvforwarder %{buildroot}%{_libexecdir}/podman
+install -p -m0755 bin/gvforwarder %{buildroot}%{_gvisor_installdir}
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
@@ -72,48 +107,18 @@ install -p -m0755 bin/gvforwarder %{buildroot}%{_libexecdir}/podman
 %files
 %license LICENSE
 %doc README.md
-%dir %{_libexecdir}/podman
+%dir %{_gvisor_installdir}
-%{_libexecdir}/podman/gvproxy
+%{_gvisor_installdir}/gvproxy
-%{_libexecdir}/podman/gvforwarder
-
-%changelog
-* 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
-
-* Mon Aug 05 2024 Jindrich Novy <jnovy@redhat.com> - 6:0.7.4-1
-- update to https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.7.4
-- Related: RHEL-27608
-
-* Mon Feb 12 2024 Jindrich Novy <jnovy@redhat.com> - 6:0.7.3-2
-- Add gating.yaml
-- Related: Jira:RHEL-2112
-
-* Fri Feb 09 2024 Jindrich Novy <jnovy@redhat.com> - 6:0.7.3-1
-- update to https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.7.3
-- Related: RHEL-2112
 
-* Wed Jan 31 2024 Jindrich Novy <jnovy@redhat.com> - 6:0.7.2-2
+%files gvforwarder
-- Update description - thanks to Derrick Ornelas
+%dir %{_gvisor_installdir}
-- Resolves: RHELPLAN-168385
+%{_gvisor_installdir}/gvforwarder
 
-* Fri Jan 19 2024 Jindrich Novy <jnovy@redhat.com> - 6:0.7.2-1
+%changelog
-- update to https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.7.2
+* Tue Dec 03 2024 Jindrich Novy <jnovy@redhat.com> - 6:0.8.1-1
-- Related: RHEL-2112
+- update to https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.8.1
-
+- Resolves: RHEL-67315
-* Mon Oct 02 2023 Jindrich Novy <jnovy@redhat.com> - 6:0.7.1-1
-- update to https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.7.1
-- Related: Jira:RHEL-2112
-
-* Wed Sep 27 2023 Jindrich Novy <jnovy@redhat.com> - 6:0.7.0-2
-- initial import
-- Resolves: Jira:RHELPLAN-167882
-
-* Tue Aug 01 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 6:0.7.0-3
-- correctly obsolete older podman-gvproxy
-
-* Tue Aug 01 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 6:0.7.0-2
-- fix install paths
 
-* Tue Aug 01 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 6:0.7.0-1
+* Wed Nov 13 2024 Jindrich Novy <jnovy@redhat.com> - 6:0.8.0-1
-- Resolves: #2224434 - initial upload
+- update to https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.8.0
+- Resolves: RHEL-67315