From 814577a59547e5ef115c86624f2e005e5de2ae4a Mon Sep 17 00:00:00 2001 From: tigro Date: Sun, 20 Oct 2024 14:07:31 +0300 Subject: [PATCH] import podman-5.2.2-1.el9 --- .gitignore | 2 +- .podman.metadata | 6 ++-- SPECS/podman.spec | 91 +++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 89 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index f4e24f6..c9f488e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ +SOURCES/podman-5.2.2-fcee481.tar.gz SOURCES/dnsname-bdc4ab8.tar.gz SOURCES/v0.1.7.tar.gz -SOURCES/v4.9-4c14019.tar.gz diff --git a/.podman.metadata b/.podman.metadata index dc67ead..c723f21 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -1,3 +1,3 @@ -69fb828d3028f968e46420d58cc80bc59e446051 SOURCES/dnsname-bdc4ab8.tar.gz -94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz -dcc2c86ccb8ed60236971aa56c61d34b5c07844d SOURCES/v4.9-4c14019.tar.gz +17ac9b76dd3924b8a5c63a9860b915627f48ac63 SOURCES/podman-5.2.2-fcee481.tar.gz +69fb828d3028f968e46420d58cc80bc59e446051 SOURCES/dnsname-bdc4ab8.tar.gz +94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 3ee7875..050748f 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -4,8 +4,8 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**}; %global import_path github.com/containers/podman -%global branch v4.9 -%global commit0 4c140196f1233e5a48a088a41fe63eb2ad5e6b78 +#%%global branch v4.9 +%global commit0 fcee48106a12dd531702d729d17f40f6e152027f %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global cataver 0.1.7 %global commit_dnsname bdc4ab85266ade865a7c398336e98721e62ef6b2 @@ -13,7 +13,7 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $ Epoch: 2 Name: podman -Version: 4.9.2 +Version: 5.2.2 Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 @@ -65,6 +65,7 @@ Requires: libseccomp >= 2.5 Requires: conmon >= 2.0.25 Requires: (container-selinux if selinux-policy) Requires: slirp4netns >= 0.4.0-1 +Requires: passt Recommends: crun Requires: fuse-overlayfs Requires: oci-runtime @@ -156,6 +157,11 @@ sed -i '$d' configure.ac popd tar fx %{SOURCE2} +# cgroups-v1 is supported on rhel9 +%if 0%{?rhel} == 9 +sed -i '/DELETE ON RHEL9/,/DELETE ON RHEL9/d' libpod/runtime.go +%endif + # this is shipped by skopeo: containers-common subpackage rm -rf docs/source/markdown/containers-mounts.conf.5.md @@ -333,6 +339,7 @@ fi %files docker %{_bindir}/docker %{_mandir}/man1/docker*.1* +%{_sysconfdir}/profile.d/%{name}-docker.* %{_tmpfilesdir}/%{name}-docker.conf %{_user_tmpfilesdir}/%{name}-docker.conf @@ -358,6 +365,81 @@ fi %{_datadir}/%{name}/test %changelog +* Sun Oct 20 2024 Arkady L. Shane - 2:5.2.2-1 +- Rebuilt for MSVSphere 9.5 + +* Thu Aug 22 2024 Jindrich Novy - 2:5.2.2-1 +- update to https://github.com/containers/podman/releases/tag/v5.2.2 +- Related: RHEL-27608 + +* Thu Aug 15 2024 Jindrich Novy - 2:5.2.1-1 +- update to https://github.com/containers/podman/releases/tag/v5.2.1 +- Related: RHEL-27608 + +* Wed Aug 07 2024 Jindrich Novy - 2:5.2.0-2 +- Add PODMAN_TESTING definition +- Related: RHEL-27608 + +* Mon Aug 05 2024 Jindrich Novy - 2:5.2.0-1 +- update to https://github.com/containers/podman/releases/tag/v5.2.0 +- Related: RHEL-27608 + +* Wed Jul 10 2024 Jindrich Novy - 2:5.1.2-1 +- update to https://github.com/containers/podman/releases/tag/v5.1.2 +- Related: RHEL-27608 + +* Tue Jun 11 2024 Jindrich Novy - 2:5.1.1-1 +- update to https://github.com/containers/podman/releases/tag/v5.1.1 +- Related: RHEL-27608 + +* Mon Jun 03 2024 Jindrich Novy - 2:5.1.0-1 +- update to https://github.com/containers/podman/releases/tag/v5.1.0 +- Related: RHEL-27608 + +* Wed May 29 2024 Jindrich Novy - 2:5.0.3-1 +- update to https://github.com/containers/podman/releases/tag/v5.0.3 +- Related: RHEL-27608 + +* Tue May 07 2024 Jindrich Novy - 2:5.0.2-1 +- update to https://github.com/containers/podman/releases/tag/v5.0.2 +- Related: RHEL-27608 + +* Mon Apr 15 2024 Jindrich Novy - 2:5.0.1-2 +- Add requires to passt +- Related: RHEL-27608 + +* Sat Apr 13 2024 Jindrich Novy - 2:5.0.1-1 +- update to https://github.com/containers/podman/releases/tag/v5.0.1 +- Related: RHEL-27608 + +* Fri Mar 22 2024 Jindrich Novy - 2:5.0.0-3 +- Add missing scripts +- Related: RHEL-27608 + +* Fri Mar 22 2024 Jindrich Novy - 2:5.0.0-2 +- update to latest content of https://github.com/containers/podman/releases/tag/5.0.0 + (https://github.com/containers/podman/commit/e71ec6f1d94d2d97fb3afe08aae0d8adaf8bddf0) +- Related: RHEL-27608 + +* Wed Mar 20 2024 Jindrich Novy - 2:5.0.0-1 +- update to https://github.com/containers/podman/releases/tag/v5.0.0 +- Related: RHEL-27608 + +* Tue Mar 19 2024 Jindrich Novy - 2:4.9.4-0.2 +- update to the latest content of https://github.com/containers/podman/tree/v4.9 + (https://github.com/containers/podman/commit/3ae0197) +- Related: RHEL-27608 + +* Tue Feb 20 2024 Jindrich Novy - 2:4.9.4-0.1 +- update to the latest content of https://github.com/containers/podman/tree/v4.9 + (https://github.com/containers/podman/commit/4b69d93) +- Related: RHEL-2112 + +* Fri Feb 09 2024 Jindrich Novy - 2:4.9.3-0.1 +- update to the latest content of https://github.com/containers/podman/tree/v4.9 + (https://github.com/containers/podman/commit/b8a887c) +- Related: RHEL-2112 + * Tue Feb 06 2024 Jindrich Novy - 2:4.9.2-1 - update to the latest content of https://github.com/containers/podman/tree/v4.9 (https://github.com/containers/podman/commit/4c14019) @@ -491,9 +573,6 @@ CVE-2023-25173 CVE-2022-41724 CVE-2022-41725 CVE-2023-24537 CVE-2023-24538 CVE-2 - build and add missing docker man pages - Resolves: #2187187 -* Fri Apr 14 2023 MSVSphere Packaging Team - 2:4.4.1-9 -- Rebuilt for MSVSphere 9.2 beta - * Fri Apr 14 2023 Jindrich Novy - 2:4.4.1-9 - update to the latest content of https://github.com/containers/podman/tree/v4.4.1-rhel (https://github.com/containers/podman/commit/fd0ea3b)