bump to v4.6.0-rc1

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

.gitignore

@@ -1829,3 +1829,4 @@
 /v4.5.0.tar.gz
 /gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz
 /v4.5.1.tar.gz
+/v4.6.0-rc1.tar.gz

podman.spec

@@ -9,84 +9,46 @@
 
 # RHEL 8's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we
 # set it separately here and do not depend on RHEL 8's go-srpm-macros package.
-%if !0%{?fedora} && 0%{?rhel} <= 8
+%if %{defined rhel} && 0%{?rhel} == 8
 %define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
+%define rhel8py3 1
 %endif
 
-%if 0%{?rhel}
+%global gomodulesmode GO111MODULE=on
-%bcond_with btrfs
+
+%if %{defined rhel}
 # _user_tmpfiles.d currently undefined on rhel
 %global _user_tmpfilesdir %{_datadir}/user-tmpfiles.d
-%else
-%bcond_without btrfs
 %endif
 
-# RHEL 8 needs /usr/bin/python3 to build docs
+%if %{defined fedora}
-%if 0%{?rhel} == 8
+%define build_with_btrfs 1
-%bcond_without python3
-%else
-%bcond_with python3
 %endif
 
-%if 0%{?fedora} || 0%{?rhel} >= 10
+%global container_base_path github.com/containers
-%bcond_without modules_load
+%global container_base_url https://%{container_base_path}
-%else
-%bcond_with modules_load
-%endif
 
-%if 0%{?fedora} || 0%{?rhel} >= 9
+# For LDFLAGS
-%bcond_without go_rpm_macros
+%global ld_project %{container_base_path}/%{name}/v4
-%else
+%global ld_libpod %{ld_project}/libpod
-%bcond_with go_rpm_macros
-%endif
 
-# copr_username is only set on copr environments, not on others like koji
+# %%{name}
-%if "%{?copr_username}" != "rhcontainerbot"
+%global git0 %{container_base_url}/%{name}
-%bcond_with copr
-%else
-%bcond_without copr
-%endif
-
-%if 0%{?centos} <= 8
-%bcond_without changelog
-%else
-%bcond_with changelog
-%endif
-
-%if 0%{?fedora}
-%bcond_without golang_arches_future
-%else
-%bcond_with golang_arches_future
-%endif
-
-%global provider github
-%global provider_tld com
-%global project containers
-%global repo %{name}
-# https://github.com/containers/%%{name}
-%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global git0 https://%{import_path}
 
 # dnsname
 %global repo_plugins dnsname
-# https://github.com/containers/dnsname
+%global git_plugins %{container_base_url}/%{repo_plugins}
-%global import_path_plugins %{provider}.%{provider_tld}/%{project}/%{repo_plugins}
-%global git_plugins https://%{import_path_plugins}
 %global commit_plugins 18822f9a4fb35d1349eb256f4cd2bfd372474d84
+%global import_path_plugins %{container_base_path}/%{repo_plugins}
 
 # gvproxy
 %global repo_gvproxy gvisor-tap-vsock
-# https://github.com/containers/gvisor-tap-vsock
+%global git_gvproxy %{container_base_url}/%{repo_gvproxy}
-%global import_path_gvproxy %{provider}.%{provider_tld}/%{project}/%{repo_gvproxy}
-%global git_gvproxy https://%{import_path_gvproxy}
 %global commit_gvproxy 407efb5dcdb0f4445935f7360535800b60447544
 
-# podman
-%global git0 https://github.com/containers/%{name}
-
 Name: podman
-%if %{with copr}
+%if %{defined copr_username}
-Epoch: 101
+Epoch: 102
 %else
 Epoch: 5
 %endif
@@ -96,10 +58,10 @@ 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.1
+Version: 4.6.0~rc1
 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}
+%if %{defined golang_arches_future}
 ExclusiveArch: %{golang_arches_future}
 %else
 ExclusiveArch: aarch64 ppc64le s390x x86_64
@@ -107,13 +69,13 @@ 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/v%{version}.tar.gz
+Source0: %{git0}/archive/v4.6.0-rc1.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}
 BuildRequires: %{_bindir}/envsubst
