Compare commits

...

No commits in common. 'c9' and 'c10-beta' have entirely different histories.
c9 ... c10-beta

@ -1 +1 @@
3054aca571728247c66664630b5f601346f96e24 SOURCES/delve-1.20.2.tar.gz c8f99369a4bbf64032d480c11f416049c583069e SOURCES/delve-1.22.1.tar.gz

2
.gitignore vendored

@ -1 +1 @@
SOURCES/delve-1.20.2.tar.gz SOURCES/delve-1.22.1.tar.gz

@ -0,0 +1,37 @@
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

@ -0,0 +1,12 @@
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) {

@ -1,139 +1,225 @@
Name: delve ## START: Set by rpmautospec
Version: 1.20.2 ## (rpmautospec version 0.6.5)
Release: 1%{?dist} ## RPMAUTOSPEC: autorelease, autochangelog
Summary: A debugger for the Go programming language %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
License: MIT # Run tests in check section
URL: https://github.com/go-delve/delve %bcond_without check
Source0: https://github.com/go-delve/delve/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
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 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 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 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 aren't going your way. With that in mind, Delve should stay out of your way as
much as possible. much as possible.}
# Currently Delve only supports x86_64, aarch64, and ppc64le
%global golang_arches x86_64 aarch64 ppc64le
%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
%description
%{common_description}
%prep %prep
%setup -q echo "=== Start prep ==="
%goprep -k
rm -rf go.mod # unpack vendored dependencies to GOPATH
mv vendor %{_builddir}/src tar c -C vendor/ . | tar x -C %{gobuilddir}/src
mkdir -p "%{_builddir}/src/github.com/go-delve/" %autopatch -v -p1
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 %build
export GO111MODULE=off %gobuild %{?exp} -o %{gobuilddir}/bin/dlv %{goipath}/cmd/dlv
export GOPATH="%{_builddir}/%{name}-%{version}/_build"
%gobuild -o bin/dlv github.com/go-delve/delve/cmd/dlv
%install %install
export GO111MODULE=off install -m 0755 -vd %{buildroot}%{_bindir}
export GOPATH="%{_builddir}/%{name}-%{version}/_build" install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
install -Dpm 0755 bin/dlv %{buildroot}%{_bindir}/dlv
%if %{with check}
%check %check
## Related: rhbz#1922455 export GO111MODULE=off
# export GO111MODULE=off export GOPATH=%{buildroot}/%{gopath}:%{gobuilddir}:%{gopath}
# export GOPATH="%{_builddir}/%{name}-%{version}/_build" delvepath=%{buildroot}/%{gopath}/src/%{goipath}
# cd "_build/src/github.com/go-delve/%{name}" mkdir -p $delvepath
# for d in $(go list ./... | grep -v cmd | grep -v scripts); do mkdir -p $delvepath/pkg/dwarf/line
# go test ${d} mkdir -p $delvepath/pkg/proc/internal
# done 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
%files %files
%license LICENSE %license LICENSE vendor/modules.txt
%doc CONTRIBUTING.md CHANGELOG.md %doc CONTRIBUTING.md CHANGELOG.md
%doc Documentation/* %doc Documentation/*
%{_bindir}/dlv %{_bindir}/dlv
%changelog %changelog
* Fri May 26 2023 Alejandro Sáez <asm@redhat.com> - 1.20.2-1 ## START: Generated by rpmautospec
- Rebase to 1.20.2 * Thu Aug 22 2024 Alejandro Sáez <asm@redhat.com> - 1.22.1-4
- Resolves: rhbz#2186496 - Remove macro and tidy up
* Fri Sep 30 2022 Alejandro Sáez <asm@redhat.com> - 1.9.1-1 * Fri Aug 16 2024 Alejandro Sáez <asm@redhat.com> - 1.22.1-3
- Rebase to 1.9.1 - Enable ppc64le
- Related: rhbz#2131028
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.22.1-2
* Fri Jul 15 2022 Alejandro Sáez <asm@redhat.com> - 1.8.3-1 - Bump release for June 2024 mass rebuild
- Rebase to 1.8.3
- Related: rhbz#2098063 * Wed May 22 2024 Alejandro Sáez <asm@redhat.com> - 1.22.1-1
- Bump up to Delve 1.22.1
* Wed Dec 22 2021 Alejandro Sáez <asm@redhat.com> - 1.7.3-1
- Rebase to 1.7.3 * Fri May 03 2024 Edjunior Machado <emachado@redhat.com> - 1.22.0-6
- Related: rhbz#2031116 - gating.yaml: Add gating config for rhel-10
* Fri Nov 05 2021 Alejandro Sáez <asm@redhat.com> - 1.7.2-1 * Wed Feb 14 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1.22.0-5
- Rebase to 1.7.2 - Skip tests failing due to network configuration
- Related: rhbz#2014087
* Fri Feb 02 2024 Alejandro Sáez <asm@redhat.com> - 1.22.0-4
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.0-5 - Skip tests due to version issues
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.0-4
- Rebuilt for RHEL 9 BETA for openssl 3.0 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-2
Related: rhbz#1971065 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.0-3 * Sun Dec 31 2023 Packit <hello@packit.dev> - 1.22.0-1
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - [packit] 1.22.0 upstream release
- Resolves rhbz#2242098
* Tue Mar 30 2021 Alejandro Sáez <asm@redhat.com> - 1.6.0-2
- Rebase to 1.6.0 * Thu Dec 14 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.21.2-2
- Resolves: rhbz#1922455 - Drop dynamic buildrequires
* Wed Mar 17 2021 Alejandro Sáez <asm@redhat.com> - 1.6.0-1 * Wed Dec 13 2023 Alejandro Sáez <asm@redhat.com> - 1.21.2-1
- Rebase to 1.6.0 - Update to 1.21.2
- Removes golang-1.15.4-TestStepIntoWrapperForEmbeddedPointer.patch
* Fri Nov 17 2023 Alejandro Sáez <asm@redhat.com> - 1.21.0-4
* Mon Nov 16 2020 David Benoit <dbenoit@redhat.com> - 1.5.0-2 - Set up Packit integration
- Resolves: rhbz#1898257
* Fri Nov 17 2023 Edjunior Machado <emachado@redhat.com> - 1.21.0-3
* Wed Sep 09 2020 Alejandro Sáez <asm@redhat.com> - 1.5.0-1 - Introduce CI gating
- Rebase to 1.5.0
- Related: rhbz#1870531 * Fri Sep 29 2023 Alejandro Sáez <asm@redhat.com> - 1.21.0-2
- Migrated to SPDX license
* Mon May 25 2020 Alejandro Sáez <asm@redhat.com> - 1.4.1-1
- Rebase to 1.4.1 * Mon Jul 31 2023 Alejandro Sáez <asm@redhat.com> - 1.21.0-1
- Resolves: rhbz#1821281 - Update to delve-1.21.0
- Related: rhbz#1820596
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.2-3
* Fri May 22 2020 Alejandro Sáez <asm@redhat.com> - 1.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
- Change i686 to a better macro
- Related: rhbz#1820596 * Thu Jun 29 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.20.2-2
- Use vendored dependencies for RHEL builds
* Tue Apr 28 2020 Alejandro Sáez <asm@redhat.com> - 1.4.0-1
- Rebase to 1.4.0 * Mon Apr 17 2023 Alejandro Sáez <asm@redhat.com> - 1.20.2-1
- Remove Patch1781 - Update to Delve 1.20.2
- Related: rhbz#1820596
* Thu Mar 30 2023 Alejandro Sáez <asm@redhat.com> - 1.20.1-1
* Thu Jan 16 2020 Alejandro Sáez <asm@redhat.com> - 1.3.2-3 - Update to 1.20.1
- Resolves: rhbz#1758612
- Resolves: rhbz#1780554 * Tue Mar 28 2023 Tomas Hrcka <thrcka@redhat.com> - 1.2.0-11
- Add patch: 1781-pkg-terminal-Fix-exit-status.patch - Unretirement request: https://pagure.io/releng/issue/11359
* Wed Jan 15 2020 Alejandro Sáez <asm@redhat.com> - 1.3.2-2 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-10
- Added tests - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
- Related: rhbz#1758612
* Wed Feb 27 2019 Derek Parker <deparker@redhat.com> - 1.2.0-9
* Wed Nov 27 2019 Alejandro Sáez <asm@redhat.com> - 1.3.2-1 - Use custom check section
- First package for RHEL
- Related: rhbz#1758612 * 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

Loading…
Cancel
Save