From 261067f5cd7ff6a7f71551e8f9a7c7ea66047276 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 16 Feb 2024 16:46:16 +0000 Subject: [PATCH 01/41] [packit] 5.0.0-rc2 upstream release Upstream tag: v5.0.0-rc2 Upstream commit: f620aa0f --- .gitignore | 1 + README.packit | 2 +- podman.spec | 5 +++-- sources | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1039674..6d78021 100644 --- a/.gitignore +++ b/.gitignore @@ -1847,3 +1847,4 @@ /v4.9.1.tar.gz /v4.9.2.tar.gz /v5.0.0-rc1.tar.gz +/v5.0.0-rc2.tar.gz diff --git a/README.packit b/README.packit index 29cc7d8..f592284 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.90.0.post1.dev9+g1f0325d1. +The file was generated using packit 0.91.0.post1.dev4+ge6fd4a25. diff --git a/podman.spec b/podman.spec index 68b810f..e68bd1f 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,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: 5.0.0~rc1 +Version: 5.0.0~rc2 # 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 @@ -248,7 +248,7 @@ LDFLAGS='' %install install -dp %{buildroot}%{_unitdir} -PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{_sysconfdir} \ +PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDIR=%{_sysconfdir} \ install.bin \ install.man \ install.systemd \ @@ -300,6 +300,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %files docker %{_bindir}/docker %{_mandir}/man1/docker*.1* +%{_sysconfdir}/profile.d/%{name}-docker.* %{_tmpfilesdir}/%{name}-docker.conf %{_user_tmpfilesdir}/%{name}-docker.conf diff --git a/sources b/sources index 8937017..49d7659 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.0.0-rc1.tar.gz) = 95452d5489b167cff24620b5a7504e1363d8276cf4e7c026d43ea2e9b24dde1c595b6e763a1065087d876e5ad56e62f7cda6e53838abdeac7eeb3deadcfd88ae +SHA512 (v5.0.0-rc2.tar.gz) = 7680ad4f7e7e61068fdbf746ec42cb8e53b0150d8ee5fc7e996eaa8873df41d6426b00c05dd666e609e2187d8d44950ecce7b2999916a6607e11078244483017 From a39a897583fab603208550f383556683b3505c96 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 22 Feb 2024 21:07:43 +0000 Subject: [PATCH 02/41] [packit] 5.0.0-rc3 upstream release Upstream tag: v5.0.0-rc3 Upstream commit: 54795efe --- .gitignore | 1 + .packit.yaml | 11 +++++------ README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 6d78021..5bee72e 100644 --- a/.gitignore +++ b/.gitignore @@ -1848,3 +1848,4 @@ /v4.9.2.tar.gz /v5.0.0-rc1.tar.gz /v5.0.0-rc2.tar.gz +/v5.0.0-rc3.tar.gz diff --git a/.packit.yaml b/.packit.yaml index afcebd1..45d14a0 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -72,10 +72,9 @@ jobs: - job: koji_build trigger: commit dist_git_branches: - - fedora-development + - fedora-all - # TODO: Revisit once fedora 40 is branched and manual bodhi is enabled - #- job: bodhi_update - #trigger: commit - #dist_git_branches: - #- fedora-40 # rawhide updates are created automatically + - job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-branched # rawhide updates are created automatically diff --git a/README.packit b/README.packit index f592284..7553f6b 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.91.0.post1.dev4+ge6fd4a25. +The file was generated using packit 0.92.0. diff --git a/podman.spec b/podman.spec index e68bd1f..9f25660 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,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: 5.0.0~rc2 +Version: 5.0.0~rc3 # 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 diff --git a/sources b/sources index 49d7659..bac6a1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.0.0-rc2.tar.gz) = 7680ad4f7e7e61068fdbf746ec42cb8e53b0150d8ee5fc7e996eaa8873df41d6426b00c05dd666e609e2187d8d44950ecce7b2999916a6607e11078244483017 +SHA512 (v5.0.0-rc3.tar.gz) = d61e69bc98d7286b896ec9cb9ef4b9b2aec16637172aa1d11a25a6f6665d69eddb600534a5c4daf12d5ed622f20fdd05d7eb86ab67a5d08ac20205aebb427153 From d5ceaea2061255e91c7a18634b325d983d4c56b7 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 13 Feb 2024 22:40:59 +0100 Subject: [PATCH 03/41] Update how Toolbx is spelt This is meant to make the project more searchable on the Internet. More and more people have been pointing out that "toolbox" is terribly difficult to search for, and it's impossible to find any decent Internet real estate by that name. Some exceptions: * The code repository is still https://github.com/containers/toolbox. It will be renamed after giving a heads-up to other contributors. * The name of the binary is still 'toolbox'. The name is embedded into existing Toolbx containers as their entry point, which is bind mounted from the host operating system when the containers are started. Trivially renaming the binary will prevent these containers from starting. * The name of the Fedora package is still 'toolbox'. https://src.fedoraproject.org/rpms/podman/pull-request/134 https://src.fedoraproject.org/rpms/podman/pull-request/122 (cherry picked from commit 7bff8d08f668797fa44881a1bc65632c18bdeb94) --- tests/test_podman.yml | 4 ++-- tests/{test_toolbox.yml => test_toolbx.yml} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename tests/{test_toolbox.yml => test_toolbx.yml} (89%) diff --git a/tests/test_podman.yml b/tests/test_podman.yml index e5c82a1..d471630 100644 --- a/tests/test_podman.yml +++ b/tests/test_podman.yml @@ -31,8 +31,8 @@ loop_control: loop_var: podman_bin - - 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 diff --git a/tests/test_toolbox.yml b/tests/test_toolbx.yml similarity index 89% rename from tests/test_toolbox.yml rename to tests/test_toolbx.yml index 9b0859c..a7470c5 100644 --- a/tests/test_toolbox.yml +++ b/tests/test_toolbx.yml @@ -3,7 +3,7 @@ name: run_bats_tests vars: tests: - - name: toolbox + - name: toolbx package: toolbox become: true environment: From 864ae2707f8871b3bb073f088885efd9281a6ecf Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 15 Feb 2024 15:04:49 +0100 Subject: [PATCH 04/41] Silence warnings about deprecated grep(1) use in test logs The egrep command was deprecated in 2007 as part of Grep 2.5.3, and since Grep 3.8 it actually warns about it [1]. The warning shows up in the test logs as: egrep: warning: egrep is obsolescent; using grep -E [1] Grep commit a9515624709865d4 https://git.savannah.gnu.org/cgit/grep.git/commit/?id=a9515624709865d4 https://src.fedoraproject.org/rpms/podman/pull-request/134 https://src.fedoraproject.org/rpms/podman/pull-request/125 (cherry picked from commit 89acf13e05c727b0b001cc3a4cf4a2887135e89c) --- tests/roles/run_bats_tests/files/run_bats_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/roles/run_bats_tests/files/run_bats_tests.sh b/tests/roles/run_bats_tests/files/run_bats_tests.sh index 90884cb..bddd851 100755 --- a/tests/roles/run_bats_tests/files/run_bats_tests.sh +++ b/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|passt' |\ + grep -E 'podman|conmon|containers-common|crun|runc|iptable|slirp|aardvark|netavark|containernetworking-plugins|systemd|container-selinux|passt' |\ sort |\ sed -e 's/^/ /' From c616ef65810090a49b311badeccd67b9c0c473e9 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 19 Feb 2024 20:32:59 +0100 Subject: [PATCH 05/41] Avoid running out of storage space when running the Toolbx tests Toolbx's system tests download several images when setting up the test suite, and cache them for later use by the tests [1]. This saves time and avoids hitting rate limits imposed by OCI registries by not downloading the same images repeatedly for several tests, but at the cost of increased use of storage space to cache the images. The images are cached under BATS_TMPDIR. It defaults to the TMPDIR environment variable, and if that's not set then to /tmp [2]. Normally, TMPDIR isn't set, and the images end up getting cached under /tmp. Now, /tmp is typically on tmpfs backed by RAM or swap, which means that it should be used for smaller size-bounded files only, and /var/tmp should be used for everything else [3]. The images are big enough that a collection of them can't be described as smaller and size-bounded, and it led to: 1..306 # test suite: Set up # test suite: Tear down not ok 1 setup_suite # (from function `setup_suite' in test file ./setup_suite.bash, line 55) # `_pull_and_cache_distro_image fedora "$((system_version-1))" || false' failed # Failed to cache image registry.fedoraproject.org/fedora-toolbox:40 to /tmp/bats-run-IPz4Cn/image-cache/fedora-toolbox-40 # time="2024-02-19T11:41:43Z" level=fatal msg="copying system image from manifest list: writing blob: write /tmp/bats-run-IPz4Cn/image-cache/fedora-toolbox-40/dir-put-blob607392514: no space left on device" # bats warning: Executed 1 instead of expected 306 tests So, change the default location of the BATS_TMPDIR environment variable to /var/tmp by setting TMPDIR. [1] Toolbx commit 50683c9d9a78adc9 https://github.com/containers/toolbox/commit/50683c9d9a78adc9 https://github.com/containers/toolbox/pull/375 [2] https://bats-core.readthedocs.io/en/stable/writing-tests.html [3] https://systemd.io/TEMPORARY_DIRECTORIES/ https://src.fedoraproject.org/rpms/podman/pull-request/134 https://src.fedoraproject.org/rpms/podman/pull-request/128 (cherry picked from commit c2712c6a6b64069dbc00c991fd1688e75305f6c5) --- tests/test_toolbx.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_toolbx.yml b/tests/test_toolbx.yml index a7470c5..58494f4 100644 --- a/tests/test_toolbx.yml +++ b/tests/test_toolbx.yml @@ -7,4 +7,5 @@ package: toolbox become: true environment: + TMPDIR: /var/tmp XDG_RUNTIME_DIR: /run/user/{{ rootless_uid }} From 46b5dceb08259315ac447efaa0ef7f105a6791da Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Feb 2024 14:17:38 +0100 Subject: [PATCH 06/41] Show the toolbox RPMs used to run the tests This will make it easier to debug test failures by confirming if they are caused by old buggy toolbox RPMs or if the fixes don't work as intended. https://src.fedoraproject.org/rpms/podman/pull-request/134 https://src.fedoraproject.org/rpms/podman/pull-request/133 (cherry picked from commit 5a89a8566598871e6684dd5b5e4dd09bda84ea01) --- tests/roles/run_bats_tests/files/run_bats_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/roles/run_bats_tests/files/run_bats_tests.sh b/tests/roles/run_bats_tests/files/run_bats_tests.sh index bddd851..f1df29d 100755 --- a/tests/roles/run_bats_tests/files/run_bats_tests.sh +++ b/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 |\ - grep -E 'podman|conmon|containers-common|crun|runc|iptable|slirp|aardvark|netavark|containernetworking-plugins|systemd|container-selinux|passt' |\ + grep -E 'toolbox|podman|conmon|containers-common|crun|runc|iptable|slirp|aardvark|netavark|containernetworking-plugins|systemd|container-selinux|passt' |\ sort |\ sed -e 's/^/ /' From 81be0854d269f53d5e273760404605062714e285 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 5 Mar 2024 10:42:03 +0000 Subject: [PATCH 07/41] [packit] 5.0.0-rc4 upstream release Upstream tag: v5.0.0-rc4 Upstream commit: cfc5b8e0 --- .gitignore | 1 + README.packit | 2 +- podman.spec | 6 +++--- sources | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5bee72e..603d0c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1849,3 +1849,4 @@ /v5.0.0-rc1.tar.gz /v5.0.0-rc2.tar.gz /v5.0.0-rc3.tar.gz +/v5.0.0-rc4.tar.gz diff --git a/README.packit b/README.packit index 7553f6b..58aeb5d 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.92.0. +The file was generated using packit 0.93.0.post1.dev3+ge6195b47. diff --git a/podman.spec b/podman.spec index 9f25660..fe2c896 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,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: 5.0.0~rc3 +Version: 5.0.0~rc4 # 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 @@ -81,7 +81,7 @@ BuildRequires: glibc-devel BuildRequires: glibc-static BuildRequires: golang BuildRequires: git-core -%if !%{defined gobuild} +%if %{undefined rhel} || 0%{?rhel} >= 10 BuildRequires: go-rpm-macros %endif BuildRequires: gpgme-devel @@ -219,7 +219,7 @@ export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full" export GOPROXY=direct -LDFLAGS="-X %{ld_libpod}/define.buildInfo=$(date +%s) \ +LDFLAGS="-X %{ld_libpod}/define.buildInfo=${SOURCE_DATE_EPOCH:-$(date +%s)} \ -X %{ld_libpod}/config._installPrefix=%{_prefix} \ -X %{ld_libpod}/config._etcDir=%{_sysconfdir} \ -X %{ld_project}/pkg/systemd/quadlet._binDir=%{_bindir}" diff --git a/sources b/sources index bac6a1e..3a6575c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.0.0-rc3.tar.gz) = d61e69bc98d7286b896ec9cb9ef4b9b2aec16637172aa1d11a25a6f6665d69eddb600534a5c4daf12d5ed622f20fdd05d7eb86ab67a5d08ac20205aebb427153 +SHA512 (v5.0.0-rc4.tar.gz) = 034b411dfde2e3219b9bbdf5c966f474c9ed1a48a83793494abd0f74d164617f1321c2723384eb43827813faaf5737b378893c1555816badcbd1c81904349944 From a433181a4ba344e672c06526c38788e48a33ce65 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 8 Mar 2024 02:48:49 +0000 Subject: [PATCH 08/41] [packit] 5.0.0-rc5 upstream release Upstream tag: v5.0.0-rc5 Upstream commit: bbad09bb --- .gitignore | 1 + podman.spec | 7 ++++--- sources | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 603d0c5..e2b93fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1850,3 +1850,4 @@ /v5.0.0-rc2.tar.gz /v5.0.0-rc3.tar.gz /v5.0.0-rc4.tar.gz +/v5.0.0-rc5.tar.gz diff --git a/podman.spec b/podman.spec index fe2c896..33fcd7d 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,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: 5.0.0~rc4 +Version: 5.0.0~rc5 # 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 @@ -263,8 +263,8 @@ PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDI sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker # 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 +for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},," | grep -v -e %{name}sh.1 -e remote -e docker`; do + echo "$file*" >> %{name}.file-list done rm -f %{buildroot}%{_mandir}/man5/docker*.5 @@ -319,6 +319,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %files -n %{name}sh %{_bindir}/%{name}sh +%{_mandir}/man1/%{name}sh.1* %changelog %if %{defined autochangelog} diff --git a/sources b/sources index 3a6575c..6c4085c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.0.0-rc4.tar.gz) = 034b411dfde2e3219b9bbdf5c966f474c9ed1a48a83793494abd0f74d164617f1321c2723384eb43827813faaf5737b378893c1555816badcbd1c81904349944 +SHA512 (v5.0.0-rc5.tar.gz) = a3ccd6eb53d66297be30ec66efa0a5fa5f5050a647c6bc5cdb2fd4cd9dd5638c42328bf1429a2fa3f8dcc84bb7d1ffbdd9c6bf06862993277f5b60d740d91c1b From 480d655ed9d128caebec9018a9ca229713a18491 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 11 Mar 2024 19:05:20 +0000 Subject: [PATCH 09/41] [packit] 5.0.0-rc6 upstream release Upstream tag: v5.0.0-rc6 Upstream commit: d26113ca --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e2b93fa..7121a47 100644 --- a/.gitignore +++ b/.gitignore @@ -1851,3 +1851,4 @@ /v5.0.0-rc3.tar.gz /v5.0.0-rc4.tar.gz /v5.0.0-rc5.tar.gz +/v5.0.0-rc6.tar.gz diff --git a/README.packit b/README.packit index 58aeb5d..38c0a99 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.93.0.post1.dev3+ge6195b47. +The file was generated using packit 0.93.0.post1.dev5+g0048024e. diff --git a/podman.spec b/podman.spec index 33fcd7d..ade996a 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,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: 5.0.0~rc5 +Version: 5.0.0~rc6 # 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 diff --git a/sources b/sources index 6c4085c..ae872cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.0.0-rc5.tar.gz) = a3ccd6eb53d66297be30ec66efa0a5fa5f5050a647c6bc5cdb2fd4cd9dd5638c42328bf1429a2fa3f8dcc84bb7d1ffbdd9c6bf06862993277f5b60d740d91c1b +SHA512 (v5.0.0-rc6.tar.gz) = 6f2ddac9de6f949e1d89ccefebd755b750af6eedc438a78352a7b934408a6f09eb83727a027cb91276c46bb6f11dfb4bcbaf2417b0b805197ea9dd385fd7680b From 495a0374897325d2d4542105e76475519202c326 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 13 Mar 2024 17:43:31 +0530 Subject: [PATCH 10/41] Resolves: #2269148 - make passt a hard dep Signed-off-by: Lokesh Mandvekar (cherry picked from commit c837778125f8316432d67821b7c5f26d66a9433f) --- podman.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/podman.spec b/podman.spec index ade996a..fed5fbe 100644 --- a/podman.spec +++ b/podman.spec @@ -101,7 +101,14 @@ BuildRequires: python3 %endif Requires: catatonit Requires: conmon >= 2:2.1.7-2 +%if %{defined fedora} && 0%{?fedora} >= 40 +# TODO: Remove the f40 conditional after a few releases to keep conditionals to +# a minimum +# Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2269148 +Requires: containers-common-extra >= 5:0.58.0-1 +%else Requires: containers-common-extra +%endif %if %{defined rhel} && !%{defined eln} Recommends: gvisor-tap-vsock-gvforwarder %else From 43df44e272174838ffce48dedb0b690cf2068e7e Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 15 Mar 2024 13:25:29 +0000 Subject: [PATCH 11/41] [packit] 5.0.0-rc7 upstream release Upstream tag: v5.0.0-rc7 Upstream commit: f8888a13 --- .gitignore | 1 + podman.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7121a47..b98cf3d 100644 --- a/.gitignore +++ b/.gitignore @@ -1852,3 +1852,4 @@ /v5.0.0-rc4.tar.gz /v5.0.0-rc5.tar.gz /v5.0.0-rc6.tar.gz +/v5.0.0-rc7.tar.gz diff --git a/podman.spec b/podman.spec index fed5fbe..d666ad9 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,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: 5.0.0~rc6 +Version: 5.0.0~rc7 # 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 diff --git a/sources b/sources index ae872cd..591ba8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.0.0-rc6.tar.gz) = 6f2ddac9de6f949e1d89ccefebd755b750af6eedc438a78352a7b934408a6f09eb83727a027cb91276c46bb6f11dfb4bcbaf2417b0b805197ea9dd385fd7680b +SHA512 (v5.0.0-rc7.tar.gz) = ce66a6a061511bcb1e2e0044dbae50a421719974bc1126cc54c725d2d72282718e7cea8a5e0013b5e10b6d3ea9efb3d84716b4906312ed0190d6e5036dcd4f97 From 7b00c4e46fc0ddf29e17e44761c63e323b7009ee Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 19 Mar 2024 17:26:37 +0000 Subject: [PATCH 12/41] [packit] 5.0.0 upstream release Upstream tag: v5.0.0 Upstream commit: e71ec6f1 --- .gitignore | 1 + README.packit | 2 +- podman.spec | 4 ++-- sources | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b98cf3d..0ee1a15 100644 --- a/.gitignore +++ b/.gitignore @@ -1853,3 +1853,4 @@ /v5.0.0-rc5.tar.gz /v5.0.0-rc6.tar.gz /v5.0.0-rc7.tar.gz +/v5.0.0.tar.gz diff --git a/README.packit b/README.packit index 38c0a99..4afa99b 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.93.0.post1.dev5+g0048024e. +The file was generated using packit 0.94.0.post1.dev2+g7ce7e679. diff --git a/podman.spec b/podman.spec index d666ad9..0e54c62 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,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: 5.0.0~rc7 +Version: 5.0.0 # 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 @@ -283,7 +283,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{!?_licensedir:%global license %doc} %files -f %{name}.file-list -%license LICENSE +%license LICENSE vendor/modules.txt %doc README.md CONTRIBUTING.md install.md transfer.md %{_bindir}/%{name} %dir %{_libexecdir}/%{name} diff --git a/sources b/sources index 591ba8e..55e702b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.0.0-rc7.tar.gz) = ce66a6a061511bcb1e2e0044dbae50a421719974bc1126cc54c725d2d72282718e7cea8a5e0013b5e10b6d3ea9efb3d84716b4906312ed0190d6e5036dcd4f97 +SHA512 (v5.0.0.tar.gz) = 8800d96d668cbc7a7ff85a09c71b3307a280c124513fd02fe478f415cf8db43ee47dc7e9c3b75046c6bda9f916937a2cc59887c2c4b26766c2f770abb87fd7ce From b15c24aa870c7d245b3c57df5b238e610b28bc04 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 26 Mar 2024 09:31:14 -0600 Subject: [PATCH 13/41] Podman tests: force-install slirp4netns As of podman 5.0, slirp4 is no longer an RPM Requirement. It is not deprecated, though, so we should continue to test it. Signed-off-by: Ed Santiago (cherry picked from commit 9667d0f5b5069acb4f7d3faa158a2ea9255a9302) --- tests/run_podman_tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/run_podman_tests.yml b/tests/run_podman_tests.yml index de7ddff..bfabdee 100644 --- a/tests/run_podman_tests.yml +++ b/tests/run_podman_tests.yml @@ -3,6 +3,11 @@ dnf: name="podman-remote" state=installed when: podman_bin == "podman-remote" +# As of podman 5.0, slirp is a soft dependency. Until/unless it is +# actually deprecated, we continue to test with it. +- name: "slirp4netns | install" + dnf: name="slirp4netns" state=installed + - include_role: name: run_bats_tests vars: From c838401773b5b87088a3e76b7d54462f41d0e781 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 1 Apr 2024 14:07:30 +0000 Subject: [PATCH 14/41] [packit] 5.0.1 upstream release Upstream tag: v5.0.1 Upstream commit: 946d055d --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0ee1a15..d945ecd 100644 --- a/.gitignore +++ b/.gitignore @@ -1854,3 +1854,4 @@ /v5.0.0-rc6.tar.gz /v5.0.0-rc7.tar.gz /v5.0.0.tar.gz +/v5.0.1.tar.gz diff --git a/README.packit b/README.packit index 4afa99b..d401b46 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.94.0.post1.dev2+g7ce7e679. +The file was generated using packit 0.94.0.post1.dev8+g4b1f9717. diff --git a/podman.spec b/podman.spec index 0e54c62..b1591c2 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,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: 5.0.0 +Version: 5.0.1 # 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 diff --git a/sources b/sources index 55e702b..9eb6dd8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.0.0.tar.gz) = 8800d96d668cbc7a7ff85a09c71b3307a280c124513fd02fe478f415cf8db43ee47dc7e9c3b75046c6bda9f916937a2cc59887c2c4b26766c2f770abb87fd7ce +SHA512 (v5.0.1.tar.gz) = 4ab64beea9b23839caa35bf8ec0f097ed16b4d2f448ce16039bb55672ac8b1d8d8cadf86c21eb32dc2c1d30dabb5b57a141823aa5fc3f14f09741f76cffa6023 From 3900c84dda4c996016d93b6445e758ff8df3b704 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 17 Apr 2024 19:14:49 +0000 Subject: [PATCH 15/41] Update to 5.0.2 upstream release Upstream tag: v5.0.2 Upstream commit: 3304dd95 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 33 ++++++++++++++++++++++++++++++++- README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 5 files changed, 36 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d945ecd..6aed7ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1855,3 +1855,4 @@ /v5.0.0-rc7.tar.gz /v5.0.0.tar.gz /v5.0.1.tar.gz +/v5.0.2.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 45d14a0..83a5d0e 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -2,9 +2,17 @@ # See the documentation for more information: # https://packit.dev/docs/configuration/ -specfile_path: rpm/podman.spec +downstream_package_name: podman upstream_tag_template: v{version} +packages: + podman-fedora: + pkg_tool: fedpkg + specfile_path: rpm/podman.spec + podman-centos: + pkg_tool: centpkg + specfile_path: rpm/podman.spec + srpm_build_deps: - git-archive-all - make @@ -16,6 +24,7 @@ actions: jobs: - job: copr_build trigger: pull_request + packages: [podman-fedora] notifications: failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." @@ -25,6 +34,17 @@ jobs: - fedora-all-aarch64 - fedora-eln-x86_64 - fedora-eln-aarch64 + additional_repos: + - "copr://rhcontainerbot/podman-next" + + - job: copr_build + trigger: pull_request + packages: [podman-centos] + notifications: + failure_comment: + message: "Ephemeral COPR build failed. @containers/packit-build please check." + enable_net: true + targets: - centos-stream+epel-next-8-x86_64 - centos-stream+epel-next-8-aarch64 - centos-stream+epel-next-9-x86_64 @@ -46,6 +66,7 @@ jobs: - job: tests identifier: cockpit-revdeps trigger: pull_request + packages: [podman-fedora] notifications: failure_comment: message: "Cockpit tests failed for commit {commit_sha}. @martinpitt, @jelly, @mvollmer please check." @@ -66,15 +87,25 @@ jobs: - job: propose_downstream trigger: release update_release: false + packages: [podman-fedora] dist_git_branches: - fedora-development # Implies fedora-rawhide and any branched but unreleased version, will include f40 before f40 is marked stable. + - job: propose_downstream + trigger: release + update_release: false + packages: [podman-centos] + dist_git_branches: + - c10s + - job: koji_build trigger: commit + packages: [podman-fedora] dist_git_branches: - fedora-all - job: bodhi_update trigger: commit + packages: [podman-fedora] dist_git_branches: - fedora-branched # rawhide updates are created automatically diff --git a/README.packit b/README.packit index d401b46..60cc823 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.94.0.post1.dev8+g4b1f9717. +The file was generated using packit 0.94.2. diff --git a/podman.spec b/podman.spec index b1591c2..2c02a7e 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,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: 5.0.1 +Version: 5.0.2 # 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 diff --git a/sources b/sources index 9eb6dd8..9b50362 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.0.1.tar.gz) = 4ab64beea9b23839caa35bf8ec0f097ed16b4d2f448ce16039bb55672ac8b1d8d8cadf86c21eb32dc2c1d30dabb5b57a141823aa5fc3f14f09741f76cffa6023 +SHA512 (v5.0.2.tar.gz) = 70dbac9fc81d66eb9b0a5174f5776b805397005cacca917674d2b001591fadd05a776c956e693bad932e9eefe591c35da5c566e8e9e01db8be42bc454cd03104 From 767fe1e4550aa8ff057a77c57e867f88c7eeecf2 Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 10 May 2024 17:58:47 +0000 Subject: [PATCH 16/41] Update to 5.0.3 upstream release Upstream tag: v5.0.3 Upstream commit: d08315df Commit authored by Packit automation (https://packit.dev/) (cherry picked from commit 2a0a1fc671fb9f724640e5cd967880c0ec706cda) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 4 +--- sources | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6aed7ed..9f4f8b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1856,3 +1856,4 @@ /v5.0.0.tar.gz /v5.0.1.tar.gz /v5.0.2.tar.gz +/v5.0.3.tar.gz diff --git a/README.packit b/README.packit index 60cc823..97de583 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.94.2. +The file was generated using packit 0.96.0.post1.dev4+gc5b1ea8e. diff --git a/podman.spec b/podman.spec index 2c02a7e..5c76509 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,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: 5.0.2 +Version: 5.0.3 # 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 @@ -131,8 +131,6 @@ additional privileges. Both tools share image (not container) storage, hence each can use or manipulate images (but not containers) created by the other. -%{summary} -%{repo} Simple management tool for pods, containers and images %package docker Summary: Emulate Docker CLI using %{name} diff --git a/sources b/sources index 9b50362..376dbf4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.0.2.tar.gz) = 70dbac9fc81d66eb9b0a5174f5776b805397005cacca917674d2b001591fadd05a776c956e693bad932e9eefe591c35da5c566e8e9e01db8be42bc454cd03104 +SHA512 (v5.0.3.tar.gz) = c605a52cc5aba43d485796c4986f2d1be704e5c931473bf5ba1cf77f703cdb3d16f41d33da0b25287e8d001077f77caf117d3ea5dbd7c56a744274025d9ab07d From cb4b5fa9f90962076ba6656212e471b59cc10feb Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 16 May 2024 12:43:43 +0000 Subject: [PATCH 17/41] Update to 5.1.0-rc1 upstream release Upstream tag: v5.1.0-rc1 Upstream commit: 6a8f2e7f Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 12 +++++++----- podman.spec | 12 +++--------- sources | 2 +- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 9f4f8b4..cf8488f 100644 --- a/.gitignore +++ b/.gitignore @@ -1857,3 +1857,4 @@ /v5.0.1.tar.gz /v5.0.2.tar.gz /v5.0.3.tar.gz +/v5.1.0-rc1.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 83a5d0e..0d3eaca 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -45,16 +45,17 @@ jobs: message: "Ephemeral COPR build failed. @containers/packit-build please check." enable_net: true targets: - - 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 + - epel-9-x86_64 + - epel-9-aarch64 + - centos-stream-10-x86_64 + - centos-stream-10-aarch64 additional_repos: - "copr://rhcontainerbot/podman-next" # Run on commit to main branch - job: copr_build trigger: commit + packages: [podman-fedora] notifications: failure_comment: message: "podman-next COPR build failed. @containers/packit-build please check." @@ -89,7 +90,8 @@ jobs: update_release: false packages: [podman-fedora] dist_git_branches: - - fedora-development # Implies fedora-rawhide and any branched but unreleased version, will include f40 before f40 is marked stable. + - fedora-development + - fedora-latest - job: propose_downstream trigger: release diff --git a/podman.spec b/podman.spec index 5c76509..f65faec 100644 --- a/podman.spec +++ b/podman.spec @@ -11,13 +11,8 @@ # 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 @@ -57,7 +52,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: 5.0.3 +Version: 5.1.0~rc1 # 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 @@ -96,9 +91,6 @@ BuildRequires: man-db BuildRequires: ostree-devel BuildRequires: systemd BuildRequires: systemd-devel -%if %{defined rhel8py3} -BuildRequires: python3 -%endif Requires: catatonit Requires: conmon >= 2:2.1.7-2 %if %{defined fedora} && 0%{?fedora} >= 40 @@ -151,7 +143,9 @@ pages and %{name}. Summary: Tests for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} +%if %{defined fedora} Requires: bats +%endif Requires: jq Requires: skopeo Requires: nmap-ncat diff --git a/sources b/sources index 376dbf4..3292c39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.0.3.tar.gz) = c605a52cc5aba43d485796c4986f2d1be704e5c931473bf5ba1cf77f703cdb3d16f41d33da0b25287e8d001077f77caf117d3ea5dbd7c56a744274025d9ab07d +SHA512 (v5.1.0-rc1.tar.gz) = ff864dc7a63a1604fc65a597e31d1bb9dffe3206a231b39cf6783cd0df41a1db4987e8bffbc664b66b483a966f45b807fed635ad3850e005f53f061e0805e906 From 71ec61cee5e2ccad24f4d399d10f9a1e9955249d Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 29 May 2024 20:27:17 +0000 Subject: [PATCH 18/41] Update to 5.1.0 upstream release Upstream tag: v5.1.0 Upstream commit: 4e9486db Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cf8488f..4a24c71 100644 --- a/.gitignore +++ b/.gitignore @@ -1858,3 +1858,4 @@ /v5.0.2.tar.gz /v5.0.3.tar.gz /v5.1.0-rc1.tar.gz +/v5.1.0.tar.gz diff --git a/README.packit b/README.packit index 97de583..2fa216c 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.96.0.post1.dev4+gc5b1ea8e. +The file was generated using packit 0.97.1.post1.dev4+g1268842e. diff --git a/podman.spec b/podman.spec index f65faec..a07ea0c 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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: 5.1.0~rc1 +Version: 5.1.0 # 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 diff --git a/sources b/sources index 3292c39..3eeb0b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.1.0-rc1.tar.gz) = ff864dc7a63a1604fc65a597e31d1bb9dffe3206a231b39cf6783cd0df41a1db4987e8bffbc664b66b483a966f45b807fed635ad3850e005f53f061e0805e906 +SHA512 (v5.1.0.tar.gz) = 0cd6b5c8031c2e8e3fdd88f97c8f08881ef08cc6401d52c973730c6b5c9e3084e124394115ad016055527e70df0bc5d916ae77ab6c6bcd0c7689a0ba9de663a4 From 4542276b9bfad6ebf24616f6039627c34c69b1aa Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 4 Jun 2024 21:13:40 +0000 Subject: [PATCH 19/41] Update to 5.1.1 upstream release Upstream tag: v5.1.1 Upstream commit: bda6eb03 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4a24c71..6693875 100644 --- a/.gitignore +++ b/.gitignore @@ -1859,3 +1859,4 @@ /v5.0.3.tar.gz /v5.1.0-rc1.tar.gz /v5.1.0.tar.gz +/v5.1.1.tar.gz diff --git a/README.packit b/README.packit index 2fa216c..d2b528d 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.97.1.post1.dev4+g1268842e. +The file was generated using packit 0.97.1.post1.dev6+gc8c0314a. diff --git a/podman.spec b/podman.spec index a07ea0c..f417547 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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: 5.1.0 +Version: 5.1.1 # 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 diff --git a/sources b/sources index 3eeb0b0..078ea8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.1.0.tar.gz) = 0cd6b5c8031c2e8e3fdd88f97c8f08881ef08cc6401d52c973730c6b5c9e3084e124394115ad016055527e70df0bc5d916ae77ab6c6bcd0c7689a0ba9de663a4 +SHA512 (v5.1.1.tar.gz) = e896ee97980da4a522eb865d2eacb6876dd8bc5be1488aed8bd81a81af95faa1383b176b5d236d4af0f76bc30ddad5230df3e11c59ffc6f86e5b4cf3876ff184 From 0d410b9752822dc6a7e0cefe0ef34884ca80a3de Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 10 Jul 2024 14:56:54 +0000 Subject: [PATCH 20/41] Update to 5.1.2 upstream release Upstream tag: v5.1.2 Upstream commit: 94a24974 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6693875..0888d2a 100644 --- a/.gitignore +++ b/.gitignore @@ -1860,3 +1860,4 @@ /v5.1.0-rc1.tar.gz /v5.1.0.tar.gz /v5.1.1.tar.gz +/v5.1.2.tar.gz diff --git a/README.packit b/README.packit index d2b528d..2499381 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.97.1.post1.dev6+gc8c0314a. +The file was generated using packit 0.98.0. diff --git a/podman.spec b/podman.spec index f417547..02d3702 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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: 5.1.1 +Version: 5.1.2 # 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 diff --git a/sources b/sources index 078ea8e..8cf705e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.1.1.tar.gz) = e896ee97980da4a522eb865d2eacb6876dd8bc5be1488aed8bd81a81af95faa1383b176b5d236d4af0f76bc30ddad5230df3e11c59ffc6f86e5b4cf3876ff184 +SHA512 (v5.1.2.tar.gz) = adfd4dc5a1f7e1887ca5ffc0c6ec4593f051566010c3cc7050294fd50d2cab3d0257ff6ea4cc1abd2ba8b12adcfe0310446ac66bfc2280d9a9597294ecbcd474 From 6f11ee553feedb5635bbb51a18d8efd3deb1e789 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 16 Jul 2024 13:40:34 -0400 Subject: [PATCH 21/41] Add PODMAN_TESTING var (cherry picked from commit 1ed846a4ae6c5daea33d47caf720dfcaf531db88) --- tests/run_podman_tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/run_podman_tests.yml b/tests/run_podman_tests.yml index bfabdee..63e08e6 100644 --- a/tests/run_podman_tests.yml +++ b/tests/run_podman_tests.yml @@ -18,10 +18,12 @@ package: podman environment: PODMAN: /usr/bin/{{ podman_bin }} + PODMAN_TESTING: /usr/bin/{{ podman_bin }}-testing QUADLET: /usr/libexec/podman/quadlet - name: "{{ podman_bin }} rootless" package: podman environment: PODMAN: /usr/bin/{{ podman_bin }} + PODMAN_TESTING: /usr/bin/{{ podman_bin }}-testing QUADLET: /usr/libexec/podman/quadlet become: true From d2272dd1863bb326c9643aae0d1624fe040b7a96 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 17 Jul 2024 08:29:58 -0400 Subject: [PATCH 22/41] fix podman-testing binary (cherry picked from commit f605ca3f0cd48f006dc5889258a8561479058e1f) --- tests/run_podman_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/run_podman_tests.yml b/tests/run_podman_tests.yml index 63e08e6..06b2525 100644 --- a/tests/run_podman_tests.yml +++ b/tests/run_podman_tests.yml @@ -18,12 +18,12 @@ package: podman environment: PODMAN: /usr/bin/{{ podman_bin }} - PODMAN_TESTING: /usr/bin/{{ podman_bin }}-testing + PODMAN_TESTING: /usr/bin/podman-testing QUADLET: /usr/libexec/podman/quadlet - name: "{{ podman_bin }} rootless" package: podman environment: PODMAN: /usr/bin/{{ podman_bin }} - PODMAN_TESTING: /usr/bin/{{ podman_bin }}-testing + PODMAN_TESTING: /usr/bin/podman-testing QUADLET: /usr/libexec/podman/quadlet become: true From b2d12e74a3415346382d0cd2d892015ffbf5a22a Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 23 Jul 2024 12:02:56 +0000 Subject: [PATCH 23/41] Update to 5.2.0-rc2 upstream release Upstream tag: v5.2.0-rc2 Upstream commit: 716874f4 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 37 +++++++++++++++++++++++-------------- README.packit | 2 +- podman.spec | 38 ++++++++++++++++++++++++++++---------- sources | 2 +- 5 files changed, 54 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 0888d2a..c8f51a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1861,3 +1861,4 @@ /v5.1.0.tar.gz /v5.1.1.tar.gz /v5.1.2.tar.gz +/v5.2.0-rc2.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 0d3eaca..7783371 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -12,6 +12,8 @@ packages: podman-centos: pkg_tool: centpkg specfile_path: rpm/podman.spec + podman-rhel: + specfile_path: rpm/podman.spec srpm_build_deps: - git-archive-all @@ -25,32 +27,39 @@ jobs: - job: copr_build trigger: pull_request packages: [podman-fedora] - notifications: + notifications: &packit_build_failure_notification 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 - additional_repos: - - "copr://rhcontainerbot/podman-next" + fedora-all-x86_64: {} + fedora-all-aarch64: {} + fedora-eln-x86_64: + additional_repos: + - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/" + fedora-eln-aarch64: + additional_repos: + - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/aarch64/" - job: copr_build trigger: pull_request packages: [podman-centos] - notifications: - failure_comment: - message: "Ephemeral COPR build failed. @containers/packit-build please check." + notifications: *packit_build_failure_notification + enable_net: true + targets: + - centos-stream-9-x86_64 + - centos-stream-9-aarch64 + - centos-stream-10-x86_64 + - centos-stream-10-aarch64 + + - job: copr_build + trigger: pull_request + packages: [podman-rhel] + notifications: *packit_build_failure_notification enable_net: true targets: - epel-9-x86_64 - epel-9-aarch64 - - centos-stream-10-x86_64 - - centos-stream-10-aarch64 - additional_repos: - - "copr://rhcontainerbot/podman-next" # Run on commit to main branch - job: copr_build diff --git a/README.packit b/README.packit index 2499381..8d4e245 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.98.0. +The file was generated using packit 0.99.0.post1.dev18+g4850a935. diff --git a/podman.spec b/podman.spec index 02d3702..38f1336 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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: 5.1.2 +Version: 5.2.0~rc2 # 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 @@ -101,12 +101,6 @@ Requires: containers-common-extra >= 5:0.58.0-1 %else Requires: containers-common-extra %endif -%if %{defined rhel} && !%{defined eln} -Recommends: gvisor-tap-vsock-gvforwarder -%else -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} @@ -186,6 +180,17 @@ 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]. +%package machine +Summary: Metapackage for setting up %{name} machine +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: gvisor-tap-vsock +Requires: qemu +Requires: virtiofsd + +%description machine +This subpackage installs the dependencies for %{name} machine, for more see: +https://docs.podman.io/en/latest/markdown/podman-machine.1.html + %prep %autosetup -Sgit -n %{name}-%{version_no_tilde} sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile @@ -240,6 +245,10 @@ 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 +# build %%{name}-testing +export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)" +%gobuild -o bin/podman-testing ./cmd/podman-testing + # reset LDFLAGS for plugins binaries LDFLAGS='' @@ -255,8 +264,9 @@ PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDI install.docker \ install.docker-docs \ install.remote \ + install.testing \ %if %{defined _modulesloaddir} - install.modules-load + install.modules-load %endif sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker @@ -268,8 +278,11 @@ done rm -f %{buildroot}%{_mandir}/man5/docker*.5 -install -d -p %{buildroot}/%{_datadir}/%{name}/test/system -cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ +install -d -p %{buildroot}%{_datadir}/%{name}/test/system +cp -pav test/system %{buildroot}%{_datadir}/%{name}/test/ + +# symlink virtiofsd in %%{name} libexecdir for machine subpackage +ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -314,12 +327,17 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{_datadir}/zsh/site-functions/_%{name}-remote %files tests +%{_bindir}/%{name}-testing %{_datadir}/%{name}/test %files -n %{name}sh %{_bindir}/%{name}sh %{_mandir}/man1/%{name}sh.1* +%files machine +%dir %{_libexecdir}/%{name} +%{_libexecdir}/%{name}/virtiofsd + %changelog %if %{defined autochangelog} %autochangelog diff --git a/sources b/sources index 8cf705e..82e5031 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.1.2.tar.gz) = adfd4dc5a1f7e1887ca5ffc0c6ec4593f051566010c3cc7050294fd50d2cab3d0257ff6ea4cc1abd2ba8b12adcfe0310446ac66bfc2280d9a9597294ecbcd474 +SHA512 (v5.2.0-rc2.tar.gz) = 5f7e185a33eb5cc1febe2baf3e0e538f5e4ece0c02992ff8c2e7cf7f971114e92e0442ba6289a682fe221ac5a33465023b8c1fd31a05c94bf5cd23fd8cd73fff From dd59a9527e43a3adb267a158bf03c9db7c5b40b4 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 1 Aug 2024 10:41:34 -0400 Subject: [PATCH 24/41] check buildah and skopeo version in tests (cherry picked from commit 44c5587573218691f914104989f37b443a4d7215) --- tests/roles/run_bats_tests/files/run_bats_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/roles/run_bats_tests/files/run_bats_tests.sh b/tests/roles/run_bats_tests/files/run_bats_tests.sh index f1df29d..e82a903 100755 --- a/tests/roles/run_bats_tests/files/run_bats_tests.sh +++ b/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 |\ - grep -E 'toolbox|podman|conmon|containers-common|crun|runc|iptable|slirp|aardvark|netavark|containernetworking-plugins|systemd|container-selinux|passt' |\ + grep -E 'buildah|skopeo|toolbox|podman|conmon|containers-common|crun|runc|iptable|slirp|aardvark|netavark|containernetworking-plugins|systemd|container-selinux|passt' |\ sort |\ sed -e 's/^/ /' From 1a4c4bcadb9c3b741c3d16ce4e38a2bbf086bc8d Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 2 Aug 2024 12:05:57 +0000 Subject: [PATCH 25/41] Update to 5.2.0 upstream release Upstream tag: v5.2.0 Upstream commit: b22d5c61 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 12 +++++++----- sources | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index c8f51a8..8302806 100644 --- a/.gitignore +++ b/.gitignore @@ -1862,3 +1862,4 @@ /v5.1.1.tar.gz /v5.1.2.tar.gz /v5.2.0-rc2.tar.gz +/v5.2.0.tar.gz diff --git a/README.packit b/README.packit index 8d4e245..aeaae38 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.99.0.post1.dev18+g4850a935. +The file was generated using packit 0.99.0.post1.dev29+g2e75e6ff. diff --git a/podman.spec b/podman.spec index 38f1336..4454e7b 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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: 5.2.0~rc2 +Version: 5.2.0 # 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 @@ -264,9 +264,11 @@ PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDI install.docker \ install.docker-docs \ install.remote \ - install.testing \ -%if %{defined _modulesloaddir} - install.modules-load + install.testing + +# Only need this on Fedora until nftables becomes the default +%if %{defined fedora} +%{__make} DESTDIR=%{buildroot} MODULESLOADDIR=%{_modulesloaddir} install.modules-load %endif sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker @@ -305,7 +307,7 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} %{_tmpfilesdir}/%{name}.conf %{_systemdgeneratordir}/%{name}-system-generator %{_systemdusergeneratordir}/%{name}-user-generator -%if %{defined _modulesloaddir} +%if %{defined fedora} %{_modulesloaddir}/%{name}-iptables.conf %endif diff --git a/sources b/sources index 82e5031..ac60916 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.2.0-rc2.tar.gz) = 5f7e185a33eb5cc1febe2baf3e0e538f5e4ece0c02992ff8c2e7cf7f971114e92e0442ba6289a682fe221ac5a33465023b8c1fd31a05c94bf5cd23fd8cd73fff +SHA512 (v5.2.0.tar.gz) = cc5ac92ebeaac03074c1221fa4cbc3ea62af95d0d444208b88368208089e146ff2693281033caaecd909a5f01fe4a3f8a199fef8c6c9901c281431011e19f729 From e40e4c7c797a97f594f74a74dbdfdf73849af26b Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 14 Aug 2024 18:08:58 +0000 Subject: [PATCH 26/41] Update to 5.2.1 upstream release Upstream tag: v5.2.1 Upstream commit: d0582c9e Commit authored by Packit automation (https://packit.dev/) (cherry picked from commit 199ebc87b2e8c8b63c28a86a426348307319b5a2) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8302806..5acd298 100644 --- a/.gitignore +++ b/.gitignore @@ -1863,3 +1863,4 @@ /v5.1.2.tar.gz /v5.2.0-rc2.tar.gz /v5.2.0.tar.gz +/v5.2.1.tar.gz diff --git a/README.packit b/README.packit index aeaae38..4df53f3 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.99.0.post1.dev29+g2e75e6ff. +The file was generated using packit 0.100.1. diff --git a/podman.spec b/podman.spec index 4454e7b..267a32e 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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: 5.2.0 +Version: 5.2.1 # 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 diff --git a/sources b/sources index ac60916..15211eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.2.0.tar.gz) = cc5ac92ebeaac03074c1221fa4cbc3ea62af95d0d444208b88368208089e146ff2693281033caaecd909a5f01fe4a3f8a199fef8c6c9901c281431011e19f729 +SHA512 (v5.2.1.tar.gz) = 62827a1bf0e3b9c59815fbdc1affc5e0524398088de90c3f2eee12208cc674daa4e3dfda3a77364f6c3d2d3c5e63a5792a7d44b19e015e30046cd593470dc410 From 67c6f79e58c6ff8d4942ffba1220edfa2d11656a Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 21 Aug 2024 20:01:27 +0000 Subject: [PATCH 27/41] Update to 5.2.2 upstream release Upstream tag: v5.2.2 Upstream commit: fcee4810 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 3 +-- README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5acd298..caf834f 100644 --- a/.gitignore +++ b/.gitignore @@ -1864,3 +1864,4 @@ /v5.2.0-rc2.tar.gz /v5.2.0.tar.gz /v5.2.1.tar.gz +/v5.2.2.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 7783371..e840b9e 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -99,8 +99,7 @@ jobs: update_release: false packages: [podman-fedora] dist_git_branches: - - fedora-development - - fedora-latest + - fedora-all - job: propose_downstream trigger: release diff --git a/README.packit b/README.packit index 4df53f3..94a5d96 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.100.1. +The file was generated using packit 0.100.2.post1.dev4+g31a74ebd. diff --git a/podman.spec b/podman.spec index 267a32e..507c5df 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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: 5.2.1 +Version: 5.2.2 # 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 diff --git a/sources b/sources index 15211eb..2b27ec4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.2.1.tar.gz) = 62827a1bf0e3b9c59815fbdc1affc5e0524398088de90c3f2eee12208cc674daa4e3dfda3a77364f6c3d2d3c5e63a5792a7d44b19e015e30046cd593470dc410 +SHA512 (v5.2.2.tar.gz) = a6c06689d4af80a35fa5867f8f3ea0ae3134fc40e3b3c101707842900444621337cf73eb9af42235ac5ccd12a11d707d98b29094514b00e6d6f158b4fe1f2973 From cdc399082d9123aba162ba209b9f871f33b11ef5 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 24 Sep 2024 15:19:02 +0000 Subject: [PATCH 28/41] Update to 5.2.3 upstream release Upstream tag: v5.2.3 Upstream commit: c5366a30 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 40 ++++++++++++++++++++++++++++++---------- README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 5 files changed, 34 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index caf834f..e32fcbb 100644 --- a/.gitignore +++ b/.gitignore @@ -1865,3 +1865,4 @@ /v5.2.0.tar.gz /v5.2.1.tar.gz /v5.2.2.tar.gz +/v5.2.3.tar.gz diff --git a/.packit.yaml b/.packit.yaml index e840b9e..cc47847 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -14,6 +14,8 @@ packages: specfile_path: rpm/podman.spec podman-rhel: specfile_path: rpm/podman.spec + podman-eln: + specfile_path: rpm/podman.spec srpm_build_deps: - git-archive-all @@ -32,8 +34,21 @@ jobs: message: "Ephemeral COPR build failed. @containers/packit-build please check." enable_net: true targets: - fedora-all-x86_64: {} - fedora-all-aarch64: {} + - fedora-development-x86_64 + - fedora-development-aarch64 + - fedora-latest-x86_64 + - fedora-latest-aarch64 + - fedora-latest-stable-x86_64 + - fedora-latest-stable-aarch64 + - fedora-40-x86_64 + - fedora-40-aarch64 + + - job: copr_build + trigger: pull_request + packages: [podman-eln] + notifications: *packit_build_failure_notification + enable_net: true + targets: fedora-eln-x86_64: additional_repos: - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/" @@ -98,7 +113,7 @@ jobs: trigger: release update_release: false packages: [podman-fedora] - dist_git_branches: + dist_git_branches: &fedora_targets - fedora-all - job: propose_downstream @@ -110,12 +125,17 @@ jobs: - job: koji_build trigger: commit - packages: [podman-fedora] - dist_git_branches: - - fedora-all + sidetag_group: podman-releases + dist_git_branches: *fedora_targets - job: bodhi_update - trigger: commit - packages: [podman-fedora] - dist_git_branches: - - fedora-branched # rawhide updates are created automatically + trigger: koji_build + sidetag_group: podman-releases + # Dependencies are not rpm dependencies, but packages that should go in the + # same bodhi update + # Ref: https://packit.dev/docs/fedora-releases-guide/releasing-multiple-packages + dependencies: + - buildah + - containers-common + - skopeo + dist_git_branches: *fedora_targets diff --git a/README.packit b/README.packit index 94a5d96..ab6dd33 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.100.2.post1.dev4+g31a74ebd. +The file was generated using packit 0.101.1. diff --git a/podman.spec b/podman.spec index 507c5df..aa41553 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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: 5.2.2 +Version: 5.2.3 # 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 diff --git a/sources b/sources index 2b27ec4..cee6dd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.2.2.tar.gz) = a6c06689d4af80a35fa5867f8f3ea0ae3134fc40e3b3c101707842900444621337cf73eb9af42235ac5ccd12a11d707d98b29094514b00e6d6f158b4fe1f2973 +SHA512 (v5.2.3.tar.gz) = 65aedd77f96e03a4ff06167fa44930be0929969a1f0d411c89a3981b2250b8051c975441b74b5b05f9ba0798ff41ff4fdf539b7f1849b130565e2765bb8c872b From 5ffbaec9052277acf2bb633e3a24e03e2a75d474 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 7 Oct 2024 16:06:19 +0000 Subject: [PATCH 29/41] Update to 5.2.4 upstream release Upstream tag: v5.2.4 Upstream commit: 76d0859d Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e32fcbb..53bf18c 100644 --- a/.gitignore +++ b/.gitignore @@ -1866,3 +1866,4 @@ /v5.2.1.tar.gz /v5.2.2.tar.gz /v5.2.3.tar.gz +/v5.2.4.tar.gz diff --git a/README.packit b/README.packit index ab6dd33..766e300 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.101.1. +The file was generated using packit 0.101.1.post1.dev8+ge78e9e3b. diff --git a/podman.spec b/podman.spec index aa41553..fdccb84 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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: 5.2.3 +Version: 5.2.4 # 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 diff --git a/sources b/sources index cee6dd4..4598fa3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.2.3.tar.gz) = 65aedd77f96e03a4ff06167fa44930be0929969a1f0d411c89a3981b2250b8051c975441b74b5b05f9ba0798ff41ff4fdf539b7f1849b130565e2765bb8c872b +SHA512 (v5.2.4.tar.gz) = c6dc05cb377ba6ca3bf7a8d7875c97af9e82b972812702e011e41f7922a4546166061dd5fb809fbef9dd13ee233744de7b7fe16906d8d9631133fc4205a980c5 From 1f78e0a89f7a422686df51a19780c7e24fe89c30 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 15 Oct 2024 13:21:58 +0530 Subject: [PATCH 30/41] c/common pr 2194 (cherry picked from commit 7d7eeff1c693b2d6ff14edbd0a115cd996216a97) --- ...-upstream-c-common-PR-2194-to-podman.patch | 31 +++++++++++++++++++ podman.spec | 6 +--- 2 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 0001-upstream-c-common-PR-2194-to-podman.patch diff --git a/0001-upstream-c-common-PR-2194-to-podman.patch b/0001-upstream-c-common-PR-2194-to-podman.patch new file mode 100644 index 0000000..1dcb477 --- /dev/null +++ b/0001-upstream-c-common-PR-2194-to-podman.patch @@ -0,0 +1,31 @@ +From 197741e4fa3510a14e78f572677d3b9154419cab Mon Sep 17 00:00:00 2001 +From: Lokesh Mandvekar +Date: Tue, 15 Oct 2024 13:17:50 +0530 +Subject: [PATCH] upstream c/common PR 2194 to podman + +Signed-off-by: Lokesh Mandvekar +--- + vendor/github.com/containers/common/pkg/config/default.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go +index 311b090b9..044748ab0 100644 +--- a/vendor/github.com/containers/common/pkg/config/default.go ++++ b/vendor/github.com/containers/common/pkg/config/default.go +@@ -120,12 +120,12 @@ var ( + additionalHelperBinariesDir string + + defaultUnixComposeProviders = []string{ +- "docker-compose", + "$HOME/.docker/cli-plugins/docker-compose", + "/usr/local/lib/docker/cli-plugins/docker-compose", + "/usr/local/libexec/docker/cli-plugins/docker-compose", + "/usr/lib/docker/cli-plugins/docker-compose", + "/usr/libexec/docker/cli-plugins/docker-compose", ++ "docker-compose", + "podman-compose", + } + +-- +2.47.0 + diff --git a/podman.spec b/podman.spec index fdccb84..5379c14 100644 --- a/podman.spec +++ b/podman.spec @@ -65,6 +65,7 @@ Summary: Manage Pods, Containers and Container Images URL: https://%{name}.io/ # All SourceN files fetched from upstream Source0: %{git0}/archive/v%{version_no_tilde}.tar.gz +Patch0: 0001-upstream-c-common-PR-2194-to-podman.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} BuildRequires: %{_bindir}/envsubst %if %{defined build_with_btrfs} @@ -341,9 +342,4 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} %{_libexecdir}/%{name}/virtiofsd %changelog -%if %{defined autochangelog} %autochangelog -%else -* Mon May 01 2023 RH Container Bot -- Placeholder changelog for envs that are not autochangelog-ready -%endif From f28b34c70f3ab1605efadf795ee9a477726c0ab1 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 18 Oct 2024 23:10:27 +0530 Subject: [PATCH 31/41] bump to v5.2.5 Fixes: #2317464 - Security fix for CVE-2024-9675 Fixes: #2319019 - Security fix for CVE-2024-9676 Fixes: #2318511 - Security fix for CVE-2024-9341 Signed-off-by: Lokesh Mandvekar (cherry picked from commit 5f0570428b859349f0f7c71d3b49238e96de76fb) --- .gitignore | 1 + podman.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 53bf18c..895ad9e 100644 --- a/.gitignore +++ b/.gitignore @@ -1867,3 +1867,4 @@ /v5.2.2.tar.gz /v5.2.3.tar.gz /v5.2.4.tar.gz +/v5.2.5.tar.gz diff --git a/podman.spec b/podman.spec index 5379c14..53e0b24 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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: 5.2.4 +Version: 5.2.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 diff --git a/sources b/sources index 4598fa3..27aeb20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.2.4.tar.gz) = c6dc05cb377ba6ca3bf7a8d7875c97af9e82b972812702e011e41f7922a4546166061dd5fb809fbef9dd13ee233744de7b7fe16906d8d9631133fc4205a980c5 +SHA512 (v5.2.5.tar.gz) = 29f71c67a5700e8dffe45e6e91acab509d8c8924a5f3cf9b4eee95f665a9ed19333285df89da892699ee314cee27c0c8a4a62d29e4205198781f5d5f585135a9 From 0ddcc0cdee8706aa168db6f08fa2ca2603ce4fab Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 25 Oct 2024 16:59:56 +0530 Subject: [PATCH 32/41] rebuild From 094278c841ef2f181336bac6a674ec1cc0503ab6 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 13 Nov 2024 13:16:09 +0000 Subject: [PATCH 33/41] Update to 5.3.0 upstream release Upstream tag: v5.3.0 Upstream commit: 874bf2c3 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 23 +++++++++++++---------- README.packit | 2 +- podman.spec | 15 ++++++++------- sources | 2 +- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 895ad9e..f6b97b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1868,3 +1868,4 @@ /v5.2.3.tar.gz /v5.2.4.tar.gz /v5.2.5.tar.gz +/v5.3.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml index cc47847..0d5c3a3 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -62,19 +62,20 @@ jobs: notifications: *packit_build_failure_notification enable_net: true targets: - - centos-stream-9-x86_64 - - centos-stream-9-aarch64 + # - centos-stream-9-x86_64 + # - centos-stream-9-aarch64 - centos-stream-10-x86_64 - centos-stream-10-aarch64 - - job: copr_build - trigger: pull_request - packages: [podman-rhel] - notifications: *packit_build_failure_notification - enable_net: true - targets: - - epel-9-x86_64 - - epel-9-aarch64 + # Disabled until there is go 1.22 in epel-9 + # - job: copr_build + # trigger: pull_request + # packages: [podman-rhel] + # notifications: *packit_build_failure_notification + # enable_net: true + # targets: + # - epel-9-x86_64 + # - epel-9-aarch64 # Run on commit to main branch - job: copr_build @@ -125,11 +126,13 @@ jobs: - job: koji_build trigger: commit + packages: [podman-fedora] sidetag_group: podman-releases dist_git_branches: *fedora_targets - job: bodhi_update trigger: koji_build + packages: [podman-fedora] sidetag_group: podman-releases # Dependencies are not rpm dependencies, but packages that should go in the # same bodhi update diff --git a/README.packit b/README.packit index 766e300..c18262a 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.101.1.post1.dev8+ge78e9e3b. +The file was generated using packit 0.103.0. diff --git a/podman.spec b/podman.spec index 53e0b24..4746ac2 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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: 5.2.5 +Version: 5.3.0 # 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 @@ -65,7 +65,6 @@ Summary: Manage Pods, Containers and Container Images URL: https://%{name}.io/ # All SourceN files fetched from upstream Source0: %{git0}/archive/v%{version_no_tilde}.tar.gz -Patch0: 0001-upstream-c-common-PR-2194-to-podman.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} BuildRequires: %{_bindir}/envsubst %if %{defined build_with_btrfs} @@ -102,7 +101,6 @@ Requires: containers-common-extra >= 5:0.58.0-1 %else Requires: containers-common-extra %endif -Provides: %{name}-quadlet Obsoletes: %{name}-quadlet <= 5:4.4.0-1 Provides: %{name}-quadlet = %{epoch}:%{version}-%{release} @@ -267,15 +265,15 @@ PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDI install.remote \ install.testing -# Only need this on Fedora until nftables becomes the default -%if %{defined fedora} +# See above for the iptables.conf declaration +%if %{defined fedora} && 0%{?fedora} < 41 %{__make} DESTDIR=%{buildroot} MODULESLOADDIR=%{_modulesloaddir} install.modules-load %endif sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker # 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 %{name}sh.1 -e remote -e docker`; do +for file in `find %{buildroot}%{_mandir}/man[157] -type f | sed "s,%{buildroot},," | grep -v -e %{name}sh.1 -e remote -e docker`; do echo "$file*" >> %{name}.file-list done @@ -308,7 +306,10 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} %{_tmpfilesdir}/%{name}.conf %{_systemdgeneratordir}/%{name}-system-generator %{_systemdusergeneratordir}/%{name}-user-generator -%if %{defined fedora} +# iptables modules are only needed with iptables-legacy, +# as of f41 netavark will default to nftables so do not load unessary modules +# https://fedoraproject.org/wiki/Changes/NetavarkNftablesDefault +%if %{defined fedora} && 0%{?fedora} < 41 %{_modulesloaddir}/%{name}-iptables.conf %endif diff --git a/sources b/sources index 27aeb20..5ebad65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.2.5.tar.gz) = 29f71c67a5700e8dffe45e6e91acab509d8c8924a5f3cf9b4eee95f665a9ed19333285df89da892699ee314cee27c0c8a4a62d29e4205198781f5d5f585135a9 +SHA512 (v5.3.0.tar.gz) = 3f1ab7e792850e2e21823c59ca9e03d348e78267e3ec5344a04c38e51466159717944c318cf5e61ad9a785d9112b468b9fc37f3b60a40e8764d5cac9f58e7d16 From 9a52167206b27d095f72d3f903200530b402dbb1 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 21 Nov 2024 15:41:39 +0000 Subject: [PATCH 34/41] Update to 5.3.1 upstream release Upstream tag: v5.3.1 Upstream commit: 4cbdfde5 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f6b97b9..ee7949d 100644 --- a/.gitignore +++ b/.gitignore @@ -1869,3 +1869,4 @@ /v5.2.4.tar.gz /v5.2.5.tar.gz /v5.3.0.tar.gz +/v5.3.1.tar.gz diff --git a/README.packit b/README.packit index c18262a..58044ba 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.103.0. +The file was generated using packit 0.104.0. diff --git a/podman.spec b/podman.spec index 4746ac2..345e113 100644 --- a/podman.spec +++ b/podman.spec @@ -52,7 +52,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: 5.3.0 +Version: 5.3.1 # 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 diff --git a/sources b/sources index 5ebad65..31b1d65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.3.0.tar.gz) = 3f1ab7e792850e2e21823c59ca9e03d348e78267e3ec5344a04c38e51466159717944c318cf5e61ad9a785d9112b468b9fc37f3b60a40e8764d5cac9f58e7d16 +SHA512 (v5.3.1.tar.gz) = e865104453cc2d7e3d76c83da84dbd6c4fb5224b089059d3eca3cbe3b5513e7964000eb66a2c6ac80ad09b3392d24900fe314bb464cdcc80b0dd6a74b6ea9262 From 931c45a7b9ec7c1d55b1ce47f147c19791938a18 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 27 Nov 2024 20:48:48 +0530 Subject: [PATCH 35/41] remove unused patch Signed-off-by: Lokesh Mandvekar (cherry picked from commit 89aed9941f2fa774249a55c3082ff9a3932c1022) --- ...-upstream-c-common-PR-2194-to-podman.patch | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 0001-upstream-c-common-PR-2194-to-podman.patch diff --git a/0001-upstream-c-common-PR-2194-to-podman.patch b/0001-upstream-c-common-PR-2194-to-podman.patch deleted file mode 100644 index 1dcb477..0000000 --- a/0001-upstream-c-common-PR-2194-to-podman.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 197741e4fa3510a14e78f572677d3b9154419cab Mon Sep 17 00:00:00 2001 -From: Lokesh Mandvekar -Date: Tue, 15 Oct 2024 13:17:50 +0530 -Subject: [PATCH] upstream c/common PR 2194 to podman - -Signed-off-by: Lokesh Mandvekar ---- - vendor/github.com/containers/common/pkg/config/default.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go -index 311b090b9..044748ab0 100644 ---- a/vendor/github.com/containers/common/pkg/config/default.go -+++ b/vendor/github.com/containers/common/pkg/config/default.go -@@ -120,12 +120,12 @@ var ( - additionalHelperBinariesDir string - - defaultUnixComposeProviders = []string{ -- "docker-compose", - "$HOME/.docker/cli-plugins/docker-compose", - "/usr/local/lib/docker/cli-plugins/docker-compose", - "/usr/local/libexec/docker/cli-plugins/docker-compose", - "/usr/lib/docker/cli-plugins/docker-compose", - "/usr/libexec/docker/cli-plugins/docker-compose", -+ "docker-compose", - "podman-compose", - } - --- -2.47.0 - From e7b25177b7def87ffcc0c10bc6925cb45a25f38f Mon Sep 17 00:00:00 2001 From: Mikhail Gavrilov Date: Thu, 9 Jan 2025 05:52:53 +0500 Subject: [PATCH 36/41] apply MR https://github.com/containers/storage/pull/2193 (cherry picked from commit 6889e093102bc0d22ee0eac1f8ffeabde19ef0c2) --- 2193.patch | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++ podman.spec | 1 + 2 files changed, 84 insertions(+) create mode 100644 2193.patch diff --git a/2193.patch b/2193.patch new file mode 100644 index 0000000..fc7ba08 --- /dev/null +++ b/2193.patch @@ -0,0 +1,83 @@ +From 359b5d5c748876b20b6cbdd28d8df43b27bc71b5 Mon Sep 17 00:00:00 2001 +From: Paul Holzinger +Date: Tue, 3 Dec 2024 14:09:02 +0100 +Subject: [PATCH] store: correctly remove incomplete layers on load. + +In go one should never modify a slice while also iterating over it at +the same time. This causes weird side effects as the underlying array +elements are shifted around without the range loop index knowing. +So if you delete a element the loop will then actually skip the next one +and theoretically access out of bounds on the last element which does +not panic but rather return the default zero type, nil here which then +causes the panic on layer.Flags == nil. + +Here is a simple example to show the behavior: +func main() { + slice := []int{1, 2, 3, 4, 5, 6, 7, 8, 9} + for _, num := range slice { + if num == 5 { + slice = slices.DeleteFunc(slice, func(n int) bool { + return n == 5 + }) + } + fmt.Println(num) + } +} + +The loop will not print 6, but then as last number it prints 0 (the +default zero type for an int). + +Fixes #2184 + +Signed-off-by: Paul Holzinger +(cherry picked from commit 99b0d2d423c8093807d8a1464437152cd04d7d95) +--- + layers.go | 29 +++++++++++++++++++---------- + 1 file changed, 19 insertions(+), 10 deletions(-) + +diff --git a/vendor/github.com/containers/storage/layers.go b/vendor/github.com/containers/storage/layers.go +index 6fe1a08035..4769e581ae 100644 +--- a/vendor/github.com/containers/storage/layers.go ++++ b/vendor/github.com/containers/storage/layers.go +@@ -913,22 +913,31 @@ func (r *layerStore) load(lockedForWriting bool) (bool, error) { + // user of this storage area marked for deletion but didn't manage to + // actually delete. + var incompleteDeletionErrors error // = nil ++ var layersToDelete []*Layer + for _, layer := range r.layers { + if layer.Flags == nil { + layer.Flags = make(map[string]interface{}) + } + if layerHasIncompleteFlag(layer) { +- logrus.Warnf("Found incomplete layer %#v, deleting it", layer.ID) +- err := r.deleteInternal(layer.ID) +- if err != nil { +- // Don't return the error immediately, because deleteInternal does not saveLayers(); +- // Even if deleting one incomplete layer fails, call saveLayers() so that other possible successfully +- // deleted incomplete layers have their metadata correctly removed. +- incompleteDeletionErrors = multierror.Append(incompleteDeletionErrors, +- fmt.Errorf("deleting layer %#v: %w", layer.ID, err)) +- } +- modifiedLocations |= layerLocation(layer) ++ // Important: Do not call r.deleteInternal() here. It modifies r.layers ++ // which causes unexpected side effects while iterating over r.layers here. ++ // The range loop has no idea that the underlying elements where shifted ++ // around. ++ layersToDelete = append(layersToDelete, layer) ++ } ++ } ++ // Now actually delete the layers ++ for _, layer := range layersToDelete { ++ logrus.Warnf("Found incomplete layer %q, deleting it", layer.ID) ++ err := r.deleteInternal(layer.ID) ++ if err != nil { ++ // Don't return the error immediately, because deleteInternal does not saveLayers(); ++ // Even if deleting one incomplete layer fails, call saveLayers() so that other possible successfully ++ // deleted incomplete layers have their metadata correctly removed. ++ incompleteDeletionErrors = multierror.Append(incompleteDeletionErrors, ++ fmt.Errorf("deleting layer %#v: %w", layer.ID, err)) + } ++ modifiedLocations |= layerLocation(layer) + } + if err := r.saveLayers(modifiedLocations); err != nil { + return false, err diff --git a/podman.spec b/podman.spec index 345e113..da478f1 100644 --- a/podman.spec +++ b/podman.spec @@ -65,6 +65,7 @@ Summary: Manage Pods, Containers and Container Images URL: https://%{name}.io/ # All SourceN files fetched from upstream Source0: %{git0}/archive/v%{version_no_tilde}.tar.gz +Patch0: 2193.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} BuildRequires: %{_bindir}/envsubst %if %{defined build_with_btrfs} From 50840bc5f049b78828edf884ed5b80f7301702ce Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 22 Jan 2025 19:03:53 +0530 Subject: [PATCH 37/41] remove patch merged in upcoming upstream release Signed-off-by: Lokesh Mandvekar (cherry picked from commit 37f545e12b2098dd8fead41433c4e45e8c4fa65c) --- 2193.patch | 83 ----------------------------------------------------- podman.spec | 1 - 2 files changed, 84 deletions(-) delete mode 100644 2193.patch diff --git a/2193.patch b/2193.patch deleted file mode 100644 index fc7ba08..0000000 --- a/2193.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 359b5d5c748876b20b6cbdd28d8df43b27bc71b5 Mon Sep 17 00:00:00 2001 -From: Paul Holzinger -Date: Tue, 3 Dec 2024 14:09:02 +0100 -Subject: [PATCH] store: correctly remove incomplete layers on load. - -In go one should never modify a slice while also iterating over it at -the same time. This causes weird side effects as the underlying array -elements are shifted around without the range loop index knowing. -So if you delete a element the loop will then actually skip the next one -and theoretically access out of bounds on the last element which does -not panic but rather return the default zero type, nil here which then -causes the panic on layer.Flags == nil. - -Here is a simple example to show the behavior: -func main() { - slice := []int{1, 2, 3, 4, 5, 6, 7, 8, 9} - for _, num := range slice { - if num == 5 { - slice = slices.DeleteFunc(slice, func(n int) bool { - return n == 5 - }) - } - fmt.Println(num) - } -} - -The loop will not print 6, but then as last number it prints 0 (the -default zero type for an int). - -Fixes #2184 - -Signed-off-by: Paul Holzinger -(cherry picked from commit 99b0d2d423c8093807d8a1464437152cd04d7d95) ---- - layers.go | 29 +++++++++++++++++++---------- - 1 file changed, 19 insertions(+), 10 deletions(-) - -diff --git a/vendor/github.com/containers/storage/layers.go b/vendor/github.com/containers/storage/layers.go -index 6fe1a08035..4769e581ae 100644 ---- a/vendor/github.com/containers/storage/layers.go -+++ b/vendor/github.com/containers/storage/layers.go -@@ -913,22 +913,31 @@ func (r *layerStore) load(lockedForWriting bool) (bool, error) { - // user of this storage area marked for deletion but didn't manage to - // actually delete. - var incompleteDeletionErrors error // = nil -+ var layersToDelete []*Layer - for _, layer := range r.layers { - if layer.Flags == nil { - layer.Flags = make(map[string]interface{}) - } - if layerHasIncompleteFlag(layer) { -- logrus.Warnf("Found incomplete layer %#v, deleting it", layer.ID) -- err := r.deleteInternal(layer.ID) -- if err != nil { -- // Don't return the error immediately, because deleteInternal does not saveLayers(); -- // Even if deleting one incomplete layer fails, call saveLayers() so that other possible successfully -- // deleted incomplete layers have their metadata correctly removed. -- incompleteDeletionErrors = multierror.Append(incompleteDeletionErrors, -- fmt.Errorf("deleting layer %#v: %w", layer.ID, err)) -- } -- modifiedLocations |= layerLocation(layer) -+ // Important: Do not call r.deleteInternal() here. It modifies r.layers -+ // which causes unexpected side effects while iterating over r.layers here. -+ // The range loop has no idea that the underlying elements where shifted -+ // around. -+ layersToDelete = append(layersToDelete, layer) -+ } -+ } -+ // Now actually delete the layers -+ for _, layer := range layersToDelete { -+ logrus.Warnf("Found incomplete layer %q, deleting it", layer.ID) -+ err := r.deleteInternal(layer.ID) -+ if err != nil { -+ // Don't return the error immediately, because deleteInternal does not saveLayers(); -+ // Even if deleting one incomplete layer fails, call saveLayers() so that other possible successfully -+ // deleted incomplete layers have their metadata correctly removed. -+ incompleteDeletionErrors = multierror.Append(incompleteDeletionErrors, -+ fmt.Errorf("deleting layer %#v: %w", layer.ID, err)) - } -+ modifiedLocations |= layerLocation(layer) - } - if err := r.saveLayers(modifiedLocations); err != nil { - return false, err diff --git a/podman.spec b/podman.spec index da478f1..345e113 100644 --- a/podman.spec +++ b/podman.spec @@ -65,7 +65,6 @@ Summary: Manage Pods, Containers and Container Images URL: https://%{name}.io/ # All SourceN files fetched from upstream Source0: %{git0}/archive/v%{version_no_tilde}.tar.gz -Patch0: 2193.patch Provides: %{name}-manpages = %{epoch}:%{version}-%{release} BuildRequires: %{_bindir}/envsubst %if %{defined build_with_btrfs} From 3a2977e3e3fe26b31eb63893b4fc21b40cae0215 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 22 Jan 2025 13:38:19 +0000 Subject: [PATCH 38/41] Update to 5.3.2 upstream release Upstream tag: v5.3.2 Upstream commit: 85043bb1 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 26 ++++---------------------- README.packit | 2 +- podman.spec | 11 ++++++++++- sources | 2 +- 5 files changed, 17 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index ee7949d..fea689e 100644 --- a/.gitignore +++ b/.gitignore @@ -1870,3 +1870,4 @@ /v5.2.5.tar.gz /v5.3.0.tar.gz /v5.3.1.tar.gz +/v5.3.2.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 0d5c3a3..637e020 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -12,8 +12,6 @@ packages: podman-centos: pkg_tool: centpkg specfile_path: rpm/podman.spec - podman-rhel: - specfile_path: rpm/podman.spec podman-eln: specfile_path: rpm/podman.spec @@ -34,14 +32,8 @@ jobs: message: "Ephemeral COPR build failed. @containers/packit-build please check." enable_net: true targets: - - fedora-development-x86_64 - - fedora-development-aarch64 - - fedora-latest-x86_64 - - fedora-latest-aarch64 - - fedora-latest-stable-x86_64 - - fedora-latest-stable-aarch64 - - fedora-40-x86_64 - - fedora-40-aarch64 + - fedora-all-x86_64 + - fedora-all-aarch64 - job: copr_build trigger: pull_request @@ -62,21 +54,11 @@ jobs: notifications: *packit_build_failure_notification enable_net: true targets: - # - centos-stream-9-x86_64 - # - centos-stream-9-aarch64 + - centos-stream-9-x86_64 + - centos-stream-9-aarch64 - centos-stream-10-x86_64 - centos-stream-10-aarch64 - # Disabled until there is go 1.22 in epel-9 - # - job: copr_build - # trigger: pull_request - # packages: [podman-rhel] - # notifications: *packit_build_failure_notification - # enable_net: true - # targets: - # - epel-9-x86_64 - # - epel-9-aarch64 - # Run on commit to main branch - job: copr_build trigger: commit diff --git a/README.packit b/README.packit index 58044ba..8c905b9 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.104.0. +The file was generated using packit 0.106.0.post1.dev8+g521f1e1d. diff --git a/podman.spec b/podman.spec index 345e113..5aee7ce 100644 --- a/podman.spec +++ b/podman.spec @@ -40,6 +40,9 @@ # %%{name} %global git0 %{container_base_url}/%{name} +# podman-machine subpackage will be present only on these architectures +%global machine_arches x86_64 aarch64 + Name: podman %if %{defined copr_build} Epoch: 102 @@ -52,7 +55,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: 5.3.1 +Version: 5.3.2 # 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 @@ -179,6 +182,7 @@ 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]. +%ifarch %{machine_arches} %package machine Summary: Metapackage for setting up %{name} machine Requires: %{name} = %{epoch}:%{version}-%{release} @@ -189,6 +193,7 @@ Requires: virtiofsd %description machine This subpackage installs the dependencies for %{name} machine, for more see: https://docs.podman.io/en/latest/markdown/podman-machine.1.html +%endif %prep %autosetup -Sgit -n %{name}-%{version_no_tilde} @@ -282,8 +287,10 @@ rm -f %{buildroot}%{_mandir}/man5/docker*.5 install -d -p %{buildroot}%{_datadir}/%{name}/test/system cp -pav test/system %{buildroot}%{_datadir}/%{name}/test/ +%ifarch %{machine_arches} # symlink virtiofsd in %%{name} libexecdir for machine subpackage ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} +%endif #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -338,9 +345,11 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} %{_bindir}/%{name}sh %{_mandir}/man1/%{name}sh.1* +%ifarch %{machine_arches} %files machine %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/virtiofsd +%endif %changelog %autochangelog diff --git a/sources b/sources index 31b1d65..2e9b8fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.3.1.tar.gz) = e865104453cc2d7e3d76c83da84dbd6c4fb5224b089059d3eca3cbe3b5513e7964000eb66a2c6ac80ad09b3392d24900fe314bb464cdcc80b0dd6a74b6ea9262 +SHA512 (v5.3.2.tar.gz) = b7007278dd3f493bd0d0185ed4328570d5af527d4864c4435e7b330543d60ba87f04f36c94407d4e11e622a4af8b6467f66474e9b66cbeacb8eecb3088b4439e From 700c36629d7976791fb4a67e2513d9d7eea110bc Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 11 Feb 2025 18:27:01 +0000 Subject: [PATCH 39/41] Update to 5.4.0 upstream release Upstream tag: v5.4.0 Upstream commit: f9f7d48b Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 54 +++++++++++++++++++++++++++++++++++++-------------- sources | 2 +- 4 files changed, 42 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index fea689e..4257e4e 100644 --- a/.gitignore +++ b/.gitignore @@ -1871,3 +1871,4 @@ /v5.3.0.tar.gz /v5.3.1.tar.gz /v5.3.2.tar.gz +/v5.4.0.tar.gz diff --git a/README.packit b/README.packit index 8c905b9..7017e6c 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.106.0.post1.dev8+g521f1e1d. +The file was generated using packit 1.1.0.post1.dev2+gf7b527d0. diff --git a/podman.spec b/podman.spec index 5aee7ce..d8dff52 100644 --- a/podman.spec +++ b/podman.spec @@ -7,29 +7,23 @@ %global debug_package %{nil} %endif -# 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 -%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 %{?**}; -%endif - %global gomodulesmode GO111MODULE=on -%if %{defined rhel} -# _user_tmpfiles.d currently undefined on rhel -%global _user_tmpfilesdir %{_datadir}/user-tmpfiles.d -%endif - %if %{defined fedora} %define build_with_btrfs 1 +# qemu-system* isn't packageed for CentOS Stream / RHEL +%define qemu 1 %endif %if %{defined copr_username} %define copr_build 1 %endif +# Only RHEL and CentOS Stream rpms are built with fips-enabled go compiler +%if %{defined rhel} +%define fips_enabled 1 +%endif + %global container_base_path github.com/containers %global container_base_url https://%{container_base_path} @@ -43,6 +37,12 @@ # podman-machine subpackage will be present only on these architectures %global machine_arches x86_64 aarch64 +%if %{defined copr_build} +%define build_origin Copr: %{?copr_username}/%{?copr_projectname} +%else +%define build_origin %{?packager} +%endif + Name: podman %if %{defined copr_build} Epoch: 102 @@ -55,7 +55,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: 5.3.2 +Version: 5.4.0 # 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 @@ -142,6 +142,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %if %{defined fedora} Requires: bats %endif +Requires: attr Requires: jq Requires: skopeo Requires: nmap-ncat @@ -187,8 +188,19 @@ when `%{_bindir}/%{name}sh` is set as a login shell or set as os.Args[0]. Summary: Metapackage for setting up %{name} machine Requires: %{name} = %{epoch}:%{version}-%{release} Requires: gvisor-tap-vsock -Requires: qemu +%if %{defined qemu} +%ifarch aarch64 +Requires: qemu-system-aarch64-core +%endif +%ifarch x86_64 +Requires: qemu-system-x86-core +%endif +%else +Requires: qemu-kvm +%endif +Requires: qemu-img Requires: virtiofsd +ExclusiveArch: x86_64 aarch64 %description machine This subpackage installs the dependencies for %{name} machine, for more see: @@ -228,6 +240,7 @@ export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full" export GOPROXY=direct LDFLAGS="-X %{ld_libpod}/define.buildInfo=${SOURCE_DATE_EPOCH:-$(date +%s)} \ + -X \"%{ld_libpod}/define.buildOrigin=%{build_origin}\" \ -X %{ld_libpod}/config._installPrefix=%{_prefix} \ -X %{ld_libpod}/config._etcDir=%{_sysconfdir} \ -X %{ld_project}/pkg/systemd/quadlet._binDir=%{_bindir}" @@ -237,6 +250,14 @@ LDFLAGS="-X %{ld_libpod}/define.buildInfo=${SOURCE_DATE_EPOCH:-$(date +%s)} \ export BASEBUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" +# libtrust_openssl buildtag switches to using the FIPS-compatible func +# `ecdsa.HashSign`. +# Ref 1: https://github.com/golang-fips/go/blob/main/patches/015-add-hash-sign-verify.patch#L22 +# Ref 2: https://github.com/containers/libtrust/blob/main/ec_key_openssl.go#L23 +%if %{defined fips_enabled} +export BASEBUILDTAGS="$BASEBUILDTAGS libtrust_openssl" +%endif + # build %%{name} export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh)" %gobuild -o bin/%{name} ./cmd/%{name} @@ -295,6 +316,9 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} #define license tag if not already defined %{!?_licensedir:%global license %doc} +# Include empty check to silence rpmlint warning +%check + %files -f %{name}.file-list %license LICENSE vendor/modules.txt %doc README.md CONTRIBUTING.md install.md transfer.md diff --git a/sources b/sources index 2e9b8fb..01e7baf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.3.2.tar.gz) = b7007278dd3f493bd0d0185ed4328570d5af527d4864c4435e7b330543d60ba87f04f36c94407d4e11e622a4af8b6467f66474e9b66cbeacb8eecb3088b4439e +SHA512 (v5.4.0.tar.gz) = f120178be0230ddc5d6b2b41d3c121fdecf5b8ef26bac74e0654e8be295e862ccb790e5a7178bfe65f93e2e106e92af3953d4b97c7383ec0b2fbfa250d72a8a1 From 26aee3045b642b854d72463cafe211fdddf98b56 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 11 Mar 2025 18:38:15 +0000 Subject: [PATCH 40/41] Update to 5.4.1 upstream release Upstream tag: v5.4.1 Upstream commit: b79bc8af Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 12 ++++++------ README.packit | 2 +- podman.spec | 16 +++++++--------- sources | 2 +- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 4257e4e..14b15c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1872,3 +1872,4 @@ /v5.3.1.tar.gz /v5.3.2.tar.gz /v5.4.0.tar.gz +/v5.4.1.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 637e020..7c088fc 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -20,16 +20,16 @@ srpm_build_deps: - make actions: - fix-spec-file: - - "bash .packit.sh" + fix-spec-file: "bash .packit-copr-rpm.sh" + pre-sync: "bash .packit-rpm-git-commit.sh" jobs: - job: copr_build trigger: pull_request packages: [podman-fedora] - notifications: &packit_build_failure_notification + notifications: &packit_generic_failure_notification failure_comment: - message: "Ephemeral COPR build failed. @containers/packit-build please check." + message: "[NON-BLOCKING] Packit jobs failed. @containers/packit-build please check. Everyone else, feel free to ignore." enable_net: true targets: - fedora-all-x86_64 @@ -38,7 +38,7 @@ jobs: - job: copr_build trigger: pull_request packages: [podman-eln] - notifications: *packit_build_failure_notification + notifications: *packit_generic_failure_notification enable_net: true targets: fedora-eln-x86_64: @@ -51,7 +51,7 @@ jobs: - job: copr_build trigger: pull_request packages: [podman-centos] - notifications: *packit_build_failure_notification + notifications: *packit_generic_failure_notification enable_net: true targets: - centos-stream-9-x86_64 diff --git a/README.packit b/README.packit index 7017e6c..f5cc99f 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.1.0.post1.dev2+gf7b527d0. +The file was generated using packit 1.2.0.post1.dev13+g55ed4527. diff --git a/podman.spec b/podman.spec index d8dff52..bf8ab1b 100644 --- a/podman.spec +++ b/podman.spec @@ -55,7 +55,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: 5.4.0 +Version: 5.4.1 # 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 @@ -151,6 +151,7 @@ Requires: openssl Requires: socat Requires: buildah Requires: gnupg +Requires: xfsprogs %description tests %{summary} @@ -216,14 +217,6 @@ sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile sed -i '/DELETE ON RHEL9/,/DELETE ON RHEL9/d' libpod/runtime.go %endif -# 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 - %build %set_build_flags export CGO_CFLAGS=$CFLAGS @@ -245,6 +238,11 @@ LDFLAGS="-X %{ld_libpod}/define.buildInfo=${SOURCE_DATE_EPOCH:-$(date +%s)} \ -X %{ld_libpod}/config._etcDir=%{_sysconfdir} \ -X %{ld_project}/pkg/systemd/quadlet._binDir=%{_bindir}" +# This variable will be set by Packit actions. See .packit.yaml in the root dir +# of the repo (upstream as well as Fedora dist-git). +GIT_COMMIT="b79bc8afe796cba51dd906270a7e1056ccdfcf9e""" +LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" + # build rootlessport first %gobuild -o bin/rootlessport ./cmd/rootlessport diff --git a/sources b/sources index 01e7baf..0539f17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.4.0.tar.gz) = f120178be0230ddc5d6b2b41d3c121fdecf5b8ef26bac74e0654e8be295e862ccb790e5a7178bfe65f93e2e106e92af3953d4b97c7383ec0b2fbfa250d72a8a1 +SHA512 (v5.4.1.tar.gz) = 7cbe02c4fdfce83e8becd5c167768d25eab621794e736e7741ca8d4d1384e7db550c59b2f45356aaabd49d9d236bae65bad7f60dc2392a0903ceec812fa5d1c2 From d96e581a46f99f76fce1dc85fe528d0b8e506226 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 2 Apr 2025 16:28:37 +0000 Subject: [PATCH 41/41] Update to 5.4.2 upstream release Upstream tag: v5.4.2 Upstream commit: be85287f Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 6 +++--- sources | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 14b15c0..bc39355 100644 --- a/.gitignore +++ b/.gitignore @@ -1873,3 +1873,4 @@ /v5.3.2.tar.gz /v5.4.0.tar.gz /v5.4.1.tar.gz +/v5.4.2.tar.gz diff --git a/README.packit b/README.packit index f5cc99f..bb4a369 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.2.0.post1.dev13+g55ed4527. +The file was generated using packit 1.4.0.post1.dev4+g043c5fde. diff --git a/podman.spec b/podman.spec index bf8ab1b..4b8218c 100644 --- a/podman.spec +++ b/podman.spec @@ -55,14 +55,14 @@ 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: 5.4.1 +Version: 5.4.2 # 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} %else -ExclusiveArch: aarch64 ppc64le s390x x86_64 +ExclusiveArch: aarch64 ppc64le s390x x86_64 riscv64 %endif Summary: Manage Pods, Containers and Container Images URL: https://%{name}.io/ @@ -240,7 +240,7 @@ LDFLAGS="-X %{ld_libpod}/define.buildInfo=${SOURCE_DATE_EPOCH:-$(date +%s)} \ # This variable will be set by Packit actions. See .packit.yaml in the root dir # of the repo (upstream as well as Fedora dist-git). -GIT_COMMIT="b79bc8afe796cba51dd906270a7e1056ccdfcf9e""" +GIT_COMMIT="be85287fcf4590961614ee37be65eeb315e5d9ff" LDFLAGS="$LDFLAGS -X %{ld_libpod}/define.gitCommit=$GIT_COMMIT" # build rootlessport first diff --git a/sources b/sources index 0539f17..f9d6862 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.4.1.tar.gz) = 7cbe02c4fdfce83e8becd5c167768d25eab621794e736e7741ca8d4d1384e7db550c59b2f45356aaabd49d9d236bae65bad7f60dc2392a0903ceec812fa5d1c2 +SHA512 (v5.4.2.tar.gz) = 482fde529766ca1b509a08bab4beb59a5935ebc6b27bc886c33597183258631e8c8db03ebb521baefd7989305aa76fad14c1359e211a0fe75c855c14bbaca960