Merge pull request #18707 from lsm5/bump-gvisor-and-fix-packit

RPM: bump gvisor-tap-vsock subpackage and fix packit scripts

.packit.yaml

@@ -35,7 +35,7 @@ jobs:
       - fedora-all
     actions:
         pre-sync:
-          - "cd rpm && bash update-spec-provides.sh"
+          - "bash rpm/update-spec-provides.sh"
 
   - job: koji_build
     trigger: commit

rpm/podman.spec

@@ -79,7 +79,7 @@
 # https://github.com/containers/gvisor-tap-vsock
 %global import_path_gvproxy %{provider}.%{provider_tld}/%{project}/%{repo_gvproxy}
 %global git_gvproxy https://%{import_path_gvproxy}
-%global commit_gvproxy aab0ac9367fc5142f5857c36ac2352bcb3c60ab7
+%global commit_gvproxy 407efb5dcdb0f4445935f7360535800b60447544
 
 # podman
 %global git0 https://github.com/containers/%{name}
@@ -313,6 +313,7 @@ cd ..
 ln -s vendor src
 export GOPATH=$(pwd)/_build:$(pwd)
 %gobuild -o bin/gvproxy %{import_path_gvproxy}/cmd/gvproxy
+%gobuild -o bin/gvforwarder %{import_path_gvproxy}/cmd/vm
 cd ..
 
 %{__make} docs docker-docs
@@ -342,6 +343,7 @@ cd ..
 cd %{repo_gvproxy}-%{commit_gvproxy}
 install -dp %{buildroot}%{_libexecdir}/%{name}
 install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/%{name}
+install -p -m0755 bin/gvforwarder %{buildroot}%{_libexecdir}/%{name}
 cd ..
 
 # do not include docker and podman-remote man pages in main package
@@ -410,6 +412,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
 %doc %{repo_gvproxy}-%{commit_gvproxy}/README.md
 %dir %{_libexecdir}/%{name}
 %{_libexecdir}/%{name}/gvproxy
+%{_libexecdir}/%{name}/gvforwarder
 
 %changelog
 %if %{with changelog}

rpm/update-spec-provides.sh

@@ -6,7 +6,8 @@
 
 set -e
 
-SPEC_FILE=$(pwd)/podman.spec
+# script is run from git root directory
+SPEC_FILE=rpm/podman.spec
 
 sed -i '/Provides: bundled(golang.*/d' $SPEC_FILE
 

rpm/update-spec-version.sh

@@ -6,7 +6,9 @@
 
 set -e
 
-SPEC_FILE=$(pwd)/podman.spec
+# Script is run from git root directory
+SPEC_FILE=rpm/podman.spec
+
 LATEST_TAG=$(git tag --sort=creatordate | tail -1)
 LATEST_VERSION=$(echo $LATEST_TAG | sed -e 's/^v//')