import delve-1.5.0-2.module+el8.4.0+8864+58b0fcdb

.delve.metadata

@@ -1 +1 @@
-1a4e8f7672c329e493b2fd1f0a4cfe653c537bd7 SOURCES/delve-1.4.1.tar.gz
+70ad60c8c264e384c525996c7199ca50440ad6ff SOURCES/delve-1.5.0.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/delve-1.4.1.tar.gz
+SOURCES/delve-1.5.0.tar.gz

SOURCES/golang-1.15.4-TestStepIntoWrapperForEmbeddedPointer.patch

@@ -0,0 +1,38 @@
+diff --git a/pkg/goversion/go_version.go b/pkg/goversion/go_version.go
+index 5caf1b9bb..88a2d4e5c 100644
+--- a/pkg/goversion/go_version.go
++++ b/pkg/goversion/go_version.go
+@@ -155,11 +155,18 @@ func Installed() (GoVersion, bool) {
+ // or go version) is major.minor or a later version, or a development
+ // version.
+ func VersionAfterOrEqual(version string, major, minor int) bool {
++	return VersionAfterOrEqualRev(version, major, minor, -1)
++}
++
++// VersionAfterOrEqualRev checks that version (as returned by runtime.Version()
++// or go version) is major.minor or a later version, or a development
++// version.
++func VersionAfterOrEqualRev(version string, major, minor, rev int) bool {
+ 	ver, _ := Parse(version)
+ 	if ver.IsDevel() {
+ 		return true
+ 	}
+-	return ver.AfterOrEqual(GoVersion{major, minor, -1, 0, 0, ""})
++	return ver.AfterOrEqual(GoVersion{major, minor, rev, 0, 0, ""})
+ }
+ 
+ const producerVersionPrefix = "Go cmd/compile "
+diff --git a/pkg/proc/proc_test.go b/pkg/proc/proc_test.go
+index f33ddac37..92e6e38db 100644
+--- a/pkg/proc/proc_test.go
++++ b/pkg/proc/proc_test.go
+@@ -4804,7 +4804,8 @@ func TestStepIntoWrapperForEmbeddedPointer(t *testing.T) {
+ 		{contStepout, 29}})
+ 
+ 	// same test but with next instead of stepout
+-	if goversion.VersionAfterOrEqual(runtime.Version(), 1, 14) && runtime.GOARCH != "386" {
++	if goversion.VersionAfterOrEqual(runtime.Version(), 1, 14) && runtime.GOARCH != "386" && !goversion.VersionAfterOrEqualRev(runtime.Version(), 1, 15, 4) {
++		// Line numbers generated for versions 1.14 through 1.15.3 on any system except linux/386
+ 		testseq2(t, "ifaceembcall", "", []seqTest{
+ 			{contContinue, 28}, // main.main, the line calling iface.PtrReceiver()
+ 			{contStep, 18},     // main.(*A).PtrReceiver

SPECS/delve.spec

@@ -1,6 +1,6 @@
 Name:                   delve
-Version:                1.4.1
-Release:                1%{?dist}
+Version:                1.5.0
+Release:                2%{?dist}
 Summary:                A debugger for the Go programming language
 
 License:                MIT
@@ -15,6 +15,10 @@ BuildRequires:          lsof
 
 Provides:               dlv = %{version}
 
+# https://github.com/go-delve/delve/pull/2223
+Patch0:                 golang-1.15.4-TestStepIntoWrapperForEmbeddedPointer.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 
@@ -25,6 +29,8 @@ much as possible.
 
 %prep
 %setup -q
+
+%patch0 -p1
 rm -rf go.mod
 mv vendor %{_builddir}/src
 mkdir -p "%{_builddir}/src/github.com/go-delve/"
@@ -62,6 +68,14 @@ done
 
 
 %changelog
+* Tue Nov 24 2020 David Benoit <dbenoit@redhat.com> - 1.5.0-2
+- 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
+- Related: rhbz#1870531
+
 * Mon May 25 2020 Alejandro Sáez <asm@redhat.com> - 1.4.1-1
 - Rebase to 1.4.1
 - Resolves: rhbz#1821281