-BuildRequires: go-md2man
+BuildRequires: %{_bindir}/go-md2man
-%if %{with btrfs}
+%if %{defined build_with_btrfs}
 BuildRequires: btrfs-progs-devel
 %endif
 BuildRequires: gcc
@@ -122,7 +84,7 @@ BuildRequires: glibc-devel
 BuildRequires: glibc-static
 BuildRequires: golang
 BuildRequires: git-core
-%if %{with go_rpm_macros}
+%if !%{defined gobuild}
 BuildRequires: go-rpm-macros
 %endif
 BuildRequires: gpgme-devel
@@ -136,38 +98,28 @@ BuildRequires: make
 BuildRequires: ostree-devel
 BuildRequires: systemd
 BuildRequires: systemd-devel
-%if %{with python3}
+%if %{defined rhel8py3}
 BuildRequires: python3
 %endif
 Requires: catatonit
 Requires: conmon >= 2:2.1.7-2
-%if 0%{?fedora} > 38
+Requires: containers-common-extra
-Requires: containers-common-extra >= 4:1-90
-%else
-%if 0%{?fedora} == 38
-Requires: containers-common-extra >= 4:1-89
-%else
-Requires: containers-common-extra >= 4:1-82
-%endif
-%endif
 Recommends: %{name}-gvproxy = %{epoch}:%{version}-%{release}
 Provides: %{name}-quadlet
 Obsoletes: %{name}-quadlet <= 5:4.4.0-1
 Provides: %{name}-quadlet = %{epoch}:%{version}-%{release}
-# TODO: need to find the right action in packit propose-downstream to update
-# the goimports here. None of the actions seem to work so far.
 # DO NOT DELETE BELOW LINE - used for updating downstream goimports
 # vendored libraries
-Provides: bundled(golang(github.com/BurntSushi/toml))
 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/container-orchestrated-devices/container-device-interface/pkg/cdi))
 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))
@@ -183,7 +135,9 @@ 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))
@@ -203,8 +157,10 @@ 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))
@@ -234,6 +190,7 @@ 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))
@@ -256,6 +213,7 @@ 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))
@@ -266,14 +224,13 @@ 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))
 Provides: bundled(golang(github.com/docker/go-units))
-Provides: bundled(golang(github.com/fsnotify/fsnotify))
 Provides: bundled(golang(github.com/godbus/dbus/v5))
 Provides: bundled(golang(github.com/google/gofuzz))
 Provides: bundled(golang(github.com/google/shlex))
@@ -287,7 +244,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))
+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))
@@ -411,8 +368,21 @@ It is based on the network stack of gVisor. Compared to libslirp,
 gvisor-tap-vsock brings a configurable DNS server and
 dynamic port forwarding.
 
+%package -n %{name}sh
+Summary: Confined login and user shell using %{name}
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Provides: %{name}-shell = %{epoch}:%{version}-%{release}
+Provides: %{name}-%{name}sh = %{epoch}:%{version}-%{release}
+
+%description -n %{name}sh
+%{name}sh provides a confined login and user shell with access to volumes and
+capabilities specified in user quadlets.
+
+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}-%{version}
+%autosetup -Sgit -n %{name}-4.6.0-rc1
 sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile
 
 # untar dnsname
@@ -424,6 +394,7 @@ tar zxf %{SOURCE2}
 %build
 %set_build_flags
 export CGO_CFLAGS=$CFLAGS
+
 # These extra flags present in $CFLAGS have been skipped for now as they break the build
 CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-flto=auto//g')
 CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-Wp,D_GLIBCXX_ASSERTIONS//g')
@@ -433,61 +404,52 @@ CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-an
 export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full"
 %endif
 
-export GO111MODULE=off
+LDFLAGS="-X %{ld_libpod}/define.buildInfo=$(date +%s) \
-export GOPATH=$(pwd)/_build:$(pwd)
+         -X %{ld_libpod}/config._installPrefix=%{_prefix} \
-
+         -X %{ld_libpod}/config._etcDir=%{_sysconfdir} \
-mkdir _build
+         -X %{ld_project}/pkg/systemd/quadlet._binDir=%{_bindir}"
-cd _build
-mkdir -p src/%{provider}.%{provider_tld}/%{project}
-ln -s ../../../../ src/%{import_path}
-cd ..
-ln -s vendor src
-
-# build date. FIXME: Makefile uses '/v2/libpod', that doesn't work here?
-LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)"
 
 # build rootlessport first
