diff --git a/.gitignore b/.gitignore index b035656..22c94c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/dnsname-18822f9.tar.gz SOURCES/gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz SOURCES/v0.1.7.tar.gz -SOURCES/v4.6.1-rhel-ea33dce.tar.gz +SOURCES/v4.6.1-rhel-68e7ae0.tar.gz diff --git a/.podman.metadata b/.podman.metadata index e287e7f..46c36ad 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 94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz -8e58dc5c5e8bd62de73922556806d1b4ce7fd35d SOURCES/v4.6.1-rhel-ea33dce.tar.gz +cd8ecc90e1b6bdf9d968c3c93a56dfd71c79c65b SOURCES/v4.6.1-rhel-68e7ae0.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 47babcb..b8e1616 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 v4.6.1-rhel -%global commit0 ea33dce70f1b9d6f60faa405f57ed791a89cd751 +%global commit0 68e7ae09d941e31d8f234af6a9534866b31aa141 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global cataver 0.1.7 #%%global dnsnamever 1.3.0 @@ -18,7 +18,7 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $ Epoch: 2 Name: podman Version: 4.6.1 -Release: 5%{?dist} +Release: 7%{?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/ @@ -38,7 +38,7 @@ Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} Provides: %{name}-catatonit = %{epoch}:%{version}-%{release} Obsoletes: %{name}-catatonit < 2:4.4.0 BuildRequires: gettext -BuildRequires: golang >= 1.17.5 +BuildRequires: golang >= 1.20.10 BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static @@ -396,6 +396,18 @@ fi %{_libexecdir}/%{name}/gvproxy %changelog +* Sat Dec 02 2023 Lokesh Mandvekar - 2:4.6.1-7 +- Rebuild for following CVEs: + CVE-2023-39318 CVE-2023-39319 CVE-2023-39321 CVE-2023-39322 CVE-2023-29409 +- Related: Jira:RHEL-2785 +- Related: Jira:RHEL-7452 + +* Fri Sep 29 2023 Jindrich Novy - 2:4.6.1-6 +- update to the latest content of https://github.com/containers/podman/tree/v4.6.1-rhel + (https://github.com/containers/podman/commit/68e7ae0) +- Related: Jira:RHEL-2785 +- Related: Jira:RHEL-7452 + * Fri Aug 25 2023 Jindrich Novy - 2: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/ea33dce)