Update to 4.9.5 upstream release

Upstream tag: v4.9.5
Upstream commit: 1d51e914

Commit authored by Packit automation (https://packit.dev/)

.gitignore

@@ -1832,3 +1832,19 @@
 /v4.6.0-rc1.tar.gz
 /v4.6.0-rc2.tar.gz
 /v4.6.0.tar.gz
+/v4.6.1.tar.gz
+/v4.6.2.tar.gz
+/v4.7.0.tar.gz
+/v4.7.1.tar.gz
+/v4.7.2.tar.gz
+/v4.8.0-rc1.tar.gz
+/v4.8.0.tar.gz
+/v4.8.1.tar.gz
+/v4.8.2.tar.gz
+/v4.8.3.tar.gz
+/v4.9.0.tar.gz
+/v4.9.1.tar.gz
+/v4.9.2.tar.gz
+/v4.9.3.tar.gz
+/v4.9.4.tar.gz
+/v4.9.5.tar.gz

.packit.yaml

@@ -2,40 +2,70 @@
 # See the documentation for more information:
 # https://packit.dev/docs/configuration/
 
-# Build targets can be found at:
-# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/packit-builds/
-
 specfile_path: rpm/podman.spec
 upstream_tag_template: v{version}
 
-jobs:
-  - &copr
-    job: copr_build
-    trigger: pull_request
-    owner: rhcontainerbot
-    project: packit-builds
-    enable_net: true
-    srpm_build_deps:
-      - make
+srpm_build_deps:
+  - git-archive-all
+  - make
 
-  - <<: *copr
-    # Run on commit to main branch
+actions:
+  fix-spec-file:
+    - "bash .packit.sh"
+
+jobs:
+  - job: copr_build
+    trigger: pull_request
+    notifications:
+      failure_comment:
+        message: "Ephemeral COPR build failed. @containers/packit-build please check."
+    enable_net: true
+    targets:
+      - fedora-all-x86_64
+      - fedora-all-aarch64
+      - fedora-eln-x86_64
+      - fedora-eln-aarch64
+      - centos-stream+epel-next-8-x86_64
+      - centos-stream+epel-next-8-aarch64
+      - centos-stream+epel-next-9-x86_64
+      - centos-stream+epel-next-9-aarch64
+    additional_repos:
+      - "copr://rhcontainerbot/podman-next"
+
+  # Run on commit to main branch
+  - job: copr_build
     trigger: commit
+    notifications:
+      failure_comment:
+        message: "podman-next COPR build failed. @containers/packit-build please check."
     branch: main
+    owner: rhcontainerbot
     project: podman-next
+    enable_net: true
+
+  - job: tests
+    identifier: cockpit-revdeps
+    trigger: pull_request
+    notifications:
+      failure_comment:
+        message: "Cockpit tests failed for commit {commit_sha}. @martinpitt, @jelly, @mvollmer please check."
+    targets:
+      - fedora-latest-stable
+      - fedora-development
+    tf_extra_params:
+      environments:
+        - artifacts:
+          - type: repository-file
+            id: https://copr.fedorainfracloud.org/coprs/g/cockpit/main-builds/repo/fedora-$releasever/group_cockpit-main-builds-fedora-$releasever.repo
+          - type: repository-file
+            id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
+          tmt:
+            context:
+              revdeps: "yes"
 
   - job: propose_downstream
     trigger: release
     update_release: false
     dist_git_branches:
-      - fedora-all
-
-  - job: koji_build
-    trigger: commit
-    dist_git_branches:
-      - fedora-all
-
-  - job: bodhi_update
-    trigger: commit
-    dist_git_branches:
-      - fedora-branched # rawhide updates are created automatically
+      - fedora-39
+      - fedora-38

README.packit

@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.78.1.
+The file was generated using packit 0.97.1.post1.dev4+g1268842e.

podman.spec

@@ -7,12 +7,18 @@
 %global debug_package %{nil}
 %endif
 
-# 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 %{defined rhel} && 0%{?rhel} == 8
+# RHEL's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we
+# set it separately here and do not depend on RHEL's go-[s]rpm-macros package
+# until that's fixed.
+# c9s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227328
+# c8s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227331
+%if %{defined rhel} && 0%{?rhel} < 10
 %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 %{?**};
+# python3 dep conditional for rhel8
+%if %{?rhel} == 8
 %define rhel8py3 1
 %endif
+%endif
 
 %global gomodulesmode GO111MODULE=on
 
@@ -25,13 +31,8 @@
 %define build_with_btrfs 1
 %endif
 
-# gvproxy can be included as a standalone package on copr.
-# It is currently open for review on bugzilla until which fedora releases can't
-# include it. Official rawhide should be able to fetch the last active build of
-# gvproxy, the min version requirement has been removed to allow it.
-# Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2224434
-%if !%{defined copr_username} && 0%{?fedora} <= 38
-%define gvproxy_subpackage 1
+%if %{defined copr_username}
+%define copr_build 1
 %endif
 
 %global container_base_path github.com/containers
@@ -50,13 +51,8 @@
 %global commit_plugins 18822f9a4fb35d1349eb256f4cd2bfd372474d84
 %global import_path_plugins %{container_base_path}/%{repo_plugins}
 
-# gvproxy
-%global repo_gvproxy gvisor-tap-vsock
-%global git_gvproxy %{container_base_url}/%{repo_gvproxy}
-%global commit_gvproxy 407efb5dcdb0f4445935f7360535800b60447544
-
 Name: podman
-%if %{defined copr_username}
+%if %{defined copr_build}
 Epoch: 102
 %else
 Epoch: 5
@@ -67,8 +63,9 @@ 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
-License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and ISC and MIT and MPL-2.0
+Version: 4.9.5
+# The `AND` needs to be uppercase in the License for SPDX compatibility
+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}
 ExclusiveArch: %{golang_arches_future}
