From b0a5e7ed4922ec44822466704b131d818660a543 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 9 Feb 2024 03:08:47 +0300 Subject: [PATCH] import podman-4.6.1-8.module+el8.9.0+21243+a586538b --- .gitignore | 4 ++-- .podman.metadata | 4 ++-- SPECS/podman.spec | 29 +++++++++++++++++++++++------ 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index b035656..cfd1272 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/dnsname-18822f9.tar.gz -SOURCES/gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz +SOURCES/gvisor-tap-vsock-97028a6a6d6af2f26680f4fdf9dd15323de07804.tar.gz SOURCES/v0.1.7.tar.gz -SOURCES/v4.6.1-rhel-ea33dce.tar.gz +SOURCES/v4.6.1-rhel-227b84e.tar.gz diff --git a/.podman.metadata b/.podman.metadata index e287e7f..2d234cd 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -1,4 +1,4 @@ 00c35447384f51ccc2360965b80868fc91293711 SOURCES/dnsname-18822f9.tar.gz -0a7a599e515fe9ab844f479b7ae6cc94ddab92b0 SOURCES/gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz +1b106798490bad6a68b4b0338354412c335eb948 SOURCES/gvisor-tap-vsock-97028a6a6d6af2f26680f4fdf9dd15323de07804.tar.gz 94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz -8e58dc5c5e8bd62de73922556806d1b4ce7fd35d SOURCES/v4.6.1-rhel-ea33dce.tar.gz +ac95107b16ae4f2d9ac9ee9fe69c336a01f6e721 SOURCES/v4.6.1-rhel-227b84e.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 616d717..337b701 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -8,20 +8,20 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $ %global import_path github.com/containers/podman %global branch v4.6.1-rhel -%global commit0 ea33dce70f1b9d6f60faa405f57ed791a89cd751 +%global commit0 227b84e26d5526dc4f4b3b2dba81610c0db8932c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global cataver 0.1.7 #%%global dnsnamever 1.3.0 %global commit_dnsname 18822f9a4fb35d1349eb256f4cd2bfd372474d84 %global shortcommit_dnsname %(c=%{commit_dnsname}; echo ${c:0:7}) %global gvproxyrepo gvisor-tap-vsock -%global gvproxyver 0.6.1 -%global commit_gvproxy 407efb5dcdb0f4445935f7360535800b60447544 +%global gvproxyver 0.7.1 +%global commit_gvproxy 97028a6a6d6af2f26680f4fdf9dd15323de07804 Epoch: 3 Name: podman Version: 4.6.1 -Release: 4%{?dist} +Release: 8%{?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/ @@ -39,7 +39,7 @@ ExclusiveArch: %{go_arches} Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} BuildRequires: %{_bindir}/envsubst -BuildRequires: golang >= 1.17.7 +BuildRequires: golang >= 1.20.6 BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static @@ -423,9 +423,26 @@ fi %{_libexecdir}/%{name}/gvproxy %changelog -* Mon Dec 11 2023 MSVSphere Packaging Team - 3:4.6.1-4 +* Tue Jan 23 2024 Jindrich Novy - 3:4.6.1-8 +- Make the module buildable again +- Resolves: RHEL-16299 + +* Fri Jan 19 2024 Jindrich Novy - 3:4.6.1-7 +- update to the latest content of https://github.com/containers/podman/tree/v4.6.1-rhel + (https://github.com/containers/podman/commit/227b84e) +- Resolves: RHEL-20910 + +* Thu Jan 18 2024 Jindrich Novy - 3:4.6.1-6 +- Update gvproxy to be rebuildable with newer versions of golang +- Related: RHEL-19138 + +* Mon Dec 11 2023 MSVSphere Packaging Team - 3:4.6.1-5 - Rebuilt for MSVSphere 8.8 +* Mon Dec 04 2023 Lokesh Mandvekar - 3:4.6.1-5 +- Rebuild with golang 1.20.10 for CVE-2023-39321 +- Related: Jira:RHEL-4515 + * Fri Aug 25 2023 Jindrich Novy - 3:4.6.1-4 - update to the latest content of https://github.com/containers/podman/tree/v4.6.1-rhel (https://github.com/containers/podman/commit/ea33dce)