From 35be92c7523346193a4edba7f3a3906ca294c002 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 26 May 2023 13:40:48 -0400 Subject: [PATCH] bump to v4.5.1 --- .gitignore | 2 ++ podman.spec | 12 +++++++----- sources | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 55ee588..89dd461 100644 --- a/.gitignore +++ b/.gitignore @@ -1827,3 +1827,5 @@ /v4.5.0-rc1.tar.gz /v4.5.0-rc2.tar.gz /v4.5.0.tar.gz +/gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz +/v4.5.1.tar.gz diff --git a/podman.spec b/podman.spec index 05ca71e..41d456a 100644 --- a/podman.spec +++ b/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} @@ -96,7 +96,7 @@ Epoch: 5 # 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: 4.5.0 +Version: 4.5.1 License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and ISC and MIT and MPL-2.0 Release: %autorelease %if %{with golang_arches_future} @@ -234,7 +234,6 @@ Provides: bundled(golang(github.com/containers/storage)) Provides: bundled(golang(github.com/containers/storage/drivers/quota)) Provides: bundled(golang(github.com/containers/storage/pkg/archive)) Provides: bundled(golang(github.com/containers/storage/pkg/chrootarchive)) -Provides: bundled(golang(github.com/containers/storage/pkg/directory)) Provides: bundled(golang(github.com/containers/storage/pkg/fileutils)) Provides: bundled(golang(github.com/containers/storage/pkg/homedir)) Provides: bundled(golang(github.com/containers/storage/pkg/idmap)) @@ -267,9 +266,9 @@ Provides: bundled(golang(github.com/docker/docker/api/types/swarm)) Provides: bundled(golang(github.com/docker/docker/api/types/volume)) Provides: bundled(golang(github.com/docker/docker/pkg/homedir)) Provides: bundled(golang(github.com/docker/docker/pkg/jsonmessage)) -Provides: bundled(golang(github.com/docker/docker/pkg/meminfo)) Provides: bundled(golang(github.com/docker/docker/pkg/namesgenerator)) Provides: bundled(golang(github.com/docker/docker/pkg/parsers)) +Provides: bundled(golang(github.com/docker/docker/pkg/system)) Provides: bundled(golang(github.com/docker/go-connections/nat)) Provides: bundled(golang(github.com/docker/go-plugins-helpers/sdk)) Provides: bundled(golang(github.com/docker/go-plugins-helpers/volume)) @@ -288,7 +287,7 @@ Provides: bundled(golang(github.com/mattn/go-sqlite3)) Provides: bundled(golang(github.com/moby/term)) Provides: bundled(golang(github.com/nxadm/tail)) Provides: bundled(golang(github.com/nxadm/tail/watch)) -Provides: bundled(golang(github.com/onsi/ginkgo/v2)) +Provides: bundled(golang(github.com/onsi/ginkgo)) Provides: bundled(golang(github.com/onsi/gomega)) Provides: bundled(golang(github.com/onsi/gomega/format)) Provides: bundled(golang(github.com/onsi/gomega/gexec)) @@ -484,6 +483,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 @@ -513,6 +513,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 @@ -581,6 +582,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} diff --git a/sources b/sources index dac3d81..72a79cd 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 -SHA512 (gvisor-tap-vsock-aab0ac9367fc5142f5857c36ac2352bcb3c60ab7.tar.gz) = e138125f0fad46f84afebad5769d4428cb29f24ce34e209b21689dc4409487bf2e946c9eb6551297baf36286c9be9a5310a77df4884563cfe247113980f18291 -SHA512 (v4.5.0.tar.gz) = 8a699dc01fc3d7c4a9e5ef4f166170303fc30e0f6695c61f763944e1cb755e75896108e0c4166d184fe49e3a6859f045aa3883047ebba9290e851fc128d77cac +SHA512 (gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz) = 8b9e687c8be7063641839b5764787ae82561635ae6410585a3c70552bed741e6a63154f55d0209a6408861d5ee76619a765e70b2deda37d38802f6e5b57f2a4c +SHA512 (v4.5.1.tar.gz) = c09af81063dba7125d06bb982ae6db5c1933bb32273f194f90875b5c63b916f94d0daacf09212139ae8dc5f8cfa224e7fd1d83e1a22df19be2adde84583ee049