From 223a82f86b175b0aa6587ea1ac171b8d5be03a91 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 13 Jul 2023 16:01:55 -0400 Subject: [PATCH] bump to v4.6.0-rc2 --- .gitignore | 1 + podman.spec | 181 +--------------------------------------------------- sources | 2 +- 3 files changed, 5 insertions(+), 179 deletions(-) diff --git a/.gitignore b/.gitignore index 3f9c3cf..3b07634 100644 --- a/.gitignore +++ b/.gitignore @@ -1830,3 +1830,4 @@ /gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz /v4.5.1.tar.gz /v4.6.0-rc1.tar.gz +/v4.6.0-rc2.tar.gz diff --git a/podman.spec b/podman.spec index 79a4297..b907f5b 100644 --- a/podman.spec +++ b/podman.spec @@ -58,7 +58,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.6.0~rc1 +Version: 4.6.0~rc2 License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and ISC and MIT and MPL-2.0 Release: %autorelease %if %{defined golang_arches_future} @@ -69,7 +69,7 @@ ExclusiveArch: aarch64 ppc64le s390x x86_64 Summary: Manage Pods, Containers and Container Images URL: https://%{name}.io/ # All SourceN files fetched from upstream -Source0: %{git0}/archive/v4.6.0-rc1.tar.gz +Source0: %{git0}/archive/v4.6.0-rc2.tar.gz Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{commit_plugins}.tar.gz Source2: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{commit_gvproxy}.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} @@ -108,181 +108,6 @@ Recommends: %{name}-gvproxy = %{epoch}:%{version}-%{release} Provides: %{name}-quadlet Obsoletes: %{name}-quadlet <= 5:4.4.0-1 Provides: %{name}-quadlet = %{epoch}:%{version}-%{release} -# DO NOT DELETE BELOW LINE - used for updating downstream goimports -# vendored libraries -Provides: bundled(golang(github.com/blang/semver/v4)) -Provides: bundled(golang(github.com/buger/goterm)) -Provides: bundled(golang(github.com/BurntSushi/toml)) -Provides: bundled(golang(github.com/checkpoint-restore/checkpointctl/lib)) -Provides: bundled(golang(github.com/checkpoint-restore/go-criu/v6)) -Provides: bundled(golang(github.com/checkpoint-restore/go-criu/v6/rpc)) -Provides: bundled(golang(github.com/checkpoint-restore/go-criu/v6/stats)) -Provides: bundled(golang(github.com/containernetworking/cni/pkg/types/040)) -Provides: bundled(golang(github.com/containernetworking/plugins/pkg/ns)) -Provides: bundled(golang(github.com/container-orchestrated-devices/container-device-interface/pkg/cdi)) -Provides: bundled(golang(github.com/containers/buildah)) -Provides: bundled(golang(github.com/containers/buildah/copier)) -Provides: bundled(golang(github.com/containers/buildah/define)) -Provides: bundled(golang(github.com/containers/buildah/imagebuildah)) -Provides: bundled(golang(github.com/containers/buildah/pkg/chrootuser)) -Provides: bundled(golang(github.com/containers/buildah/pkg/cli)) -Provides: bundled(golang(github.com/containers/buildah/pkg/overlay)) -Provides: bundled(golang(github.com/containers/buildah/pkg/parse)) -Provides: bundled(golang(github.com/containers/buildah/pkg/util)) -Provides: bundled(golang(github.com/containers/buildah/util)) -Provides: bundled(golang(github.com/containers/common/libimage)) -Provides: bundled(golang(github.com/containers/common/libimage/define)) -Provides: bundled(golang(github.com/containers/common/libnetwork/cni)) -Provides: bundled(golang(github.com/containers/common/libnetwork/etchosts)) -Provides: bundled(golang(github.com/containers/common/libnetwork/network)) -Provides: bundled(golang(github.com/containers/common/libnetwork/pasta)) -Provides: bundled(golang(github.com/containers/common/libnetwork/resolvconf)) -Provides: bundled(golang(github.com/containers/common/libnetwork/slirp4netns)) -Provides: bundled(golang(github.com/containers/common/libnetwork/types)) -Provides: bundled(golang(github.com/containers/common/libnetwork/util)) -Provides: bundled(golang(github.com/containers/common/pkg/apparmor)) -Provides: bundled(golang(github.com/containers/common/pkg/auth)) -Provides: bundled(golang(github.com/containers/common/pkg/capabilities)) -Provides: bundled(golang(github.com/containers/common/pkg/cgroups)) -Provides: bundled(golang(github.com/containers/common/pkg/chown)) -Provides: bundled(golang(github.com/containers/common/pkg/completion)) -Provides: bundled(golang(github.com/containers/common/pkg/config)) -Provides: bundled(golang(github.com/containers/common/pkg/download)) -Provides: bundled(golang(github.com/containers/common/pkg/filters)) -Provides: bundled(golang(github.com/containers/common/pkg/flag)) -Provides: bundled(golang(github.com/containers/common/pkg/hooks)) -Provides: bundled(golang(github.com/containers/common/pkg/hooks/exec)) -Provides: bundled(golang(github.com/containers/common/pkg/machine)) -Provides: bundled(golang(github.com/containers/common/pkg/netns)) -Provides: bundled(golang(github.com/containers/common/pkg/parse)) -Provides: bundled(golang(github.com/containers/common/pkg/report)) -Provides: bundled(golang(github.com/containers/common/pkg/resize)) -Provides: bundled(golang(github.com/containers/common/pkg/rootlessport)) -Provides: bundled(golang(github.com/containers/common/pkg/seccomp)) -Provides: bundled(golang(github.com/containers/common/pkg/secrets)) -Provides: bundled(golang(github.com/containers/common/pkg/servicereaper)) -Provides: bundled(golang(github.com/containers/common/pkg/ssh)) -Provides: bundled(golang(github.com/containers/common/pkg/subscriptions)) -Provides: bundled(golang(github.com/containers/common/pkg/sysinfo)) -Provides: bundled(golang(github.com/containers/common/pkg/umask)) -Provides: bundled(golang(github.com/containers/common/pkg/util)) -Provides: bundled(golang(github.com/containers/conmon/runner/config)) -Provides: bundled(golang(github.com/containers/image/v5/copy)) -Provides: bundled(golang(github.com/containers/image/v5/docker)) -Provides: bundled(golang(github.com/containers/image/v5/docker/reference)) -Provides: bundled(golang(github.com/containers/image/v5/manifest)) -Provides: bundled(golang(github.com/containers/image/v5/pkg/cli)) -Provides: bundled(golang(github.com/containers/image/v5/pkg/cli/sigstore)) -Provides: bundled(golang(github.com/containers/image/v5/pkg/compression)) -Provides: bundled(golang(github.com/containers/image/v5/pkg/docker/config)) -Provides: bundled(golang(github.com/containers/image/v5/pkg/shortnames)) -Provides: bundled(golang(github.com/containers/image/v5/pkg/sysregistriesv2)) -Provides: bundled(golang(github.com/containers/image/v5/signature)) -Provides: bundled(golang(github.com/containers/image/v5/signature/signer)) -Provides: bundled(golang(github.com/containers/image/v5/storage)) -Provides: bundled(golang(github.com/containers/image/v5/transports)) -Provides: bundled(golang(github.com/containers/image/v5/transports/alltransports)) -Provides: bundled(golang(github.com/containers/image/v5/types)) -Provides: bundled(golang(github.com/containers/ocicrypt/config)) -Provides: bundled(golang(github.com/containers/ocicrypt/helpers)) -Provides: bundled(golang(github.com/containers/psgo)) -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)) -Provides: bundled(golang(github.com/containers/storage/pkg/idtools)) -Provides: bundled(golang(github.com/containers/storage/pkg/ioutils)) -Provides: bundled(golang(github.com/containers/storage/pkg/lockfile)) -Provides: bundled(golang(github.com/containers/storage/pkg/mount)) -Provides: bundled(golang(github.com/containers/storage/pkg/parsers/kernel)) -Provides: bundled(golang(github.com/containers/storage/pkg/reexec)) -Provides: bundled(golang(github.com/containers/storage/pkg/regexp)) -Provides: bundled(golang(github.com/containers/storage/pkg/stringid)) -Provides: bundled(golang(github.com/containers/storage/pkg/system)) -Provides: bundled(golang(github.com/containers/storage/pkg/unshare)) -Provides: bundled(golang(github.com/containers/storage/types)) -Provides: bundled(golang(github.com/coreos/go-systemd/v22/activation)) -Provides: bundled(golang(github.com/coreos/go-systemd/v22/daemon)) -Provides: bundled(golang(github.com/coreos/go-systemd/v22/dbus)) -Provides: bundled(golang(github.com/coreos/stream-metadata-go/fedoracoreos)) -Provides: bundled(golang(github.com/coreos/stream-metadata-go/release)) -Provides: bundled(golang(github.com/coreos/stream-metadata-go/stream)) -Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) -Provides: bundled(golang(github.com/digitalocean/go-qemu/qmp)) -Provides: bundled(golang(github.com/docker/distribution/registry/api/errcode)) -Provides: bundled(golang(github.com/docker/docker/api/types)) -Provides: bundled(golang(github.com/docker/docker/api/types/container)) -Provides: bundled(golang(github.com/docker/docker/api/types/events)) -Provides: bundled(golang(github.com/docker/docker/api/types/mount)) -Provides: bundled(golang(github.com/docker/docker/api/types/network)) -Provides: bundled(golang(github.com/docker/docker/api/types/registry)) -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/go-connections/nat)) -Provides: bundled(golang(github.com/docker/go-plugins-helpers/sdk)) -Provides: bundled(golang(github.com/docker/go-plugins-helpers/volume)) -Provides: bundled(golang(github.com/docker/go-units)) -Provides: bundled(golang(github.com/godbus/dbus/v5)) -Provides: bundled(golang(github.com/google/gofuzz)) -Provides: bundled(golang(github.com/google/shlex)) -Provides: bundled(golang(github.com/google/uuid)) -Provides: bundled(golang(github.com/gorilla/handlers)) -Provides: bundled(golang(github.com/gorilla/mux)) -Provides: bundled(golang(github.com/gorilla/schema)) -Provides: bundled(golang(github.com/hashicorp/go-multierror)) -Provides: bundled(golang(github.com/json-iterator/go)) -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/gomega)) -Provides: bundled(golang(github.com/onsi/gomega/format)) -Provides: bundled(golang(github.com/onsi/gomega/gexec)) -Provides: bundled(golang(github.com/onsi/gomega/matchers)) -Provides: bundled(golang(github.com/onsi/gomega/types)) -Provides: bundled(golang(github.com/opencontainers/go-digest)) -Provides: bundled(golang(github.com/opencontainers/image-spec/specs-go/v1)) -Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/cgroups)) -Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/configs)) -Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/devices)) -Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/user)) -Provides: bundled(golang(github.com/opencontainers/runtime-spec/specs-go)) -Provides: bundled(golang(github.com/opencontainers/runtime-tools/generate)) -Provides: bundled(golang(github.com/opencontainers/runtime-tools/validate/capabilities)) -Provides: bundled(golang(github.com/opencontainers/selinux/go-selinux)) -Provides: bundled(golang(github.com/opencontainers/selinux/go-selinux/label)) -Provides: bundled(golang(github.com/openshift/imagebuilder)) -Provides: bundled(golang(github.com/rootless-containers/rootlesskit/pkg/port)) -Provides: bundled(golang(github.com/rootless-containers/rootlesskit/pkg/port/builtin)) -Provides: bundled(golang(github.com/rootless-containers/rootlesskit/pkg/port/portutil)) -Provides: bundled(golang(github.com/sirupsen/logrus)) -Provides: bundled(golang(github.com/sirupsen/logrus/hooks/syslog)) -Provides: bundled(golang(github.com/spf13/cobra)) -Provides: bundled(golang(github.com/spf13/pflag)) -Provides: bundled(golang(github.com/syndtr/gocapability/capability)) -Provides: bundled(golang(github.com/ulikunitz/xz)) -Provides: bundled(golang(github.com/vbauerster/mpb/v8)) -Provides: bundled(golang(github.com/vbauerster/mpb/v8/decor)) -Provides: bundled(golang(github.com/vishvananda/netlink)) -Provides: bundled(golang(go.etcd.io/bbolt)) -Provides: bundled(golang(golang.org/x/net/proxy)) -Provides: bundled(golang(golang.org/x/sync/semaphore)) -Provides: bundled(golang(golang.org/x/sys/unix)) -Provides: bundled(golang(golang.org/x/term)) -Provides: bundled(golang(google.golang.org/protobuf/proto)) -Provides: bundled(golang(gopkg.in/inf.v0)) -Provides: bundled(golang(gopkg.in/yaml.v3)) -Provides: bundled(golang(sigs.k8s.io/yaml)) %description %{name} (Pod Manager) is a fully featured container engine that is a simple @@ -382,7 +207,7 @@ It is a symlink to %{_bindir}/%{name} and execs into the `%{name}sh` container when `%{_bindir}/%{name}sh is set as a login shell or set as os.Args[0]. %prep -%autosetup -Sgit -n %{name}-4.6.0-rc1 +%autosetup -Sgit -n %{name}-4.6.0-rc2 sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile # untar dnsname diff --git a/sources b/sources index 7b644eb..0c97bd1 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 SHA512 (gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz) = 8b9e687c8be7063641839b5764787ae82561635ae6410585a3c70552bed741e6a63154f55d0209a6408861d5ee76619a765e70b2deda37d38802f6e5b57f2a4c -SHA512 (v4.6.0-rc1.tar.gz) = 624c039e02ce3a4214070d26229ef6f9ec9ae18750bc95eb1a221f01afdeac6ce667ffd1752d3a9c220f36e78b38aba5e25b582933c65c3e570d8fbf2a78943c +SHA512 (v4.6.0-rc2.tar.gz) = 96dc23df93269c5c83e15bfeb33606505205aef7ee2064f69babf6f4fae9c2d1a416d397f34119de30f1d086192b307771c67d66ae256ace1dfd4a24b7c675bf