From 9366d21934fbeb26956424e576d3c5038c08418e Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Tue, 8 Jul 2025 02:39:55 +0000
Subject: [PATCH] import UBI podman-5.4.0-12.el9_6

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

diff --git a/.gitignore b/.gitignore
index 16ffea9..5064fe6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 SOURCES/dnsname-bdc4ab8.tar.gz
 SOURCES/v0.1.7.tar.gz
-SOURCES/v5.4-rhel-0ee1d49.tar.gz
+SOURCES/v5.4-rhel-9811294.tar.gz
diff --git a/.podman.metadata b/.podman.metadata
index 8070e25..5062bf5 100644
--- a/.podman.metadata
+++ b/.podman.metadata
@@ -1,3 +1,3 @@
 69fb828d3028f968e46420d58cc80bc59e446051 SOURCES/dnsname-bdc4ab8.tar.gz
 94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz
-747b2af5cad7b48b9f055d8d3c2e898fd87201ab SOURCES/v5.4-rhel-0ee1d49.tar.gz
+9c2a48b83cb16b46babdc2acc505c89768c125e1 SOURCES/v5.4-rhel-9811294.tar.gz
diff --git a/SPECS/podman.spec b/SPECS/podman.spec
index 587a9c2..c8407e7 100644
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@@ -5,7 +5,7 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $
 
 %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 cataver 0.1.7
 %global commit_dnsname bdc4ab85266ade865a7c398336e98721e62ef6b2
@@ -14,7 +14,7 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $
 Epoch: 5
 Name: podman
 Version: 5.4.0
-Release: 10%{?dist}
+Release: 12%{?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/
@@ -370,6 +370,18 @@ fi
 %{_datadir}/%{name}/test
 
 %changelog
+* Wed Jun 25 2025 Jindrich Novy <jnovy@redhat.com> - 5: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-9.6.z]"
+- Resolves: RHEL-96708
+
+* Tue Jun 24 2025 Jindrich Novy <jnovy@redhat.com> - 5: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-9.6.z]"
+- Resolves: RHEL-96917
+
 * Wed Jun 04 2025 Jindrich Novy <jnovy@redhat.com> - 5: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-90055