@@ -78,14 +75,10 @@ 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/v%{version_no_tilde}.tar.gz
 Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{commit_plugins}.tar.gz
-%if %{defined gvproxy_subpackage}
-Source2: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{commit_gvproxy}.tar.gz
-%endif
 Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
 BuildRequires: %{_bindir}/envsubst
-BuildRequires: %{_bindir}/go-md2man
 %if %{defined build_with_btrfs}
 BuildRequires: btrfs-progs-devel
 %endif
@@ -106,6 +99,7 @@ BuildRequires: libselinux-devel
 BuildRequires: shadow-utils-subid-devel
 BuildRequires: pkgconfig
 BuildRequires: make
+BuildRequires: man-db
 BuildRequires: ostree-devel
 BuildRequires: systemd
 BuildRequires: systemd-devel
@@ -115,11 +109,12 @@ BuildRequires: python3
 Requires: catatonit
 Requires: conmon >= 2:2.1.7-2
 Requires: containers-common-extra
-%if %{defined gvproxy_subpackage}
-Recommends: %{name}-gvproxy = %{epoch}:%{version}-%{release}
+%if %{defined rhel} && !%{defined eln}
+Recommends: gvisor-tap-vsock-gvforwarder
 %else
-Recommends: %{name}-gvproxy
+Requires: gvisor-tap-vsock-gvforwarder
 %endif
+Recommends: gvisor-tap-vsock
 Provides: %{name}-quadlet
 Obsoletes: %{name}-quadlet <= 5:4.4.0-1
 Provides: %{name}-quadlet = %{epoch}:%{version}-%{release}
@@ -189,11 +184,7 @@ connections as well.
 %package plugins
 Summary: Plugins for %{name}
 Requires: dnsmasq
-%if %{defined gvproxy_subpackage}
-Recommends: %{name}-gvproxy = %{epoch}:%{version}-%{release}
-%else
-Recommends: %{name}-gvproxy
-%endif
+Recommends: gvisor-tap-vsock
 
 %description plugins
 This plugin sets up the use of dnsmasq on a given CNI network so
@@ -203,17 +194,6 @@ that dnsmasq will read in.  Similarly, when a pod
 is removed from the network, it will remove the entry from the hosts
 file.  Each CNI network will have its own dnsmasq instance.
 
-%if %{defined gvproxy_subpackage}
-%package gvproxy
-Summary: Go replacement for libslirp and VPNKit
-
-%description gvproxy
-A replacement for libslirp and VPNKit, written in pure Go.
-It is based on the network stack of gVisor. Compared to libslirp,
-gvisor-tap-vsock brings a configurable DNS server and
-dynamic port forwarding.
-%endif
-
 %package -n %{name}sh
 Summary: Confined login and user shell using %{name}
 Requires: %{name} = %{epoch}:%{version}-%{release}
@@ -225,20 +205,23 @@ Provides: %{name}-%{name}sh = %{epoch}:%{version}-%{release}
 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].
+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}-%{version_no_tilde}
 sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile
 
+# These changes are only meant for copr builds
+%if %{defined copr_build}
+# podman --version should show short sha
+sed -i "s/^const RawVersion = .*/const RawVersion = \"##VERSION##-##SHORT_SHA##\"/" version/rawversion/version.go
+# use ParseTolerant to allow short sha in version
+sed -i "s/^var Version.*/var Version, err = semver.ParseTolerant(rawversion.RawVersion)/" version/version.go
+%endif
+
 # untar dnsname
 tar zxf %{SOURCE1}
 
