From 1ca7d54487ee0e547a384aba90cd03e6cc73ae0f Mon Sep 17 00:00:00 2001 From: "Alexander I.Grafov" Date: Tue, 25 Mar 2025 16:51:54 +0300 Subject: [PATCH] golangci-lint: update to 2.0.1 Additionally applied patch that making tests compatible with 32bit i686 build. --- ...nil-use-32bit-compatible-test-values.patch | 59 +++++++++++++++++++ srcpkgs/golangci-lint/template | 6 +- 2 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/golangci-lint/patches/0002-nilnil-use-32bit-compatible-test-values.patch diff --git a/srcpkgs/golangci-lint/patches/0002-nilnil-use-32bit-compatible-test-values.patch b/srcpkgs/golangci-lint/patches/0002-nilnil-use-32bit-compatible-test-values.patch new file mode 100644 index 00000000000..d5076c742ea --- /dev/null +++ b/srcpkgs/golangci-lint/patches/0002-nilnil-use-32bit-compatible-test-values.patch @@ -0,0 +1,59 @@ +From 0addaedb77cd1badc5aa036f4b9cab5fe3fa0d19 Mon Sep 17 00:00:00 2001 +From: sn0w +Date: Sat, 22 Feb 2025 21:48:41 +0100 +Subject: [PATCH 2/2] nilnil: use 32bit-compatible test values + +--- + pkg/golinters/nilnil/testdata/nilnil.go | 4 ++-- + pkg/golinters/nilnil/testdata/nilnil_detect_opposite.go | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pkg/golinters/nilnil/testdata/nilnil.go b/pkg/golinters/nilnil/testdata/nilnil.go +index 2446df77..2f7dcbdb 100644 +--- a/pkg/golinters/nilnil/testdata/nilnil.go ++++ b/pkg/golinters/nilnil/testdata/nilnil.go +@@ -275,11 +275,11 @@ func unsafePtrValid() (unsafe.Pointer, error) { + + func uintPtrValid() (uintptr, error) { + if false { + return 0, io.EOF + } +- return 0xc82000c290, nil ++ return 0xabcd, nil + } + + func channelTypeValid() (ChannelType, error) { + if false { + return nil, io.EOF +@@ -347,11 +347,11 @@ func unsafePtrOpposite() (unsafe.Pointer, error) { + + func uintPtrOpposite() (uintptr, error) { + if false { + return 0, io.EOF + } +- return 0xc82000c290, wrap(io.EOF) ++ return 0xabcd, wrap(io.EOF) + } + + func channelTypeOpposite() (ChannelType, error) { + if false { + return nil, io.EOF +diff --git a/pkg/golinters/nilnil/testdata/nilnil_detect_opposite.go b/pkg/golinters/nilnil/testdata/nilnil_detect_opposite.go +index 799d86de..6ef18cae 100644 +--- a/pkg/golinters/nilnil/testdata/nilnil_detect_opposite.go ++++ b/pkg/golinters/nilnil/testdata/nilnil_detect_opposite.go +@@ -35,11 +35,11 @@ func unsafePtrOpposite() (unsafe.Pointer, error) { + + func uintPtrOpposite() (uintptr, error) { + if false { + return 0, io.EOF + } +- return 0xc82000c290, wrap(io.EOF) // want "return both a non-nil error and a valid value: use separate returns instead" ++ return 0xabcd, wrap(io.EOF) // want "return both a non-nil error and a valid value: use separate returns instead" + } + + func channelTypeOpposite() (ChannelType, error) { + if false { + return nil, io.EOF +-- +2.48.1 diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template index d142293af97..8345ba20814 100644 --- a/srcpkgs/golangci-lint/template +++ b/srcpkgs/golangci-lint/template @@ -1,9 +1,9 @@ # Template file for 'golangci-lint' pkgname=golangci-lint -version=1.61.0 +version=2.0.1 revision=1 build_style=go -go_import_path="github.com/golangci/golangci-lint" +go_import_path="github.com/golangci/golangci-lint/v2" go_package="./cmd/golangci-lint" go_ldflags="-X main.version=${version} -X main.date=${SOURCE_DATE_EPOCH} -X main.commit=v${version}" short_desc="Linters Runner for Go" @@ -12,7 +12,7 @@ license="GPL-3.0-only" homepage="https://github.com/golangci/golangci-lint" changelog="https://raw.githubusercontent.com/golangci/golangci-lint/master/CHANGELOG.md" distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz" -checksum=f4efcc09dde3eb81ba7e2fc4230d3e99375a4b176dd28c31cab07371cf5c07db +checksum=036cb1cb358a416d73525172dd235c5284b69c4c4ceb91e66fd1d661b4d6e24b # fix: collect2: fatal error: cannot find 'ld' export LDFLAGS="-fuse-ld=bfd"