From d14ed567b1276a0e6d66e76e798bfc27b2cff7a8 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Tue, 8 Jul 2025 04:50:27 +0000
Subject: [PATCH] import UBI podman-5.4.0-12.el10_0

---
 .gitignore  |  2 +-
 podman.spec | 16 ++++++++++++++--
 sources     |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0cf2540..bd386f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-v5.4-rhel-0ee1d49.tar.gz
+v5.4-rhel-9811294.tar.gz
diff --git a/podman.spec b/podman.spec
index 74dabbc..05888fa 100644
--- a/podman.spec
+++ b/podman.spec
@@ -9,7 +9,7 @@
 
 %global import_path github.com/containers/podman
 %global branch v5.4-rhel
-%global commit0 0ee1d4919a9686efb3b09842c8d960c1a5ecb2f1
+%global commit0 981129454d9d78920daccc7f8fcf9bf99000695e
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 %global gomodulesmode GO111MODULE=on
@@ -63,7 +63,7 @@ Epoch: 6
 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: 10%{?dist}
+Release: 12%{?dist}
 %if %{defined golang_arches_future}
 ExclusiveArch: %{golang_arches_future}
 %else
@@ -390,6 +390,18 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name}
 %endif
 
 %changelog
+* Wed Jun 25 2025 Jindrich Novy <jnovy@redhat.com> - 6:5.4.0-12
+- update to the latest content of https://github.com/containers/podman/tree/v5.4-rhel
+  (https://github.com/containers/podman/commit/9811294)
+- fixes "CVE-2025-6032 podman: podman missing TLS verification [rhel-10.0.z]"
+- Resolves: RHEL-96698
+
+* Tue Jun 24 2025 Jindrich Novy <jnovy@redhat.com> - 6:5.4.0-11
+- update to the latest content of https://github.com/containers/podman/tree/v5.4-rhel
+  (https://github.com/containers/podman/commit/f944b21)
+- fixes "Terminate healthcheck command upon reaching timeout. [rhel-10.0.z]"
+- Resolves: RHEL-96916
+
 * Wed Jun 04 2025 Jindrich Novy <jnovy@redhat.com> - 6:5.4.0-10
 - rebuild to fix CVE-2025-22871 podman: Request smuggling due to acceptance of invalid chunked data in net/http
 - Resolves: RHEL-90011
diff --git a/sources b/sources
index d8aef9e..397add3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v5.4-rhel-0ee1d49.tar.gz) = e2cd3b181fc362ed1ed6318350ba4e9f465128e9042f97d04a9ae25deed66780997b7b212cc412ea0f063fc5a72cd6b40704b946985fe2c7982105c05a347767
+SHA512 (v5.4-rhel-9811294.tar.gz) = b986b5985a432fcb3a53403cff619694e27ed0ca083fe5f3d2570b338c5781f5fc8f9e2376f7af5dae296501b18c0be68149daff40022077e6c6044a9e887f64