-%gobuild -o bin/rootlessport %{import_path}/cmd/rootlessport
+%gobuild -o bin/rootlessport ./cmd/rootlessport
 
 export BASEBUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)"
 
 # build %%{name}
 export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh)"
-%gobuild -o bin/%{name} %{import_path}/cmd/%{name}
+%gobuild -o bin/%{name} ./cmd/%{name}
 
 # build %%{name}-remote
 export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs btrfs_noversion remote"
-%gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name}
+%gobuild -o bin/%{name}-remote ./cmd/%{name}
 
 # build quadlet
 export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)"
-%gobuild -o bin/quadlet %{import_path}/cmd/quadlet
+%gobuild -o bin/quadlet ./cmd/quadlet
 
+# reset LDFLAGS for plugins and gvisor binaries
+LDFLAGS=''
+
+# build gvisor-tap-vsock binaries
+cd %{repo_gvproxy}-%{commit_gvproxy}
+%gobuild -o bin/gvproxy ./cmd/gvproxy
+%gobuild -o bin/gvforwarder ./cmd/vm
+cd ..
+
+%{__make} docs docker-docs
+
+# build dnsname the old way otherwise it fails on koji
 cd %{repo_plugins}-%{commit_plugins}
 mkdir _build
 cd _build
-mkdir -p src/%{provider}.%{provider_tld}/%{project}
+mkdir -p src/%{container_base_path}
 ln -s ../../../../ src/%{import_path_plugins}
 cd ..
 ln -s vendor src
 export GOPATH=$(pwd)/_build:$(pwd)
+%define gomodulesmode GO111MODULE=off
 %gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname
 cd ..
 
-cd %{repo_gvproxy}-%{commit_gvproxy}
-mkdir _build
-cd _build
-mkdir -p src/%{provider}.%{provider_tld}/%{project}
-ln -s ../../../../ src/%{import_path_gvproxy}
-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
-
 %install
 install -dp %{buildroot}%{_unitdir}
 PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{_sysconfdir} \
@@ -498,7 +460,7 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{_sysc
        install.docker \
        install.docker-docs \
        install.remote \
-%if %{with modules_load}
+%if %{defined _modulesloaddir}
         install.modules-load
 %endif
 
@@ -547,7 +509,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
 %{_tmpfilesdir}/%{name}.conf
 %{_systemdgeneratordir}/%{name}-system-generator
 %{_systemdusergeneratordir}/%{name}-user-generator
-%if %{with modules_load}
+%if %{defined _modulesloaddir}
 %{_modulesloaddir}/%{name}-iptables.conf
 %endif
 
@@ -584,10 +546,15 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
 %{_libexecdir}/%{name}/gvproxy
 %{_libexecdir}/%{name}/gvforwarder
 
+%files -n %{name}sh
+%license LICENSE
+%doc README.md CONTRIBUTING.md install.md transfer.md
+%{_bindir}/%{name}sh
+
 %changelog
-%if %{with changelog}
+%if %{defined autochangelog}
+%autochangelog
+%else
 * Mon May 01 2023 RH Container Bot <rhcontainerbot@fedoraproject.org>
 - Placeholder changelog for envs that are not autochangelog-ready
-%else
-%autochangelog
 %endif

sources

@@ -1,3 +1,3 @@
 SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8
 SHA512 (gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz) = 8b9e687c8be7063641839b5764787ae82561635ae6410585a3c70552bed741e6a63154f55d0209a6408861d5ee76619a765e70b2deda37d38802f6e5b57f2a4c
-SHA512 (v4.5.1.tar.gz) = c09af81063dba7125d06bb982ae6db5c1933bb32273f194f90875b5c63b916f94d0daacf09212139ae8dc5f8cfa224e7fd1d83e1a22df19be2adde84583ee049
+SHA512 (v4.6.0-rc1.tar.gz) = 624c039e02ce3a4214070d26229ef6f9ec9ae18750bc95eb1a221f01afdeac6ce667ffd1752d3a9c220f36e78b38aba5e25b582933c65c3e570d8fbf2a78943c