From 897925f56f178d27ff374d436bf92accee1aae1f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 06 2021 09:42:39 +0000 Subject: import delve-1.6.0-1.module+el8.5.0+10379+d6b83bd0 --- diff --git a/.delve.metadata b/.delve.metadata index a1900e3..4252e89 100644 --- a/.delve.metadata +++ b/.delve.metadata @@ -1 +1 @@ -70ad60c8c264e384c525996c7199ca50440ad6ff SOURCES/delve-1.5.0.tar.gz +c689551352592cb7a4d8d711f178836d2a347413 SOURCES/delve-1.6.0.tar.gz diff --git a/.gitignore b/.gitignore index 7b3fb6a..af2cace 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/delve-1.5.0.tar.gz +SOURCES/delve-1.6.0.tar.gz diff --git a/SOURCES/golang-1.15.4-TestStepIntoWrapperForEmbeddedPointer.patch b/SOURCES/golang-1.15.4-TestStepIntoWrapperForEmbeddedPointer.patch deleted file mode 100644 index abf3292..0000000 --- a/SOURCES/golang-1.15.4-TestStepIntoWrapperForEmbeddedPointer.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 diff --git a/SPECS/delve.spec b/SPECS/delve.spec index b9c029e..2e9505d 100644 --- a/SPECS/delve.spec +++ b/SPECS/delve.spec @@ -1,6 +1,6 @@ Name: delve -Version: 1.5.0 -Release: 2%{?dist} +Version: 1.6.0 +Release: 1%{?dist} Summary: A debugger for the Go programming language License: MIT @@ -15,9 +15,6 @@ 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 @@ -30,7 +27,6 @@ much as possible. %prep %setup -q -%patch0 -p1 rm -rf go.mod mv vendor %{_builddir}/src mkdir -p "%{_builddir}/src/github.com/go-delve/" @@ -68,6 +64,11 @@ done %changelog +* 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