From a0bee10c8cd7ea6bcfc94e79ad2e4567d6e4b3c8 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 13 Nov 2024 16:16:48 +0300 Subject: [PATCH] import podman-5.2.2-1.el9 --- .gitignore | 2 +- .podman.metadata | 2 +- SPECS/podman.spec | 173 +++++++++++++++++++--------------------------- 3 files changed, 75 insertions(+), 102 deletions(-) diff --git a/.gitignore b/.gitignore index 10611be..9f2fa81 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ SOURCES/dnsname-bdc4ab8.tar.gz +SOURCES/podman-5.2.2-fcee481.tar.gz SOURCES/v0.1.7.tar.gz -SOURCES/v4.9-rhel-70e4d02.tar.gz diff --git a/.podman.metadata b/.podman.metadata index 6e937ae..2e4ab6b 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -1,3 +1,3 @@ 69fb828d3028f968e46420d58cc80bc59e446051 SOURCES/dnsname-bdc4ab8.tar.gz +17ac9b76dd3924b8a5c63a9860b915627f48ac63 SOURCES/podman-5.2.2-fcee481.tar.gz 94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz -6a76e90c911dc8fc5595459fcd9271b5bb673af6 SOURCES/v4.9-rhel-70e4d02.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index d492c50..5c8b6d7 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -4,17 +4,17 @@ 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-rhel -%global commit0 70e4d02dbd57bf7980a33e722d868dc1c6bcbb72 +#%%global branch v4.9 +%global commit0 fcee48106a12dd531702d729d17f40f6e152027f %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global cataver 0.1.7 %global commit_dnsname bdc4ab85266ade865a7c398336e98721e62ef6b2 %global shortcommit_dnsname %(c=%{commit_dnsname}; echo ${c:0:7}) -Epoch: 4 +Epoch: 2 Name: podman -Version: 4.9.4 -Release: 16%{?dist} +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 URL: https://%{name}.io/ @@ -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,101 +365,67 @@ fi %{_datadir}/%{name}/test %changelog -* Fri Nov 01 2024 Jindrich Novy - 4:4.9.4-16 -- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel - (https://github.com/containers/podman/commit/70e4d02) -- Resolves: RHEL-65451 - -* Tue Oct 29 2024 Jindrich Novy - 4:4.9.4-15 -- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel - (https://github.com/containers/podman/commit/1866072) -- Resolves: RHEL-61868 - -* Thu Oct 24 2024 Jindrich Novy - 4:4.9.4-14 -- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel - (https://github.com/containers/podman/commit/235a22c) -- Resolves: RHEL-61154 - -* Fri Oct 11 2024 Jindrich Novy - 4:4.9.4-13 -- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel - (https://github.com/containers/podman/commit/6cf9920) -- Resolves: RHEL-60964 - -* Tue Oct 08 2024 Jindrich Novy - 4:4.9.4-12 -- rebuild to address CVE-2024-34155 CVE-2024-34156 CVE-2024-34158 -- Resolves: RHEL-57980 RHEL-57950 RHEL-58203 - -* Thu Aug 29 2024 Jindrich Novy - 4:4.9.4-11 -- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel - (https://github.com/containers/podman/commit/e3221b5) -- Resolves: RHEL-56327 RHEL-50231 - -* Thu Aug 08 2024 Jindrich Novy - 4:4.9.4-10 -- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel - (https://github.com/containers/podman/commit/6b45bb1) -- Resolves: RHEL-53250 - -* Thu Jul 25 2024 Jindrich Novy - 4:4.9.4-9 -- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel - (https://github.com/containers/podman/commit/1a2d8e3) -- Resolves: RHEL-50507 - -* Mon Jul 22 2024 Jindrich Novy - 4:4.9.4-8 -- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel - (https://github.com/containers/podman/commit/affa589) -- Resolves: RHEL-45916 - -* Thu Jul 18 2024 Jindrich Novy - 4:4.9.4-7 -- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel - (https://github.com/containers/podman/commit/8fa0c76) -- Resolves: RHEL-40804 - -* Mon Jul 01 2024 Jindrich Novy - 4:4.9.4-6 -- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel - (https://github.com/containers/podman/commit/b699052) -- Resolves: RHEL-45531 - -* Fri Jun 21 2024 Jindrich Novy - 4:4.9.4-5 -- rebuild for CVE-2024-1394 -- Resolves: RHEL-40793 - -* Tue Apr 30 2024 Jindrich Novy - 4:4.9.4-4 -- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel - (https://github.com/containers/podman/commit/4afc71a) -- Resolves: RHEL-28735 - -* Mon Apr 15 2024 Jindrich Novy - 4:4.9.4-3 -- rebuild -- Related: RHEL-28234 - -* Wed Apr 03 2024 Lokesh Mandvekar - 4:4.9.4-2 -- bump Epoch to 4 to preserve upgrade path from rhel 8.10 -- bump release tag or else it refuses to build -- Resolves: RHEL-28234 - -* Wed Apr 03 2024 Lokesh Mandvekar - 4:4.9.4-1 -- bump Epoch to 4 to preserve upgrade path from rhel 8.10 -- Resolves: RHEL-28234 - -* Mon Apr 01 2024 Lokesh Mandvekar - 3:4.9.4-1 -- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel - (https://github.com/containers/podman/commit/7752c56) -- Resolves: RHEL-28234 - -* Tue Mar 19 2024 Jindrich Novy - 3:4.9.3-3 -- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel - (https://github.com/containers/podman/commit/5f872ae) -- Resolves: RHEL-28234 - -* Thu Mar 14 2024 Jindrich Novy - 3:4.9.3-2 -- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel - (https://github.com/containers/podman/commit/06e4598) -- Resolves: RHEL-28636 - -* Fri Mar 08 2024 Jindrich Novy - 2:4.9.3-1 -- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel - (https://github.com/containers/podman/commit/c82fdc8) -- Resolves: RHEL-28633 RHEL-28629 +* 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