From c234669d408ab2c1d43b3e9a5455ac2f1e03c1af Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 13 Nov 2024 16:03:52 +0300 Subject: [PATCH] import buildah-1.37.5-1.el9_5 --- .buildah.metadata | 2 +- .gitignore | 2 +- SPECS/buildah.spec | 70 +++++++++++++++++++++++++++------------------- 3 files changed, 43 insertions(+), 31 deletions(-) diff --git a/.buildah.metadata b/.buildah.metadata index a22978b..26599fa 100644 --- a/.buildah.metadata +++ b/.buildah.metadata @@ -1 +1 @@ -d328693be61165ea79dc1d26e0a4630a2c3b241d SOURCES/release-1.33-bd85c17.tar.gz +427bc708dc556bf5be50eac881a7914ae81260cc SOURCES/buildah-1.37.5-5fd40b9.tar.gz diff --git a/.gitignore b/.gitignore index 13e1e95..2082d20 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/release-1.33-bd85c17.tar.gz +SOURCES/buildah-1.37.5-5fd40b9.tar.gz diff --git a/SPECS/buildah.spec b/SPECS/buildah.spec index 1d52ca6..6da1fc1 100644 --- a/SPECS/buildah.spec +++ b/SPECS/buildah.spec @@ -8,13 +8,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %endif %global import_path github.com/containers/buildah -%global branch release-1.33 -%global commit0 bd85c170370c85a40eb36fcb26baa7cc18236cab +#%%global branch release-1.33 +%global commit0 5fd40b989860984a00f6fc1539ff53caceca1325 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 2 Name: buildah -Version: 1.33.10 +Version: 1.37.5 Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -93,7 +93,7 @@ popd mv vendor src export GOPATH=$(pwd)/_build:$(pwd) -export BUILDTAGS="seccomp exclude_graphdriver_devicemapper selinux btrfs_noversion exclude_graphdriver_btrfs $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" +export BUILDTAGS="seccomp exclude_graphdriver_devicemapper cni selinux btrfs_noversion exclude_graphdriver_btrfs $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" export GO111MODULE=off export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.txt | sed 's,.* ,,'` @@ -135,37 +135,49 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install %{_datadir}/%{name}/test %changelog -* Thu Oct 24 2024 Jindrich Novy - 2:1.33.10-1 -- update to the latest content of https://github.com/containers/buildah/tree/release-1.33 - (https://github.com/containers/buildah/commit/bd85c17) -- Resolves: RHEL-61842 +* Mon Oct 21 2024 Jindrich Novy - 2:1.37.5-1 +- update to https://github.com/containers/buildah/releases/tag/v1.37.5 +- Resolves: RHEL-61857 -* Fri Oct 11 2024 Jindrich Novy - 2:1.33.9-1 -- update to the latest content of https://github.com/containers/buildah/tree/release-1.33 - (https://github.com/containers/buildah/commit/4dc26b9) -- Resolves: RHEL-61116 +* Mon Oct 14 2024 Jindrich Novy - 2:1.37.4-2 +- enable CNI +- Resolves: RHEL-62107 -* Tue Oct 08 2024 Jindrich Novy - 2:1.33.7-5 -- rebuild to address CVE-2024-34155 CVE-2024-34156 CVE-2024-34158 -- Resolves: RHEL-58191 RHEL-57972 RHEL-57910 +* Fri Oct 11 2024 Jindrich Novy - 2:1.37.4-1 +- update to https://github.com/containers/buildah/releases/tag/v1.37.4 +- Resolves: RHEL-61114 -* Tue Jul 23 2024 Jindrich Novy - 2:1.33.7-4 -- rebuild for CVE-2024-24783 -- Resolves: RHEL-28428 +* Mon Oct 07 2024 Jindrich Novy - 2:1.37.2-2 +- rebuild to fix CVE-2024-34156 +- Resolves: RHEL-57912 -* Fri Jun 21 2024 Jindrich Novy - 2:1.33.7-3 -- rebuild for CVE-2024-1394 -- Resolves: RHEL-24307 +* Wed Aug 21 2024 Jindrich Novy - 2:1.37.2-1 +- update to https://github.com/containers/buildah/releases/tag/v1.37.2 +- Related: RHEL-27608 -* Tue Apr 30 2024 Jindrich Novy - 2:1.33.7-2 -- update to the latest content of https://github.com/containers/buildah/tree/release-1.33 - (https://github.com/containers/buildah/commit/997beea) -- Resolves: RHEL-28731 +* Thu Aug 15 2024 Jindrich Novy - 2:1.37.1-1 +- update to https://github.com/containers/buildah/releases/tag/v1.37.1 +- Related: RHEL-27608 -* Thu Mar 21 2024 Jindrich Novy - 2:1.33.7-1 -- update to the latest content of https://github.com/containers/buildah/tree/release-1.33 - (https://github.com/containers/buildah/commit/b95e962) -- Resolves: RHEL-28230 +* Mon Jul 29 2024 Jindrich Novy - 2:1.37.0-1 +- update to https://github.com/containers/buildah/releases/tag/v1.37.0 +- Resolves: RHEL-47164 RHEL-40808 + +* Wed May 29 2024 Jindrich Novy - 2:1.36.0-1 +- update to https://github.com/containers/buildah/releases/tag/v1.36.0 +- Related: RHEL-27608 + +* Wed Mar 27 2024 Jindrich Novy - 2:1.35.2-1 +- update to https://github.com/containers/buildah/releases/tag/v1.35.2 +- Related: RHEL-27608 + +* Tue Mar 19 2024 Jindrich Novy - 2:1.35.1-1 +- update to https://github.com/containers/buildah/releases/tag/v1.35.1 +- Related: RHEL-27608 + +* Fri Mar 15 2024 Jindrich Novy - 2:1.35.0-1 +- update to https://github.com/containers/buildah/releases/tag/v1.35.0 +- Resolves: RHEL-29278 * Mon Feb 26 2024 Jindrich Novy - 2:1.33.6-2 - update tags for systemd libsubid