5 changed files with 116 additions and 254 deletions
--- a/.delve.metadata
+++ b/.delve.metadata
@ -1 +1 @@
-c8f99369a4bbf64032d480c11f416049c583069e SOURCES/delve-1.22.1.tar.gz
+3054aca571728247c66664630b5f601346f96e24 SOURCES/delve-1.20.2.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/delve-1.22.1.tar.gz
+SOURCES/delve-1.20.2.tar.gz
--- a/SOURCES/0001-Skipping-due-issues-with-the-go-version-in-Fedora.patch
+++ b/SOURCES/0001-Skipping-due-issues-with-the-go-version-in-Fedora.patch
@ -1,37 +0,0 @@
-From 73c738dcddaf9771c1ef5ab48b34c259cac4653c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lex=20S=C3=A1ez?= <asm@redhat.com>
-Date: Fri, 2 Feb 2024 14:14:34 +0100
-Subject: [PATCH] Skipping due issues with the go version in Fedora
-
-If the Go package gets an update, Koschei will trigger a Delve build
-that will fail because Delve is not supporting the newer version of Go.
-
-Skipping these tests is not ideal but gore returns an error if the go
-version is missing.
---
- pkg/proc/proc_test.go | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/pkg/proc/proc_test.go b/pkg/proc/proc_test.go
-index d39d516b..5992e9e8 100644
--- a/pkg/proc/proc_test.go
-+++ b/pkg/proc/proc_test.go
-@@ -3188,6 +3188,7 @@ func TestShadowedFlag(t *testing.T) {
- func TestDebugStripped(t *testing.T) {
- 	// Currently only implemented for Linux ELF and macOS Mach-O executables.
- 	// TODO(derekparker): Add support for PE.
-+	skipOn(t, "not working on Fedora CI", "linux")
- 	skipOn(t, "not working on windows", "windows")
- 	skipOn(t, "not working on freebsd", "freebsd")
- 	skipOn(t, "not working on linux/386", "linux", "386")
-@@ -3205,6 +3206,7 @@ func TestDebugStripped(t *testing.T) {
- func TestDebugStripped2(t *testing.T) {
- 	// Currently only implemented for Linux ELF executables.
- 	// TODO(derekparker): Add support for PE.
-+	skipOn(t, "not working on Fedora CI", "linux")
- 	skipOn(t, "not working on windows", "windows")
- 	skipOn(t, "not working on freebsd", "freebsd")
- 	skipOn(t, "not working on linux/386", "linux", "386")
-- 
-2.43.0
-
--- a/SOURCES/0002-Skipping-due-issues-with-network-access.patch
+++ b/SOURCES/0002-Skipping-due-issues-with-network-access.patch
@ -1,12 +0,0 @@
-diff --git a/pkg/terminal/command_test.go b/pkg/terminal/command_test.go
-index d97d0bc..a71e34b 100644
--- a/pkg/terminal/command_test.go
-+++ b/pkg/terminal/command_test.go
-@@ -690,6 +690,7 @@ func TestRestart(t *testing.T) {
- }
- 
- func TestIssue827(t *testing.T) {
-+	t.Skip("port 8888 might already be in use")
- 	// switching goroutines when the current thread isn't running any goroutine
- 	// causes nil pointer dereference.
- 	withTestTerminal("notify-v2", t, func(term *FakeTerminal) {
--- a/SPECS/delve.spec
+++ b/SPECS/delve.spec
@ -1,228 +1,139 @@
-## START: Set by rpmautospec
-## (rpmautospec version 0.6.5)
-## RPMAUTOSPEC: autorelease, autochangelog
-%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 4;
-    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
-    print(release_number + base_release_number - 1);
-}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
-## END: Set by rpmautospec
+Name:                   delve
+Version:                1.20.2
+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

-# Run tests in check section
-%bcond_without check
+ExcludeArch:            ppc64le s390x aarch64 %{ix86} armv7hl

-%ifarch ppc64le
-%global exp "-tags=exp.linuxppc64le"
-%endif
+BuildRequires:          compiler(go-compiler)
+BuildRequires:          git
+BuildRequires:          lsof

+Provides:               dlv = %{version}

-# https://github.com/go-delve/delve
-%global goipath         github.com/go-delve/delve
-Version:                1.22.1

-%global common_description %{expand:
+%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.}
-
-# Currently Delve only supports x86_64, aarch64, and ppc64le
-%global golang_arches x86_64 aarch64 ppc64le
+much as possible.

-%gometa
-
-Name:           delve
-Release:        %autorelease
-Summary:        A debugger for the Go programming language
-# Detected licences
-# - Expat License at 'LICENSE'
-# It is a SPDX license already
-License:        MIT
-URL:            %{gourl}
-Source0:        %{gosource}
-
-BuildRequires:  lsof
-BuildRequires:  git

-# Bundled/Vendored provides generated by bundled-deps.sh based on the in tree module data
-# - in version filed substituted with . per versioning guidelines
-Provides: bundled(golang(github.com/cilium/ebpf)) = 0.11.0
-Provides: bundled(golang(github.com/cosiner/argv)) = 0.1.0
-Provides: bundled(golang(github.com/cpuguy83/go.md2man/v2)) = 2.0.2
-Provides: bundled(golang(github.com/creack/pty)) = 1.1.20
-Provides: bundled(golang(github.com/derekparker/trie)) = 0.0.0.20230829180723.39f4de51ef7d
-Provides: bundled(golang(github.com/go.delve/liner)) = 1.2.3.0.20231231155935.4726ab1d7f62
-Provides: bundled(golang(github.com/google/go.dap)) = 0.11.0
-Provides: bundled(golang(github.com/hashicorp/golang.lru)) = 1.0.2
-Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 1.1.0
-Provides: bundled(golang(github.com/mattn/go.colorable)) = 0.1.13
-Provides: bundled(golang(github.com/mattn/go.isatty)) = 0.0.20
-Provides: bundled(golang(github.com/mattn/go.runewidth)) = 0.0.13
-Provides: bundled(golang(github.com/rivo/uniseg)) = 0.2.0
-Provides: bundled(golang(github.com/russross/blackfriday/v2)) = 2.1.0
-Provides: bundled(golang(github.com/sirupsen/logrus)) = 1.9.3
-Provides: bundled(golang(github.com/spf13/cobra)) = 1.7.0
-Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.5
-Provides: bundled(golang(github.com/stretchr/testify)) = 1.8.4
-Provides: bundled(golang(golang.org/x/arch)) = 0.6.0
-Provides: bundled(golang(golang.org/x/exp)) = 0.0.0.20230224173230.c95f2b4c22f2
-Provides: bundled(golang(golang.org/x/mod)) = 0.14.0
-Provides: bundled(golang(golang.org/x/sys)) = 0.13.0
-Provides: bundled(golang(golang.org/x/tools)) = 0.14.0
-Provides: bundled(golang(gopkg.in/yaml.v2)) = 2.4.0
-Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1
-Provides: bundled(golang(go.starlark.net)) = 0.0.0.20231101134539.556fd59b42f6
-
-Patch0001:	0001-Skipping-due-issues-with-the-go-version-in-Fedora.patch
-Patch0002:	0002-Skipping-due-issues-with-network-access.patch
+%prep
+%setup -q

-%description
-%{common_description}
+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

-%prep
-echo "=== Start prep ==="
-%goprep -k
-# unpack vendored dependencies to GOPATH
-tar c -C vendor/ . | tar x -C %{gobuilddir}/src
-%autopatch -v -p1

 %build
-%gobuild %{?exp} -o %{gobuilddir}/bin/dlv %{goipath}/cmd/dlv
+export GO111MODULE=off
+export GOPATH="%{_builddir}/%{name}-%{version}/_build"
+%gobuild -o bin/dlv github.com/go-delve/delve/cmd/dlv
+

 %install
-install -m 0755 -vd %{buildroot}%{_bindir}
-install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
+export GO111MODULE=off
+export GOPATH="%{_builddir}/%{name}-%{version}/_build"
+install -Dpm 0755 bin/dlv %{buildroot}%{_bindir}/dlv
+

-%if %{with check}
 %check
-export GO111MODULE=off
-export GOPATH=%{buildroot}/%{gopath}:%{gobuilddir}:%{gopath}
-delvepath=%{buildroot}/%{gopath}/src/%{goipath}
-mkdir -p $delvepath
-mkdir -p $delvepath/pkg/dwarf/line
-mkdir -p $delvepath/pkg/proc/internal
-cp -r _fixtures $delvepath
-cp -r pkg/dwarf $delvepath/pkg/
-cp -r pkg/dwarf/line/_testdata $delvepath/pkg/dwarf/line
-cp -r pkg/proc/internal/ebpf $delvepath/pkg/proc/internal/
-
-pushd $delvepath
-for d in $(go list %{?exp} ./... | grep -v cmd | grep -v scripts); do
-    go test %{?exp} ${d}
-done
-rm -rf $delvepath
-popd
-%endif
+## Related: rhbz#1922455
+# export GO111MODULE=off
+# export GOPATH="%{_builddir}/%{name}-%{version}/_build"
+# cd "_build/src/github.com/go-delve/%{name}"
+# for d in $(go list ./... | grep -v cmd | grep -v scripts); do
+#     go test ${d}
+# done
+

 %files
-%license LICENSE vendor/modules.txt
+%license LICENSE
 %doc CONTRIBUTING.md CHANGELOG.md
 %doc Documentation/*
 %{_bindir}/dlv

-%changelog
-* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.22.1-4
- Rebuilt for MSVSphere 10
-
-## START: Generated by rpmautospec
-* Thu Aug 22 2024 Alejandro Sáez <asm@redhat.com> - 1.22.1-4
- Remove macro and tidy up
-
-* Fri Aug 16 2024 Alejandro Sáez <asm@redhat.com> - 1.22.1-3
- Enable ppc64le
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.22.1-2
- Bump release for June 2024 mass rebuild
-
-* Wed May 22 2024 Alejandro Sáez <asm@redhat.com> - 1.22.1-1
- Bump up to Delve 1.22.1

-* Fri May 03 2024 Edjunior Machado <emachado@redhat.com> - 1.22.0-6
- gating.yaml: Add gating config for rhel-10
-
-* Wed Feb 14 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1.22.0-5
- Skip tests failing due to network configuration
-
-* Fri Feb 02 2024 Alejandro Sáez <asm@redhat.com> - 1.22.0-4
- Skip tests due to version issues
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Dec 31 2023 Packit <hello@packit.dev> - 1.22.0-1
- [packit] 1.22.0 upstream release
- Resolves rhbz#2242098
-
-* Thu Dec 14 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.21.2-2
- Drop dynamic buildrequires
-
-* Wed Dec 13 2023 Alejandro Sáez <asm@redhat.com> - 1.21.2-1
- Update to 1.21.2
-
-* Fri Nov 17 2023 Alejandro Sáez <asm@redhat.com> - 1.21.0-4
- Set up Packit integration
-
-* Fri Nov 17 2023 Edjunior Machado <emachado@redhat.com> - 1.21.0-3
- Introduce CI gating
-
-* Fri Sep 29 2023 Alejandro Sáez <asm@redhat.com> - 1.21.0-2
- Migrated to SPDX license
-
-* Mon Jul 31 2023 Alejandro Sáez <asm@redhat.com> - 1.21.0-1
- Update to delve-1.21.0
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jun 29 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.20.2-2
- Use vendored dependencies for RHEL builds
-
-* Mon Apr 17 2023 Alejandro Sáez <asm@redhat.com> - 1.20.2-1
- Update to Delve 1.20.2
-
-* Thu Mar 30 2023 Alejandro Sáez <asm@redhat.com> - 1.20.1-1
- Update to 1.20.1
-
-* Tue Mar 28 2023 Tomas Hrcka <thrcka@redhat.com> - 1.2.0-11
- Unretirement request: https://pagure.io/releng/issue/11359
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Feb 27 2019 Derek Parker <deparker@redhat.com> - 1.2.0-9
- Use custom check section
-
-* Mon Feb 25 2019 Derek Parker <deparker@redhat.com> - 1.2.0-8
- Exclude armv7hl
-
-* Mon Feb 25 2019 Derek Parker <deparker@redhat.com> - 1.2.0-7
- Exclude non-supported arches
-
-* Fri Feb 22 2019 Derek Parker <deparker@redhat.com> - 1.2.0-6
- Add ExclusiveArch
-
-* Fri Feb 22 2019 Derek Parker <deparker@redhat.com> - 1.2.0-5
- Add sources file
-
-* Fri Feb 22 2019 Derek Parker <deparker@redhat.com> - 1.2.0-4
- Add patch to remove empty doc file
-
-* Fri Feb 22 2019 Derek Parker <deparker@redhat.com> - 1.2.0-3
- Switch back to using gochecks
-
-* Fri Feb 22 2019 Derek Parker <deparker@redhat.com> - 1.2.0-2
- Fix spec file and patch tests to run in package build
-
-* Fri Feb 22 2019 Derek Parker <deparker@redhat.com> - 1.2.0-1
- Update spec for v1.2.0
-
-* Fri Feb 22 2019 Derek Parker <deparker@redhat.com> - 1.1.0-2
- Update doc location output, cleanup spec
-
-* Fri Feb 22 2019 Derek Parker <deparker@redhat.com> - 1.1.0-1
- Initial spec file
-## END: Generated by rpmautospec
+%changelog
+* Fri May 26 2023 Alejandro Sáez <asm@redhat.com> - 1.20.2-1
+- Rebase to 1.20.2
+- Resolves: rhbz#2186496
+
+* Fri Sep 30 2022 Alejandro Sáez <asm@redhat.com> - 1.9.1-1
+- Rebase to 1.9.1
+- Related: rhbz#2131028
+
+* Fri Jul 15 2022 Alejandro Sáez <asm@redhat.com> - 1.8.3-1
+- Rebase to 1.8.3
+- Related: rhbz#2098063
+
+* Wed Dec 22 2021 Alejandro Sáez <asm@redhat.com> - 1.7.3-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
+
+* 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
+- Removes golang-1.15.4-TestStepIntoWrapperForEmbeddedPointer.patch
+
+* Mon Nov 16 2020 David Benoit <dbenoit@redhat.com> - 1.5.0-2
+- Resolves: rhbz#1898257
+
+* 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
+- Related: rhbz#1820596
+
+* Fri May 22 2020 Alejandro Sáez <asm@redhat.com> - 1.4.0-2
+- Change i686 to a better macro
+- Related: rhbz#1820596
+
+* Tue Apr 28 2020 Alejandro Sáez <asm@redhat.com> - 1.4.0-1
+- Rebase to 1.4.0
+- Remove Patch1781
+- Related: rhbz#1820596
+
+* Thu Jan 16 2020 Alejandro Sáez <asm@redhat.com> - 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 <asm@redhat.com> - 1.3.2-2
+- Added tests
+- Related: rhbz#1758612
+
+* Wed Nov 27 2019 Alejandro Sáez <asm@redhat.com> - 1.3.2-1
+- First package for RHEL
+- Related: rhbz#1758612