-%if %{defined gvproxy_subpackage}
-# untar %%{name}-gvproxy
-tar zxf %{SOURCE2}
-%endif
-
 %build
 %set_build_flags
 export CGO_CFLAGS=$CFLAGS
@@ -252,6 +235,8 @@ 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 GOPROXY=direct
+
 LDFLAGS="-X %{ld_libpod}/define.buildInfo=$(date +%s) \
          -X %{ld_libpod}/config._installPrefix=%{_prefix} \
          -X %{ld_libpod}/config._etcDir=%{_sysconfdir} \
@@ -274,17 +259,9 @@ export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs btrfs_noversion remot
 export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)"
 %gobuild -o bin/quadlet ./cmd/quadlet
 
-# reset LDFLAGS for plugins and gvisor binaries
+# reset LDFLAGS for plugins binaries
 LDFLAGS=''
 
-%if %{defined gvproxy_subpackage}
-# build gvisor-tap-vsock binaries
-cd %{repo_gvproxy}-%{commit_gvproxy}
-%gobuild -o bin/gvproxy ./cmd/gvproxy
-%gobuild -o bin/gvforwarder ./cmd/vm
-cd ..
-%endif
-
 %{__make} docs docker-docs
 
 # build dnsname the old way otherwise it fails on koji
@@ -321,15 +298,6 @@ cd %{repo_plugins}-%{commit_plugins}
 %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install
 cd ..
 
-%if %{defined gvproxy_subpackage}
-# install gvproxy
-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 ..
-%endif
-
 # do not include docker and podman-remote man pages in main package
 for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},," | grep -v -e remote -e docker`; do
     echo "$file*" >> podman.file-list
@@ -382,7 +350,6 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
 %{_datadir}/zsh/site-functions/_%{name}-remote
 
 %files tests
-%license LICENSE
 %{_datadir}/%{name}/test
 
 %files plugins
@@ -391,18 +358,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
 %dir %{_libexecdir}/cni
 %{_libexecdir}/cni/dnsname
 
-%if %{defined gvproxy_subpackage}
-%files gvproxy
-%license %{repo_gvproxy}-%{commit_gvproxy}/LICENSE
-%doc %{repo_gvproxy}-%{commit_gvproxy}/README.md
-%dir %{_libexecdir}/%{name}
-%{_libexecdir}/%{name}/gvproxy
-%{_libexecdir}/%{name}/gvforwarder
-%endif
-
 %files -n %{name}sh
-%license LICENSE
-%doc README.md CONTRIBUTING.md install.md transfer.md
 %{_bindir}/%{name}sh
 
 %changelog

sources

@@ -1,3 +1,2 @@
-SHA512 (v4.6.0.tar.gz) = a0f045e3275f072abcf2e59636527f1b98b7579d7b64df37cbabbf1f9d2cb3852a95240f6145ccd81d4b31da0175003ab0043d269c75f9dfb31586065554c986
+SHA512 (v4.9.5.tar.gz) = 979f855d453034bb053d2cad52dd6b9050ff1a534efebf2c8967dd38c7df9139a2b546caf3d20f76fe130189233ded5e6354e2e68b1ef7bae2617f35b0f4ad4d
 SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8
-SHA512 (gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz) = 8b9e687c8be7063641839b5764787ae82561635ae6410585a3c70552bed741e6a63154f55d0209a6408861d5ee76619a765e70b2deda37d38802f6e5b57f2a4c

tests/roles/run_bats_tests/files/run_bats_tests.sh

@@ -27,7 +27,7 @@ exec &> >(tee -a $FULL_LOG)
 echo "Packages:"
 echo "  Kernel: $(uname -r)"
 rpm -qa |\
-    egrep 'podman|conmon|containers-common|crun|runc|iptable|slirp|aardvark|netavark|containernetworking-plugins|systemd|container-selinux' |\
+    grep -E 'toolbox|podman|conmon|containers-common|crun|runc|iptable|slirp|aardvark|netavark|containernetworking-plugins|systemd|container-selinux|passt' |\
     sort |\
     sed -e 's/^/  /'
 

tests/test_podman.yml

@@ -43,8 +43,8 @@
   - name: test podman-remote
     include_tasks: test_podman_remote.yml
 
-  - name: test toolbox
-    include_tasks: test_toolbox.yml
+  - name: test toolbx
+    include_tasks: test_toolbx.yml
 
   # Postprocessing: check for FAIL or ERROR in any test, exit 1 if so
   - name: check results

tests/test_toolbx.yml

@@ -3,8 +3,9 @@
     name: run_bats_tests
   vars:
     tests:
-    - name: toolbox
+    - name: toolbx
       package: toolbox
       become: true
       environment:
+        TMPDIR: /var/tmp
         XDG_RUNTIME_DIR: /run/user/{{ rootless_uid }}