From 1517acd4a369cd6ce5ea48e8db167747669e28c6 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 3 Aug 2022 09:55:33 -0400 Subject: [PATCH] Bump to v4.2.0-rc2 use gvisor-tap-vsock commit fdc231ae Signed-off-by: Lokesh Mandvekar --- .gitignore | 2 ++ podman.spec | 43 +++++++++++++++++++------------------------ sources | 4 ++-- 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index e17e1d4..ddb7b92 100644 --- a/.gitignore +++ b/.gitignore @@ -1808,3 +1808,5 @@ /gvisor-tap-vsock-4ee84d66bd86668f011733d8873989b5862bcd07.tar.gz /v4.1.1.tar.gz /v4.2.0-rc1.tar.gz +/gvisor-tap-vsock-fdc231ae7b8fe1aec4cf0b8777274fa21b70d789.tar.gz +/v4.2.0-rc2.tar.gz diff --git a/podman.spec b/podman.spec index 3f0fdcf..74d9b76 100644 --- a/podman.spec +++ b/podman.spec @@ -31,14 +31,14 @@ # 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 4ee84d66bd86668f011733d8873989b5862bcd07 +%global commit_gvproxy fdc231ae7b8fe1aec4cf0b8777274fa21b70d789 -%global built_tag v4.1.1 -%global tarball_tag 4.1.1 +%global built_tag v4.2.0-rc2 +%global tarball_tag 4.2.0-rc2 Name: podman Epoch: 4 -Version: 4.1.1 +Version: 4.2.0~rc2 %if "%{_vendor}" == "debbuild" Packager: Lokesh Mandvekar License: ASL-2.0+ @@ -103,27 +103,26 @@ Suggests: qemu-user-static # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e '/bundled(golang(go\|module\|replace\|require))/d' Provides: bundled(golang(github.com/BurntSushi/toml)) = v1.1.0 -Provides: bundled(golang(github.com/blang/semver)) = v3.5.1+incompatible +Provides: bundled(golang(github.com/blang/semver/v4)) = v4.0.0 Provides: bundled(golang(github.com/buger/goterm)) = v1.0.4 Provides: bundled(golang(github.com/checkpoint_restore/checkpointctl)) = v0.0.0_20220321135231_33f4a66335f0 Provides: bundled(golang(github.com/checkpoint_restore/go_criu/v5)) = v5.3.0 Provides: bundled(golang(github.com/container_orchestrated_devices/container_device_interface)) = v0.4.0 -Provides: bundled(golang(github.com/containernetworking/cni)) = v1.1.0 +Provides: bundled(golang(github.com/containernetworking/cni)) = v1.1.1 Provides: bundled(golang(github.com/containernetworking/plugins)) = v1.1.1 -Provides: bundled(golang(github.com/containers/buildah)) = v1.26.1 -Provides: bundled(golang(github.com/containers/common)) = v0.48.0 +Provides: bundled(golang(github.com/containers/buildah)) = v1.26.1_0.20220716095526_d31d27c357ab +Provides: bundled(golang(github.com/containers/common)) = v0.48.1_0.20220718075257_ecddf87b3840 Provides: bundled(golang(github.com/containers/conmon)) = v2.0.20+incompatible -Provides: bundled(golang(github.com/containers/image/v5)) = v5.21.1 -Provides: bundled(golang(github.com/containers/ocicrypt)) = v1.1.4 +Provides: bundled(golang(github.com/containers/image/v5)) = v5.21.2_0.20220721072459_bf19265865b7 +Provides: bundled(golang(github.com/containers/ocicrypt)) = v1.1.5 Provides: bundled(golang(github.com/containers/psgo)) = v1.7.2 -Provides: bundled(golang(github.com/containers/storage)) = v1.40.2 +Provides: bundled(golang(github.com/containers/storage)) = v1.41.1_0.20220714115232_fc9b0ff5272a Provides: bundled(golang(github.com/coreos/go_systemd/v22)) = v22.3.2 Provides: bundled(golang(github.com/coreos/stream_metadata_go)) = v0.0.0_20210225230131_70edb9eb47b3 Provides: bundled(golang(github.com/cyphar/filepath_securejoin)) = v0.2.3 -Provides: bundled(golang(github.com/davecgh/go_spew)) = v1.1.1 Provides: bundled(golang(github.com/digitalocean/go_qemu)) = v0.0.0_20210326154740_ac9e0b687001 Provides: bundled(golang(github.com/docker/distribution)) = v2.8.1+incompatible -Provides: bundled(golang(github.com/docker/docker)) = v20.10.14+incompatible +Provides: bundled(golang(github.com/docker/docker)) = v20.10.17+incompatible Provides: bundled(golang(github.com/docker/go_connections)) = v0.4.1_0.20210727194412_58542c764a11 Provides: bundled(golang(github.com/docker/go_plugins_helpers)) = v0.0.0_20211224144127_6eecb7beb651 Provides: bundled(golang(github.com/docker/go_units)) = v0.4.0 @@ -146,21 +145,19 @@ Provides: bundled(golang(github.com/onsi/ginkgo)) = v1.16.5 Provides: bundled(golang(github.com/onsi/gomega)) = v1.19.0 Provides: bundled(golang(github.com/opencontainers/go_digest)) = v1.0.0 Provides: bundled(golang(github.com/opencontainers/image_spec)) = v1.0.3_0.20220114050600_8b9d41f48198 -Provides: bundled(golang(github.com/opencontainers/runc)) = v1.1.1 +Provides: bundled(golang(github.com/opencontainers/runc)) = v1.1.3 Provides: bundled(golang(github.com/opencontainers/runtime_spec)) = v1.0.3_0.20211214071223_8958f93039ab -Provides: bundled(golang(github.com/opencontainers/runtime_tools)) = v0.9.1_0.20220110225228_7e2d60f1e41f +Provides: bundled(golang(github.com/opencontainers/runtime_tools)) = v0.9.1_0.20220714195903_17b3287fafb7 Provides: bundled(golang(github.com/opencontainers/selinux)) = v1.10.1 -Provides: bundled(golang(github.com/pkg/errors)) = v0.9.1 -Provides: bundled(golang(github.com/pmezard/go_difflib)) = v1.0.0 Provides: bundled(golang(github.com/rootless_containers/rootlesskit)) = v1.0.1 -Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.8.1 -Provides: bundled(golang(github.com/spf13/cobra)) = v1.4.0 +Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.9.0 +Provides: bundled(golang(github.com/spf13/cobra)) = v1.5.0 Provides: bundled(golang(github.com/spf13/pflag)) = v1.0.5 -Provides: bundled(golang(github.com/stretchr/testify)) = v1.7.1 +Provides: bundled(golang(github.com/stretchr/testify)) = v1.8.0 Provides: bundled(golang(github.com/syndtr/gocapability)) = v0.0.0_20200815063812_42c35b437635 Provides: bundled(golang(github.com/uber/jaeger_client_go)) = v2.30.0+incompatible Provides: bundled(golang(github.com/ulikunitz/xz)) = v0.5.10 -Provides: bundled(golang(github.com/vbauerster/mpb/v7)) = v7.4.1 +Provides: bundled(golang(github.com/vbauerster/mpb/v7)) = v7.4.2 Provides: bundled(golang(github.com/vishvananda/netlink)) = v1.1.1_0.20220115184804_dd687eb2f2d4 %endif @@ -335,8 +332,6 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{build install.modules-load %endif -mv pkg/hooks/README.md pkg/hooks/README-hooks.md - # install dnsname plugin cd %{repo_plugins}-%{commit_plugins} %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install @@ -363,7 +358,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %files -f %{name}.file-list %license LICENSE -%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md +%doc README.md CONTRIBUTING.md install.md transfer.md %{_bindir}/%{name} %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/rootlessport diff --git a/sources b/sources index 32fb308..dd274f7 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 -SHA512 (gvisor-tap-vsock-4ee84d66bd86668f011733d8873989b5862bcd07.tar.gz) = 6b0e97f25f0c9ec0f018edcf9c1801daaeacc4d97d05cc2b453467e071c50693bb44d483bac34e64e0c9de71e78e47810a7c46d028553adee9fd6f593df8eb1a -SHA512 (v4.1.1.tar.gz) = 19dd2800b59dacf7edd5d8204bdaffa0959910c7751b582f5a12b8d644b52f9d6581b9c3b4cba3ddb0707f6a90c0dbc93de6d8e2eaa6a4234ebb9dfa28e693b3 +SHA512 (gvisor-tap-vsock-fdc231ae7b8fe1aec4cf0b8777274fa21b70d789.tar.gz) = 9441a6b0dc64961994ec9c268ad81916c4b88bf5c508c32dc6b0f68a993dc0c57c92304bfaa525aafe6445107314fc6954a65dbfb53432450ac0076d7d68c1ba +SHA512 (v4.2.0-rc2.tar.gz) = 008ada00eadbb2c4fe6250052bbd0dc07636b119f82a01804b5c3e3ffa0944b6e1adbe3c0b819b818a40918e3450648fda49834eb7114c74a61a7a18f0a83d44