From beb68aae38d1888805d65be63a6d4236247e2318 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Tue, 30 Apr 2024 15:24:39 +0800 Subject: [PATCH 1/2] update to buildah-1.24.7-1.src.rpm Signed-off-by: Zhao Hang --- buildah.spec | 13 ++++++------- download | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/buildah.spec b/buildah.spec index 7fdd938..43e2a74 100644 --- a/buildah.spec +++ b/buildah.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 %global _find_debuginfo_dwz_opts %{nil} %global _dwz_low_mem_die_limit 0 @@ -13,18 +12,17 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %global import_path github.com/containers/buildah %global branch release-1.24 -%global commit0 60e6bc0f7338b4b7a0ec044f75f8dd3ba0fa58fb +%global commit0 f022e588710256d2e65ea158d440ea8da2ddcd92 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 1 Name: buildah -Version: 1.24.6 -Release: 7%{anolis_release}%{?dist} +Version: 1.24.7 +Release: 1%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures -ExcludeArch: loongarch64 ExclusiveArch: %{go_arches} %if 0%{?branch:1} Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz @@ -131,8 +129,9 @@ rm -f %{buildroot}%{_mandir}/man5/Containerfile* %{_datadir}/%{name}/test %changelog -* Thu Jan 11 2024 Liwei Ge - 1:1.24.6-7.0.1 -- disable loongarch64 build +* Thu Apr 04 2024 Lokesh Mandvekar - 1:1.24.7-1 +- bump to v1.24.7 +- Resolves: RHEL-26767 * Mon Aug 28 2023 Jindrich Novy - 1:1.24.6-7 - rebuild for CVE-2023-29406 diff --git a/download b/download index 855cd50..5a60d33 100644 --- a/download +++ b/download @@ -1 +1 @@ -ed158d663d536aa66c24bc8f2b4f60dc release-1.24-60e6bc0.tar.gz +e7af527f5c393af1ecbe49deec48da81 release-1.24-f022e58.tar.gz -- Gitee From c6a13b56723c3d51dbc82b1e259c6d10a718ed4f Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Mon, 24 Jul 2023 15:04:37 +0800 Subject: [PATCH 2/2] disable loongarch64 build --- buildah.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/buildah.spec b/buildah.spec index 43e2a74..e243d91 100644 --- a/buildah.spec +++ b/buildah.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %global _find_debuginfo_dwz_opts %{nil} %global _dwz_low_mem_die_limit 0 @@ -18,11 +19,12 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Epoch: 1 Name: buildah Version: 1.24.7 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures +ExcludeArch: loongarch64 ExclusiveArch: %{go_arches} %if 0%{?branch:1} Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz @@ -129,6 +131,9 @@ rm -f %{buildroot}%{_mandir}/man5/Containerfile* %{_datadir}/%{name}/test %changelog +* Tue Apr 30 2024 Liwei Ge - 1:1.24.7-1.0.1 +- disable loongarch64 build + * Thu Apr 04 2024 Lokesh Mandvekar - 1:1.24.7-1 - bump to v1.24.7 - Resolves: RHEL-26767 -- Gitee