diff --git a/.gitignore b/.gitignore index a9c0e39..29c71b1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ SOURCES/dnsname-18822f9.tar.gz SOURCES/gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz SOURCES/podman-machine-cni-0749884.tar.gz SOURCES/v0.1.7.tar.gz -SOURCES/v4.0-rhel-d54ecc8.tar.gz +SOURCES/v4.0-rhel-427a15f.tar.gz diff --git a/.podman.metadata b/.podman.metadata index 18ab85c..3c4b3ed 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -2,4 +2,4 @@ 0a7a599e515fe9ab844f479b7ae6cc94ddab92b0 SOURCES/gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz 70b08b173bdf0d1325fce035c186b43085865587 SOURCES/podman-machine-cni-0749884.tar.gz 94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz -6f2429965ee695f727c0e2ea94adf5aedf008d10 SOURCES/v4.0-rhel-d54ecc8.tar.gz +8665f9e442c89fa139b724aaad2d087b5de2f8c5 SOURCES/v4.0-rhel-427a15f.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 75bc99b..495e652 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -8,7 +8,7 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $ %global import_path github.com/containers/podman %global branch v4.0-rhel -%global commit0 d54ecc8c3b635ee79d60a6eb4b04bd2a046f60f0 +%global commit0 427a15fffeb9e4236a4e34946e2f4dbd73fcabad %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global cataver 0.1.7 #%%global dnsnamever 1.3.0 @@ -23,7 +23,7 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $ Epoch: 2 Name: podman Version: 4.0.2 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 and GPLv3+ URL: https://%{name}.io/ @@ -411,6 +411,11 @@ exit 0 %{_libexecdir}/%{name}/gvproxy %changelog +* Wed Jan 03 2024 Jindrich Novy - 2:4.0.2-26 +- update to the latest content of https://github.com/containers/podman/tree/v4.0-rhel + (https://github.com/containers/podman/commit/427a15f) +- Resolves: RHEL-17145 + * Sun Dec 03 2023 Lokesh Mandvekar - 2:4.0.2-25 - rebuild with golang 1.20.6+ for CVE-2023-39321 CVE-2023-29409 - Related: Jira:RHEL-4508