commit ae506b33ae52e4a74743ef6d08b809c4c9e7c609 Author: MSVSphere Packaging Team Date: Wed Apr 3 15:40:49 2024 +0300 import delve-1.21.2-3.module+el8.10.0+21244+5b2d9000 diff --git a/.delve.metadata b/.delve.metadata new file mode 100644 index 0000000..44b5266 --- /dev/null +++ b/.delve.metadata @@ -0,0 +1 @@ +06c4b276bc828b55d3333ead498e91e66e549dad SOURCES/delve-1.21.2.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6196096 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/delve-1.21.2.tar.gz diff --git a/SOURCES/modify-tests.patch b/SOURCES/modify-tests.patch new file mode 100644 index 0000000..6e4d8ee --- /dev/null +++ b/SOURCES/modify-tests.patch @@ -0,0 +1,68 @@ +From 0d8ba2001ceacd67a8861f470399f695cabc8802 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=81lex=20S=C3=A1ez?= +Date: Wed, 24 Jan 2024 13:10:29 +0100 +Subject: [PATCH] Modify tests + +Some tests are not working properly with the build system so we need to +adapt them, like changing the ports they used. +--- + _fixtures/notify-v2.go | 2 +- + pkg/proc/proc_test.go | 3 +++ + pkg/terminal/command_test.go | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/_fixtures/notify-v2.go b/_fixtures/notify-v2.go +index eb80526b..0f562c27 100644 +--- a/_fixtures/notify-v2.go ++++ b/_fixtures/notify-v2.go +@@ -19,5 +19,5 @@ func main() { + }() + }) + +- log.Fatalln(http.ListenAndServe("127.0.0.1:8888", nil)) ++ log.Fatalln(http.ListenAndServe("127.0.0.1:8889", nil)) + } +diff --git a/pkg/proc/proc_test.go b/pkg/proc/proc_test.go +index 714a4d1d..ea1d94a9 100644 +--- a/pkg/proc/proc_test.go ++++ b/pkg/proc/proc_test.go +@@ -2512,6 +2512,7 @@ func TestStepConcurrentDirect(t *testing.T) { + } + + func TestStepConcurrentPtr(t *testing.T) { ++ t.Skipf("Skipping due to CI issues") + protest.AllowRecording(t) + withTestProcess("teststepconcurrent", t, func(p *proc.Target, grp *proc.TargetGroup, fixture protest.Fixture) { + setFileBreakpoint(p, t, fixture.Source, 24) +@@ -5491,6 +5492,7 @@ func TestWatchpointCounts(t *testing.T) { + skipOn(t, "not implemented", "386") + skipOn(t, "see https://github.com/go-delve/delve/issues/2768", "windows") + skipOn(t, "not implemented", "ppc64le") ++ skipOn(t, "fails on CI", "arm64") + protest.AllowRecording(t) + + withTestProcess("databpcountstest", t, func(p *proc.Target, grp *proc.TargetGroup, fixture protest.Fixture) { +@@ -6080,6 +6082,7 @@ func TestEscapeCheckUnreadable(t *testing.T) { + } + + func TestStepShadowConcurrentBreakpoint(t *testing.T) { ++ t.Skipf("Skipping due to CI issues") + // Checks that a StepBreakpoint can not shadow a concurrently hit user breakpoint + withTestProcess("stepshadow", t, func(p *proc.Target, grp *proc.TargetGroup, fixture protest.Fixture) { + break2 := setFunctionBreakpoint(p, t, "main.stacktraceme2") +diff --git a/pkg/terminal/command_test.go b/pkg/terminal/command_test.go +index 57b62105..f6e3a3d9 100644 +--- a/pkg/terminal/command_test.go ++++ b/pkg/terminal/command_test.go +@@ -695,7 +695,7 @@ func TestIssue827(t *testing.T) { + withTestTerminal("notify-v2", t, func(term *FakeTerminal) { + go func() { + time.Sleep(1 * time.Second) +- resp, err := http.Get("http://127.0.0.1:8888/test") ++ resp, err := http.Get("http://127.0.0.1:8889/test") + if err == nil { + resp.Body.Close() + } +-- +2.43.0 + diff --git a/SPECS/delve.spec b/SPECS/delve.spec new file mode 100644 index 0000000..b4118fe --- /dev/null +++ b/SPECS/delve.spec @@ -0,0 +1,146 @@ +%ifarch ppc64le +%global exp "-tags=exp.linuxppc64le" +%endif + +Name: delve +Version: 1.21.2 +Release: 3%{?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 + +BuildRequires: compiler(go-compiler) +BuildRequires: git +BuildRequires: lsof + +Provides: dlv = %{version} + +Patch0001: modify-tests.patch + + +%description +Delve is a debugger for the Go programming language. The goal of the project +is to provide a simple, full featured debugging tool for Go. Delve should be +easy to invoke and easy to use. Chances are if you're using a debugger, things +aren't going your way. With that in mind, Delve should stay out of your way as +much as possible. + + +%prep +%setup -q +%autopatch -p1 + +rm -rf go.mod +mv vendor %{_builddir}/src +mkdir -p "%{_builddir}/src/github.com/go-delve/" +cp -r %{_builddir}/%{name}-%{version} %{_builddir}/src/github.com/go-delve/%{name} +mkdir -p %{_builddir}/%{name}-%{version}/_build +mv %{_builddir}/src %{_builddir}/%{name}-%{version}/_build/src + + +%build +export GO111MODULE=off +export GOPATH="%{_builddir}/%{name}-%{version}/_build" +%gobuild %{?exp} -o bin/dlv github.com/go-delve/delve/cmd/dlv + + +%install +export GO111MODULE=off +export GOPATH="%{_builddir}/%{name}-%{version}/_build" +install -Dpm 0755 bin/dlv %{buildroot}%{_bindir}/dlv + + +%check +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 +%license LICENSE +%doc CONTRIBUTING.md CHANGELOG.md +%doc Documentation/* +%{_bindir}/dlv + + +%changelog +* Wed Jan 31 2024 Alejandro Sáez - 1.21.2-3 +- Skip an additional test as it's breaking in the CI system. +- Modify the name of the patch. +- Resolves: RHEL-22820 + +* Fri Jan 26 2024 Alejandro Sáez - 1.21.2-2 +- Fix: Remove architectures from exclude ExcludeArch +- Resolves: RHEL-22820 + +* Fri Jan 26 2024 Alejandro Sáez - 1.21.2-1 +- Rebase to 1.21.2 +- Add support for ppc64le and aarch64 +- Enable the test suite +- Modify ports: Some CI systems complain about the usage of the 8888 port. +- Improve the way PPC64LE support is enabled. +- Resolves: RHEL-22820 + +* Fri May 26 2023 Alejandro Sáez - 1.20.2-1 +- Rebase to 1.20.2 +- Resolves: rhbz#2186495 + +* Fri Sep 30 2022 Alejandro Sáez - 1.9.1-1 +- Rebase to 1.9.1 +- Related: rhbz#2131026 + +* Wed Apr 27 2022 Alejandro Sáez - 1.8.3-1 +- Rebase to 1.8.3 +- Resolves: rhbz#2077956 +- Resolves: rhbz#2076501 + +* Thu Oct 14 2021 Alejandro Sáez - 1.7.2-1 +- Rebase to 1.7.2 +- Related: rhbz#2014088 + +* Wed Mar 17 2021 Alejandro Sáez - 1.6.0-1 +- Rebase to 1.6.0 +- Resolves: rhbz#1938071 +- Removes golang-1.15.4-TestStepIntoWrapperForEmbeddedPointer.patch + +* Tue Nov 24 2020 David Benoit - 1.5.0-2 +- Add golang-1.15.4 related patch +- Resolves: rhbz#1901189 + +* Wed Sep 09 2020 Alejandro Sáez - 1.5.0-1 +- Rebase to 1.5.0 +- Related: rhbz#1870531 + +* Mon May 25 2020 Alejandro Sáez - 1.4.1-1 +- Rebase to 1.4.1 +- Resolves: rhbz#1821281 +- Related: rhbz#1820596 + +* Fri May 22 2020 Alejandro Sáez - 1.4.0-2 +- Change i686 to a better macro +- Related: rhbz#1820596 + +* Tue Apr 28 2020 Alejandro Sáez - 1.4.0-1 +- Rebase to 1.4.0 +- Remove Patch1781 +- Related: rhbz#1820596 + +* Thu Jan 16 2020 Alejandro Sáez - 1.3.2-3 +- Resolves: rhbz#1758612 +- Resolves: rhbz#1780554 +- Add patch: 1781-pkg-terminal-Fix-exit-status.patch + +* Wed Jan 15 2020 Alejandro Sáez - 1.3.2-2 +- Added tests +- Related: rhbz#1758612 + +* Wed Nov 27 2019 Alejandro Sáez - 1.3.2-1 +- First package for RHEL +- Related: rhbz#1758612