SOURCES/modify-ports.patch

@@ -1,64 +0,0 @@
-From 1ba9183936e11839811cf27472677d44ea4eb1a2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lex=20S=C3=A1ez?= <asm@redhat.com>
-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        | 6 ++++++
- pkg/terminal/command_test.go | 2 +-
- 3 files changed, 8 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..ae9f0bd9 100644
---- a/pkg/proc/proc_test.go
-+++ b/pkg/proc/proc_test.go
-@@ -2512,6 +2512,9 @@ func TestStepConcurrentDirect(t *testing.T) {
- }
- 
- func TestStepConcurrentPtr(t *testing.T) {
-+	if runtime.GOARCH == "ppc64le" {
-+		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)
-@@ -6080,6 +6083,9 @@ func TestEscapeCheckUnreadable(t *testing.T) {
- }
- 
- func TestStepShadowConcurrentBreakpoint(t *testing.T) {
-+	if runtime.GOARCH == "ppc64le" {
-+		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
-

SOURCES/skip-coredump-test.patch

@@ -1,3 +1,18 @@
+From d5fb3bee427202f0d4b1683bf743bfd2adb41757 Mon Sep 17 00:00:00 2001
+From: Derek Parker <parkerderek86@gmail.com>
+Date: Thu, 20 Mar 2025 01:15:19 -0700
+Subject: [PATCH] proc/core: skip tests on ppc64le (#3954)
+
+These tests have been somewhat silently failing on our CI because the
+test ends up being skipped [due to the lack of coredumpctl](https://delve.teamcity.com/buildConfiguration/Delve_linux_ppc64le_1_24/66766?buildTab=tests&focusLine=NaN&name=testcore&suite=github.com%2Fgo-delve%2Fdelve%2Fpkg%2Fproc%2Fcore%3A+&expandedTest=build%3A%28id%3A66766%29%2Cid%3A2000000704&showLog=66766_20670_112.20612.20670&logFilter=debug&logView=flowAware).
+
+When `coredumpctl` is present, the test [fails
+anyways](https://issues.redhat.com/browse/RHEL-83939), so let's just
+skip it on ppc64le for now.
+---
+ pkg/proc/core/core_test.go | 41 +++++++++++++++++++++-----------------
+ 1 file changed, 23 insertions(+), 18 deletions(-)
+
 diff --git a/pkg/proc/core/core_test.go b/pkg/proc/core/core_test.go
 index dddc1d3e7..52b210b6f 100644
 --- a/pkg/proc/core/core_test.go

SOURCES/skip-substitute-path-test.patch

@@ -1,3 +1,15 @@
+From 55486fbab43420d67323cd3e79cda115e7e687c6 Mon Sep 17 00:00:00 2001
+From: Derek Parker <parkerderek86@gmail.com>
+Date: Thu, 20 Mar 2025 01:14:20 -0700
+Subject: [PATCH] service/test: skip substitutepath test when modules disabled
+ (#3955)
+
+See: https://issues.redhat.com/browse/RHEL-83958
+---
+ pkg/proc/test/support.go          | 6 ++++++
+ service/test/integration2_test.go | 2 ++
+ 2 files changed, 8 insertions(+)
+
 diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go
 index d1f25bd49..c8efea360 100644
 --- a/pkg/proc/test/support.go

SPECS/delve.spec

@@ -4,7 +4,7 @@
 
 Name:                   delve
 Version:                1.24.1
-Release:                2%{?dist}
+Release:                1%{?dist}
 Summary:                A debugger for the Go programming language
 
 License:                MIT
@@ -18,12 +18,8 @@ BuildRequires:          git
 BuildRequires:          lsof
 
 Provides:               dlv = %{version}
-
+Patch1:			skip-coredump-test.patch
-Patch0001:		modify-ports.patch
+Patch2:			skip-substitute-path-test.patch
-
-# TODO: remove these once version 1.24.2 is released.
-Patch0002:		fix-rhel-83939.patch
-Patch0003:		fix-rhel-83958.patch
 
 
 %description
@@ -63,7 +59,7 @@ 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} -skip 'TestGuessSubstitutePath'
+    go test %{?exp} ${d}
 done
 
 
@@ -75,72 +71,57 @@ done
 
 
 %changelog
-* Thu Mar 20 2025 Derek Parker <deparker@redhat.com> - 1.24.1-2
+* Fri Mar 14 2025 David Benoit <dbenoit@redhat.com> - 1.24.1-1
-- Fix 3 test failures
+- Rebase to 1.24.1
-- Resolves: RHEL-83939
+- Skip unsupported tests
-- Resolves: RHEL-83958
+- Resolves: RHEL-83451
-- Resolves: RHEL-7373
-
-* Thu Mar 13 2025 David Benoit <dbenoit@redhat.com> - 1.24.1-1
-- Rebase to Delve 1.24.1
-- Resolves: RHEL-64445
 
 * Fri Aug 16 2024 Alejandro Sáez <asm@redhat.com> - 1.22.1-1
-- Rebase to Delve 1.22.1
+- Rebase to 1.22.1
-- Resolves: RHEL-50840
+- Resolves: RHEL-54307
 
-* Thu Jan 25 2024 Alejandro Sáez <asm@redhat.com> - 1.21.2-2
+* Wed Jan 31 2024 Alejandro Sáez <asm@redhat.com> - 1.21.2-3
-- Modify ports: Some CI systems complain about the usage of the 8888 port.
+- Skip an additional test as it's breaking in the CI system.
-- Improve the way PPC64LE support is enabled.
+- Modify the name of the patch.
-- Resolves: RHEL-22429
+- Resolves: RHEL-22820
 
-* Tue Jan 23 2024 Alejandro Sáez <asm@redhat.com> - 1.21.2-1
+* Fri Jan 26 2024 Alejandro Sáez <asm@redhat.com> - 1.21.2-2
+- Fix: Remove architectures from exclude ExcludeArch
+- Resolves: RHEL-22820
+
+* Fri Jan 26 2024 Alejandro Sáez <asm@redhat.com> - 1.21.2-1
 - Rebase to 1.21.2
 - Add support for ppc64le and aarch64
 - Enable the test suite
-- Resolves: RHEL-22429
+- 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 <asm@redhat.com> - 1.20.2-1
 - Rebase to 1.20.2
-- Resolves: rhbz#2186496
+- Resolves: rhbz#2186495
 
 * Fri Sep 30 2022 Alejandro Sáez <asm@redhat.com> - 1.9.1-1
 - Rebase to 1.9.1
-- Related: rhbz#2131028
+- Related: rhbz#2131026
 
-* Fri Jul 15 2022 Alejandro Sáez <asm@redhat.com> - 1.8.3-1
+* Wed Apr 27 2022 Alejandro Sáez <asm@redhat.com> - 1.8.3-1
 - Rebase to 1.8.3
-- Related: rhbz#2098063
+- Resolves: rhbz#2077956
+- Resolves: rhbz#2076501
 
-* Wed Dec 22 2021 Alejandro Sáez <asm@redhat.com> - 1.7.3-1
+* Thu Oct 14 2021 Alejandro Sáez <asm@redhat.com> - 1.7.2-1
-- Rebase to 1.7.3
-- Related: rhbz#2031116
-
-* Fri Nov 05 2021 Alejandro Sáez <asm@redhat.com> - 1.7.2-1
 - Rebase to 1.7.2
-- Related: rhbz#2014087
+- Related: rhbz#2014088
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.0-5
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.0-4
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.0-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Mar 30 2021 Alejandro Sáez <asm@redhat.com> - 1.6.0-2
-- Rebase to 1.6.0
-- Resolves: rhbz#1922455
 
 * Wed Mar 17 2021 Alejandro Sáez <asm@redhat.com> - 1.6.0-1
 - Rebase to 1.6.0
+- Resolves: rhbz#1938071
 - Removes golang-1.15.4-TestStepIntoWrapperForEmbeddedPointer.patch
 
-* Mon Nov 16 2020 David Benoit <dbenoit@redhat.com> - 1.5.0-2
+* Tue Nov 24 2020 David Benoit <dbenoit@redhat.com> - 1.5.0-2
-- Resolves: rhbz#1898257
+- Add golang-1.15.4 related patch
+- Resolves: rhbz#1901189
 
 * Wed Sep 09 2020 Alejandro Sáez <asm@redhat.com> - 1.5.0-1
 - Rebase to 1.5.0