From 0b7a49914928e0340d35895b2f105629e0d369f3 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 22 May 2024 13:51:15 +0000 Subject: [PATCH] import CS podman-4.9.4-1.module_el8+1003+5b9162bd --- .gitignore | 4 +-- .podman.metadata | 4 +-- SPECS/podman.spec | 88 ++++++++++++++++++++++++++++++++--------------- 3 files changed, 64 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 074e4cf..59a2510 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -SOURCES/dnsname-18822f9.tar.gz +SOURCES/dnsname-bdc4ab8.tar.gz SOURCES/gvisor-tap-vsock-97028a6a6d6af2f26680f4fdf9dd15323de07804.tar.gz SOURCES/v0.1.7.tar.gz -SOURCES/v4.6.1-rhel-22c2308.tar.gz +SOURCES/v4.9-rhel-7752c56.tar.gz diff --git a/.podman.metadata b/.podman.metadata index edc6f26..688c39f 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -1,4 +1,4 @@ -00c35447384f51ccc2360965b80868fc91293711 SOURCES/dnsname-18822f9.tar.gz +69fb828d3028f968e46420d58cc80bc59e446051 SOURCES/dnsname-bdc4ab8.tar.gz 1b106798490bad6a68b4b0338354412c335eb948 SOURCES/gvisor-tap-vsock-97028a6a6d6af2f26680f4fdf9dd15323de07804.tar.gz 94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz -6b6ef54316d1a2693d56ba151f388d1314b3a6af SOURCES/v4.6.1-rhel-22c2308.tar.gz +e203f66fd0fdfbfd1c8efc9a1e1ba4c029a7d5ff SOURCES/v4.9-rhel-7752c56.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index fd992c1..819a0ad 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -7,21 +7,20 @@ 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 v4.6.1-rhel -%global commit0 22c230846c6a5a48968b1880398e99892b060cc3 +%global branch v4.9-rhel +%global commit0 7752c56006f06fc608bf40a12ceb564ab6b045c9 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global cataver 0.1.7 -#%%global dnsnamever 1.3.0 -%global commit_dnsname 18822f9a4fb35d1349eb256f4cd2bfd372474d84 +%global commit_dnsname bdc4ab85266ade865a7c398336e98721e62ef6b2 %global shortcommit_dnsname %(c=%{commit_dnsname}; echo ${c:0:7}) %global gvproxyrepo gvisor-tap-vsock %global gvproxyver 0.7.1 %global commit_gvproxy 97028a6a6d6af2f26680f4fdf9dd15323de07804 -Epoch: 3 +Epoch: 4 Name: podman -Version: 4.6.1 -Release: 9%{?dist} +Version: 4.9.4 +Release: 1%{?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 +38,7 @@ ExclusiveArch: %{go_arches} Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} BuildRequires: %{_bindir}/envsubst -BuildRequires: golang >= 1.20.6 +BuildRequires: golang >= 1.17.7 BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static @@ -423,27 +422,60 @@ fi %{_libexecdir}/%{name}/gvproxy %changelog -* Wed Apr 17 2024 Jindrich Novy - 3:4.6.1-9 +* Mon Apr 01 2024 Lokesh Mandvekar - 4:4.9.4-1 +- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel + (https://github.com/containers/podman/commit/7752c56) +- Resolves: RHEL-28225 + +* Tue Mar 19 2024 Jindrich Novy - 4:4.9.3-2 +- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel + (https://github.com/containers/podman/commit/5f872ae) +- Resolves: RHEL-28225 + +* Wed Mar 13 2024 Jindrich Novy - 3:4.9.3-1 +- update to the latest content of https://github.com/containers/podman/tree/v4.9-rhel + (https://github.com/containers/podman/commit/06e4598) +- Resolves: RHEL-28632 RHEL-28628 RHEL-28803 + +* Tue Feb 20 2024 Jindrich Novy - 3:4.9.4-0.1 +- update to the latest content of https://github.com/containers/podman/tree/v4.9 + (https://github.com/containers/podman/commit/4b69d93) +- Related: Jira:RHEL-2110 + +* Tue Feb 06 2024 Jindrich Novy - 3:4.9.2-1 +- update to the latest content of https://github.com/containers/podman/tree/v4.9 + (https://github.com/containers/podman/commit/4c14019) +- Related: Jira:RHEL-2110 + +* Fri Feb 02 2024 Jindrich Novy - 3:4.9.1-1 +- switch to v4.9.1-rhel branch +- update dnsname to the latest commit +- Related: Jira:RHEL-2110 + +* Tue Jan 23 2024 Jindrich Novy - 3:4.9.0-1 +- update to https://github.com/containers/podman/releases/tag/v4.9.0 +- Related: Jira:RHEL-2110 + +* Fri Jan 05 2024 Jindrich Novy - 3:4.8.3-1 +- update to https://github.com/containers/podman/releases/tag/v4.8.3 +- Related: Jira:RHEL-2110 + +* Tue Jan 02 2024 Jindrich Novy - 3:4.8.2-1 +- update to https://github.com/containers/podman/releases/tag/v4.8.2 +- Related: Jira:RHEL-2110 + +* Thu Dec 07 2023 Lokesh Mandvekar - 3:4.8.1-1 +- update to https://github.com/containers/podman/releases/tag/v4.8.1 +- Related: Jira:RHEL-2110 + +* Fri Nov 10 2023 Jindrich Novy - 3:4.7.2-1 +- update to https://github.com/containers/podman/releases/tag/v4.7.2 +- Related: Jira:RHEL-2110 + +* Fri Sep 29 2023 Jindrich Novy - 3:4.6.1-5 - update to the latest content of https://github.com/containers/podman/tree/v4.6.1-rhel - (https://github.com/containers/podman/commit/22c2308) -- Resolves: RHEL-26763 - -* 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 04 2023 Lokesh Mandvekar - 3:4.6.1-5 -- Rebuild with golang 1.20.10 for CVE-2023-39321 -- Related: Jira:RHEL-4515 + (https://github.com/containers/podman/commit/68e7ae0) +- Related: Jira:RHEL-2110 * 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