From b23fbdc13be59a847924fe3a619d2a51ca04879e Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 15 Sep 2025 12:32:39 +0000 Subject: [PATCH] import CS podman-5.6.0-2.el9 --- .gitignore | 2 +- .podman.metadata | 2 +- SPECS/podman.spec | 96 ++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 85 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index f26f430..d58cf0f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ SOURCES/dnsname-bdc4ab8.tar.gz -SOURCES/podman-5.4.0-f9f7d48.tar.gz SOURCES/v0.1.7.tar.gz +SOURCES/v5.6-rhel-56f1962.tar.gz diff --git a/.podman.metadata b/.podman.metadata index c65619d..74709ae 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -1,3 +1,3 @@ 69fb828d3028f968e46420d58cc80bc59e446051 SOURCES/dnsname-bdc4ab8.tar.gz -3efdca2402c3a17a4515b117076d6c1f9f75b964 SOURCES/podman-5.4.0-f9f7d48.tar.gz 94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz +4c12cd3e799fb5d5b218d99ba2968b22660901c0 SOURCES/v5.6-rhel-56f1962.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 68b7f5d..e0684e8 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 v5.4-rhel -%global commit0 f9f7d48b24b1ca4403f189caaeab1cb8ff4a9aa2 +%global branch v5.6-rhel +%global commit0 56f1962fb0af60c29c7c5d27bdb4f26b13e69afe %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: 5 +Epoch: 6 Name: podman -Version: 5.4.0 -Release: 1%{?dist} +Version: 5.6.0 +Release: 2%{?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/ @@ -43,7 +43,7 @@ BuildRequires: libassuan-devel BuildRequires: libgpg-error-devel BuildRequires: libseccomp-devel BuildRequires: libselinux-devel -BuildRequires: ostree-devel +BuildRequires: sqlite-devel BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd @@ -127,7 +127,8 @@ file. Each CNI network will have its own dnsmasq instance. %package tests Summary: Tests for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} -#Requires: bats (which RHEL8 doesn't have. If it ever does, un-comment this) +# Fetch bats rpm if you can, else install any way available +Recommends: bats Requires: nmap-ncat Requires: httpd-tools Requires: jq @@ -137,11 +138,13 @@ Requires: openssl Requires: buildah Requires: gnupg Requires: git-daemon +Recommends: slirp4netns %description tests %{summary} -This package contains system tests for %{name} +This package contains system tests for %{name}. Only intended to be used for +gating tests. Not supported for end users / customers. %prep %if 0%{?branch:1} @@ -209,19 +212,23 @@ LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)" # build rootlessport %gobuild -o bin/rootlessport %{import_path}/cmd/rootlessport -export BUILDTAGS="cni seccomp btrfs_noversion exclude_graphdriver_devicemapper exclude_graphdriver_btrfs $(hack/libdm_tag.sh) $(hack/selinux_tag.sh) $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" +export BASEBUILDTAGS="cni seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh) libsqlite3 grpcnotrace" + +export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh)" %gobuild -o bin/%{name} %{import_path}/cmd/%{name} -# build %%{name}-testing -%gobuild -o bin/podman-testing %{import_path}/cmd/podman-testing - # build %%{name}-remote -export BUILDTAGS="remote $BUILDTAGS" +export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs remote" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} # build quadlet +export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh)" %gobuild -o bin/quadlet %{import_path}/cmd/quadlet +# build %%{name}-testing +export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh)" +%gobuild -o bin/podman-testing %{import_path}/cmd/podman-testing + %{__make} docs %{__make} docker-docs @@ -370,6 +377,69 @@ fi %{_datadir}/%{name}/test %changelog +* Fri Aug 22 2025 Jindrich Novy - 5:5.6.0-2 +- update to the latest content of https://github.com/containers/podman/tree/v5.6-rhel + (https://github.com/containers/podman/commit/56f1962) +- fixes "Work on RHEL 9.7 packaging" +- Related: RHEL-80816 + +* Wed Aug 20 2025 Jindrich Novy - 5:5.6.1-0.1 +- update to the latest content of https://github.com/containers/podman/tree/v5.6 + (https://github.com/containers/podman/commit/d46b857) +- fixes "Work on RHEL 9.7 packaging" +- Related: RHEL-80816 + +* Mon Aug 18 2025 Jindrich Novy - 5:5.6.0-1 +- update to https://github.com/containers/podman/releases/tag/v5.6.0 +- Related: RHEL-80816 + +* Thu Jul 03 2025 Jindrich Novy - 5:5.5.2-1 +- update to https://github.com/containers/podman/releases/tag/v5.5.2 +- Related: RHEL-80816 + +* Tue Jun 10 2025 Jindrich Novy - 5:5.5.1-1 +- update to https://github.com/containers/podman/releases/tag/v5.5.1 +- Related: RHEL-80816 + +* Thu May 08 2025 Lokesh Mandvekar - 5:5.4.0-8 +- Enable gating tests via TMT +- Related: RHEL-80816 + +* Fri Apr 25 2025 Jindrich Novy - 5:5.4.0-7 +- update to the latest content of https://github.com/containers/podman/tree/v5.4-rhel + (https://github.com/containers/podman/commit/0ee1d49) +- fixes "podman tests are failing - [RHEL-10.1.GA]" +- Resolves: RHEL-88191 + +* Mon Apr 07 2025 Jindrich Novy - 5:5.4.0-6 +- update to the latest content of https://github.com/containers/podman/tree/v5.4-rhel + (https://github.com/containers/podman/commit/a994a04) +- fixes "podman tests are failing" +- Resolves: RHEL-86200 + +* Tue Mar 18 2025 Jindrich Novy - 5:5.4.0-5 +- update to the latest content of https://github.com/containers/podman/tree/v5.4-rhel + (https://github.com/containers/podman/commit/9ad4842) +- fixes "Work on RHEL 9.7 packaging" +- Related: RHEL-80816 + +* Fri Mar 14 2025 Jindrich Novy - 5:5.4.0-4 +- update to the latest content of https://github.com/containers/podman/tree/v5.4-rhel + (https://github.com/containers/podman/commit/9d2e54f) +- fixes "Excessive memory leak due to uncontrolled accumulation of health.log entries in Podman 5.x" +- Resolves: RHEL-83262 + +* Thu Mar 13 2025 Jindrich Novy - 5:5.4.0-3 +- update to the latest content of https://github.com/containers/podman/tree/v5.4-rhel + (https://github.com/containers/podman/commit/45c2d1f) +- fixes "CVE-2025-27144 podman: Go JOSE's Parsing Vulnerable to Denial of Service [rhel-9.7]" +- Resolves: RHEL-80615 + +* Fri Mar 07 2025 Jindrich Novy - 5:5.4.0-2 +- update to the latest content of https://github.com/containers/podman/tree/v5.4-rhel + (https://github.com/containers/podman/commit/5e3accd) +- Related: RHEL-80816 + * Wed Feb 12 2025 Jindrich Novy - 5:5.4.0-1 - update to https://github.com/containers/podman/releases/tag/v5.4.0 - Related: RHEL-60277