From ebc619cc47eeb64cc349fe2e12a3ee7291d4f333 Mon Sep 17 00:00:00 2001 From: Renbo Date: Wed, 6 Nov 2024 14:52:25 +0800 Subject: [PATCH 1/2] [CVE] update to delve-1.22.1-1.src.rpm to #11663 update to delve-1.22.1-1.src.rpm Project: TC2024080204 Signed-off-by: Renbo --- delve.spec | 32 ++++++++++++-------------------- download | 2 +- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/delve.spec b/delve.spec index 1b3e473..9b2c37c 100644 --- a/delve.spec +++ b/delve.spec @@ -1,18 +1,17 @@ -%define anolis_release .0.1 %ifarch ppc64le %global exp "-tags=exp.linuxppc64le" %endif Name: delve -Version: 1.21.2 -Release: 4%{anolis_release}%{?dist} +Version: 1.22.1 +Release: 1%{?dist} Summary: A debugger for the Go programming language License: MIT URL: https://github.com/go-delve/delve Source0: https://github.com/go-delve/delve/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -ExcludeArch: s390x %{ix86} armv7hl loongarch64 +ExcludeArch: s390x %{ix86} armv7hl BuildRequires: compiler(go-compiler) BuildRequires: git @@ -56,16 +55,12 @@ install -Dpm 0755 bin/dlv %{buildroot}%{_bindir}/dlv %check -# Temporary - FIXME -# Buildroot Go is not compatible with this version of delve tests. -# We'll have to rely on downstream QE tests until delve 1.22 -# lands in the buildroot. -#export GO111MODULE=off -#export GOPATH="%{_builddir}/%{name}-%{version}/_build" -#cd "_build/src/github.com/go-delve/%{name}" -#for d in $(go list %{?exp} ./... | grep -v cmd | grep -v scripts); do -# go test %{?exp} ${d} -#done +export GO111MODULE=off +export GOPATH="%{_builddir}/%{name}-%{version}/_build" +cd "_build/src/github.com/go-delve/%{name}" +for d in $(go list %{?exp} ./... | grep -v cmd | grep -v scripts); do + go test %{?exp} ${d} +done %files @@ -76,12 +71,9 @@ install -Dpm 0755 bin/dlv %{buildroot}%{_bindir}/dlv %changelog -* Tue Sep 24 2024 Liwei Ge - 1.21.2-4.0.1 -- Exclude loongarch64 - -* Wed Sep 18 2024 David Benoit - 1.21.2-4 -- Skip tests in %check due to incompatible Go version in buildroot (temporary). -- Resolves: RHEL-59518 +* Fri Aug 16 2024 Alejandro Sáez - 1.22.1-1 +- Rebase to 1.22.1 +- Resolves: RHEL-54307 * Wed Jan 31 2024 Alejandro Sáez - 1.21.2-3 - Skip an additional test as it's breaking in the CI system. diff --git a/download b/download index 68fa310..8150c71 100644 --- a/download +++ b/download @@ -1 +1 @@ -e438e6b33b7fbdf8ab6a4f884d289b5a delve-1.21.2.tar.gz +288b9e6caf74855e9c2bb9dcc9f4d317 delve-1.22.1.tar.gz -- Gitee From f034fb882c8d9050c37cf38793caa85d4a9e7aa3 Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Wed, 2 Nov 2022 10:16:38 +0800 Subject: [PATCH 2/2] spec: exclude loongarch64 --- delve.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/delve.spec b/delve.spec index 9b2c37c..4f73918 100644 --- a/delve.spec +++ b/delve.spec @@ -1,17 +1,18 @@ +%define anolis_release .0.1 %ifarch ppc64le %global exp "-tags=exp.linuxppc64le" %endif Name: delve Version: 1.22.1 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} Summary: A debugger for the Go programming language License: MIT URL: https://github.com/go-delve/delve Source0: https://github.com/go-delve/delve/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -ExcludeArch: s390x %{ix86} armv7hl +ExcludeArch: s390x %{ix86} armv7hl loongarch64 BuildRequires: compiler(go-compiler) BuildRequires: git @@ -71,6 +72,9 @@ done %changelog +* Wed Nov 06 2024 Liwei Ge - 1.22.1-1.0.1 +- Exclude loongarch64 + * Fri Aug 16 2024 Alejandro Sáez - 1.22.1-1 - Rebase to 1.22.1 - Resolves: RHEL-54307 -- Gitee