* [PR PATCH] Go package clean up
@ 2020-11-14 17:22 ericonr
2020-11-14 17:26 ` [PR PATCH] [Updated] " ericonr
` (20 more replies)
0 siblings, 21 replies; 22+ messages in thread
From: ericonr @ 2020-11-14 17:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 523 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gorebuild
https://github.com/void-linux/void-packages/pull/26377
Go package clean up
While I get ready to do a full go rebuild, I found packages with various issues. Some broken ones and some had changed paths.
ping @the-maldridge @thypon @Vaelatern @misuchiru03 @renatoaguiar @steinex @CameronNemo
A patch file from https://github.com/void-linux/void-packages/pull/26377.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gorebuild-26377.patch --]
[-- Type: text/x-diff, Size: 13034 bytes --]
From 82188fc0c38315b378d614c23fa32b4182327c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:34:46 -0300
Subject: [PATCH 01/12] chronograf: mark broken.
---
srcpkgs/chronograf/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index b23d2ef09a3..d0f9876fb1b 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -18,6 +18,7 @@ system_accounts="_chronograf"
_chronograf_homedir="/var/lib/${pkgname}"
make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
+broken="fails to build v8: error: 'class Nan::Persistent<v8::Object>' has no member named 'IsNearDeath'"
case "$XBPS_TARGET_MACHINE" in
i686*) broken="yarn not available" ;;
ppc*) broken="ftbfs in some js module" ;;
From ffa7111f48b172e402b861f28ceabbe00f1aee2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:35:55 -0300
Subject: [PATCH 02/12] etcd: mark broken.
---
srcpkgs/etcd/template | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index 85c797e5aca..4d905d3ce4f 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -17,6 +17,8 @@ conf_files="/etc/sv/etcd/conf"
system_accounts="etcd"
make_dirs="/var/lib/etcd 0755 etcd etcd"
+broken="module declares its path as: go.etcd.io/bbolt ; but was required as: github.com/coreos/bbolt"
+
post_install() {
vlicense LICENSE
vsv etcd
From 6389b7b17237af80607354a418c3f1861bb84576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:40:21 -0300
Subject: [PATCH 03/12] dnote-cli: fix checksum and wrksrc.
---
srcpkgs/dnote-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dnote-cli/template b/srcpkgs/dnote-cli/template
index 309bee7649b..d58dd0954c8 100644
--- a/srcpkgs/dnote-cli/template
+++ b/srcpkgs/dnote-cli/template
@@ -2,7 +2,7 @@
pkgname=dnote-cli
version=0.6.2
revision=1
-wrksrc="cli-${version}"
+wrksrc="dnote-${version}"
build_style=go
go_import_path=github.com/dnote-io/cli
go_build_tags="fts5"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="MIT"
homepage="https://dnote.io/"
distfiles="https://github.com/dnote-io/cli/archive/v${version}.tar.gz"
-checksum=886f09dc20ff9cb56bdbc71eb7e78e7099b541fa0d830d4b4d0251b2fb32ad06
+checksum=6eb3f824f22d5821c08e832dabadf5664c73b83201a7a5c65632fc8d60bd041e
pre_build() {
cd $GOSRCPATH
From 1ebc7cd9ff37af2bb6b4b8edcdeecfe8810f1aff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:46:35 -0300
Subject: [PATCH 04/12] gfuzz: fix checksum, homepage and module paths.
---
srcpkgs/gfuzz/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index a51ea912896..59061b2904f 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -2,13 +2,13 @@
pkgname=gfuzz
version=0.2
revision=1
-wrksrc="gfuzz-${version}"
+wrksrc="gfz-${version}"
build_style=go
-go_import_path=github.com/braaaax/gfuzz
+go_import_path=github.com/braaaax/gfz
hostmakedepends="git"
short_desc="Web fuzzer like wfuzz written in Golang"
maintainer="Alex Childs <misuchiru03+void@gmail.com>"
license="Apache-2.0"
-homepage="https://github.com/braaaax/gfuzz"
-distfiles="https://github.com/braaaax/gfuzz/archive/v${version}.tar.gz"
-checksum=054163243181db528715bf904ee7656aa0a12e9feb120c8afbfd43bd6504ccd1
+homepage="https://github.com/braaaax/gfz"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=8b6a3df0c385fe993ead673df53daa290943220f2cde73e6b1c706ef94aa4e5f
From cc8c39abb3347a8948affbb1eaa061e5e95222f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 01:20:29 -0300
Subject: [PATCH 05/12] golangci-lint: temporarily broken.
Should be solved once Go 1.15.6 is released.
---
srcpkgs/golangci-lint/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 06dba517cda..4821b086a96 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -12,6 +12,7 @@ license="GPL-3.0-only"
homepage="https://github.com/golangci/golangci-lint"
distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
checksum=ff0e52ec28b5cf1dbc632db301c89dcf4352dd7376d0cc82e36571c609a0b339
+broken="broken until Go 1.15.6: https://github.com/golang/go/issues/42567"
# Cross builds fail with -fuse-ld=gold
LDFLAGS="-fuse-ld=bfd"
From b49b2c582b7ff9cb79ca8e051d439ae571104b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:05:19 -0300
Subject: [PATCH 06/12] wtplan: temporarily broken.
---
srcpkgs/wtplan/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/wtplan/template b/srcpkgs/wtplan/template
index 5a5b3a54740..0596fda0260 100644
--- a/srcpkgs/wtplan/template
+++ b/srcpkgs/wtplan/template
@@ -11,6 +11,7 @@ license="MIT"
homepage="https://github.com/kjellwinblad/wtplan/"
distfiles="https://github.com/kjellwinblad/wtplan/archive/${version}.tar.gz"
checksum=31c66181f815889828eb2bd3739d6b23582ec75a5a8d6c6bf76c2a6679112bb4
+broken="broken until Go 1.15.6: https://github.com/golang/go/issues/42567"
do_build() {
export GOPATH=$(pwd)
From 023f5467b590b09f9eb9cc585bf1be8f739b026c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:05:45 -0300
Subject: [PATCH 07/12] rkt: mark broken.
---
srcpkgs/rkt/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template
index 84d4e32837a..e1e8cb35eeb 100644
--- a/srcpkgs/rkt/template
+++ b/srcpkgs/rkt/template
@@ -16,6 +16,7 @@ license="Apache-2.0"
homepage="https://github.com/coreos/rkt"
distfiles="https://github.com/coreos/rkt/archive/v${version}.tar.gz"
checksum=4d22c742b87d15c226cc28970c7daf66a64c6a95af9d752f5b72d9a4012aca1d
+broken="Build can't find usr_from_coreoskvmhostsrcfly.mk"
patch_args="-Np1"
nopie=yes
From 6ea764acbb32e61c25e1ef1d49823a490dcf3dc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:11:30 -0300
Subject: [PATCH 08/12] srcpkgs: remove go from hostmakedepends for packages
with build_style=go.
---
srcpkgs/darch/template | 2 +-
srcpkgs/docker/template | 2 +-
srcpkgs/git-lfs/template | 2 +-
srcpkgs/kubernetes-helm/template | 2 +-
srcpkgs/yggdrasil/template | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 238eebd3158..161af0a666b 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -7,7 +7,7 @@ build_style=go
go_import_path=github.com/godarch/darch
conf_files="/etc/darch/hooks/ssh/hook /etc/darch/hooks/hostname/hook /etc/darch/hooks/fstab/hook"
make_dirs="/var/lib/darch 0755 root root"
-hostmakedepends="git go"
+hostmakedepends="git"
depends="containerd"
short_desc="Tool for building/booting stateless and immutable images, bare metal"
maintainer="Paul Knopf <pauldotknopf@gmail.com>"
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 5141443fa58..cbaad14fb81 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -4,7 +4,7 @@ version=19.03.13
revision=1
create_wrksrc=yes
build_style=go
-hostmakedepends="go pkg-config cmake tar"
+hostmakedepends="pkg-config cmake tar"
makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
libapparmor-devel libltdl-devel"
depends="containerd runc"
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 8a4c8af65b3..588d7fe9aa3 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -4,7 +4,7 @@ version=2.12.1
revision=1
build_style=go
go_import_path="github.com/git-lfs/git-lfs"
-hostmakedepends="go git ruby-ronn"
+hostmakedepends="git ruby-ronn"
short_desc="Git extension for versioning large files"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="MIT"
diff --git a/srcpkgs/kubernetes-helm/template b/srcpkgs/kubernetes-helm/template
index 42f8d1bd443..e8278f10608 100644
--- a/srcpkgs/kubernetes-helm/template
+++ b/srcpkgs/kubernetes-helm/template
@@ -3,7 +3,7 @@ pkgname=kubernetes-helm
version=3.3.1
revision=1
wrksrc="helm-${version}"
-hostmakedepends="go make git mercurial tar"
+hostmakedepends="make git mercurial tar"
short_desc="Kubernetes Package Manager"
maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
license="Apache-2.0"
diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index b9e6246b1cd..74c3c32537e 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -5,7 +5,7 @@ revision=1
wrksrc="yggdrasil-go-${version}"
build_style=go
go_import_path=github.com/yggdrasil-network/yggdrasil-go
-hostmakedepends="go git"
+hostmakedepends="git"
short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"
maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
license="LGPL-3.0-only"
From 3b83d4a95c5af8e6fb03c87f285f08a42a8985ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:12:30 -0300
Subject: [PATCH 09/12] miniflux: fix checksum and wrksrc.
---
srcpkgs/miniflux/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 43ff6156c43..160e7adf0c3 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -3,6 +3,7 @@ pkgname=miniflux
version=2.0.24
revision=1
build_style=go
+wrksrc=v2-${version}
go_import_path="github.com/miniflux/miniflux"
go_package="miniflux.app"
hostmakedepends="git"
@@ -12,7 +13,7 @@ license="Apache-2.0"
homepage="https://miniflux.app"
changelog="https://raw.githubusercontent.com/miniflux/miniflux/${version}/ChangeLog"
distfiles="https://github.com/miniflux/miniflux/archive/${version}.tar.gz"
-checksum=4f0fa176b80bc8c34e4bfa954eebb3dc49c38c38c057b60831cda3162de43637
+checksum=58c0136d4687a36a8950d5b7626e68cd0bed0e89193b4891a89d8a6cf081afc5
system_accounts="_miniflux"
post_install() {
From 7b0c1df1364c733dbf57fd28a14269ebcc68fb19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:16:35 -0300
Subject: [PATCH 10/12] k3s: mark broken.
---
srcpkgs/k3s/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/k3s/template b/srcpkgs/k3s/template
index b0ee98e9268..88bb1ebfd4a 100644
--- a/srcpkgs/k3s/template
+++ b/srcpkgs/k3s/template
@@ -25,6 +25,7 @@ checksum="7b9222dcaa4bbc387dd6f38a653b7b2b09079987c19a399c6c4f3e5b3dc1d39c
75e02aa09edcfb2b43d41cd576e24099e9bca21d80bda0dcdc3f98f2357f1363
15dd78d136d7c9bae7144072052ef6cd12821ae081a7c085f145d834d96c5d5c"
skip_extraction="${_traefik_file}"
+broken="bad module versions"
_git_commit=18bd921cddee1e95cc03467a1b9636ddacd9d670
From 84e8d6d98215804d0c0d99d898279d0ceffa2101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:16:54 -0300
Subject: [PATCH 11/12] lxd-lts: add libco-devel to makedepends.
Necessary to fix final linking step.
---
srcpkgs/lxd-lts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lxd-lts/template b/srcpkgs/lxd-lts/template
index 12a119181f2..fe501323adb 100644
--- a/srcpkgs/lxd-lts/template
+++ b/srcpkgs/lxd-lts/template
@@ -9,7 +9,7 @@ go_build_tags="libsqlite3"
go_package="${go_import_path}/lxd ${go_import_path}/lxc
${go_import_path}/lxd-p2c ${go_import_path}/fuidshift"
hostmakedepends="pkg-config"
-makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel"
+makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel libco-devel"
depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables"
short_desc="Next generation system container manager (long term support channel)"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
From 27d84bf011a2337d29a8d8758cb62e90381825b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:17:31 -0300
Subject: [PATCH 12/12] goproxy: mark broken.
---
srcpkgs/goproxy/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/goproxy/template b/srcpkgs/goproxy/template
index 437471ffa75..17360cc6fb1 100644
--- a/srcpkgs/goproxy/template
+++ b/srcpkgs/goproxy/template
@@ -11,3 +11,4 @@ license="GPL-3.0-or-later"
homepage="https://github.com/snail007/goproxy"
distfiles="https://github.com/snail007/goproxy/archive/v${version}.tar.gz"
checksum=13f8e37d274d2b7b7cdf1ae3d98723fbb9acf1476c92a1e0d43039109d238ccc
+broken="7.0 tag was removed from repository"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
@ 2020-11-14 17:26 ` ericonr
2020-11-14 17:28 ` ericonr
` (19 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-11-14 17:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 528 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gorebuild
https://github.com/void-linux/void-packages/pull/26377
Go package clean up
While I get ready to do a full go rebuild, I found packages with various issues. Some broken ones and some had changed paths.
ping @the-maldridge @thypon @Vaelatern @misuchiru03 @renatoaguiar @steinex @CameronNemo
A patch file from https://github.com/void-linux/void-packages/pull/26377.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gorebuild-26377.patch --]
[-- Type: text/x-diff, Size: 13012 bytes --]
From 82188fc0c38315b378d614c23fa32b4182327c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:34:46 -0300
Subject: [PATCH 01/12] chronograf: mark broken.
---
srcpkgs/chronograf/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index b23d2ef09a3..d0f9876fb1b 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -18,6 +18,7 @@ system_accounts="_chronograf"
_chronograf_homedir="/var/lib/${pkgname}"
make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
+broken="fails to build v8: error: 'class Nan::Persistent<v8::Object>' has no member named 'IsNearDeath'"
case "$XBPS_TARGET_MACHINE" in
i686*) broken="yarn not available" ;;
ppc*) broken="ftbfs in some js module" ;;
From ffa7111f48b172e402b861f28ceabbe00f1aee2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:35:55 -0300
Subject: [PATCH 02/12] etcd: mark broken.
---
srcpkgs/etcd/template | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index 85c797e5aca..4d905d3ce4f 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -17,6 +17,8 @@ conf_files="/etc/sv/etcd/conf"
system_accounts="etcd"
make_dirs="/var/lib/etcd 0755 etcd etcd"
+broken="module declares its path as: go.etcd.io/bbolt ; but was required as: github.com/coreos/bbolt"
+
post_install() {
vlicense LICENSE
vsv etcd
From 6389b7b17237af80607354a418c3f1861bb84576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:40:21 -0300
Subject: [PATCH 03/12] dnote-cli: fix checksum and wrksrc.
---
srcpkgs/dnote-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dnote-cli/template b/srcpkgs/dnote-cli/template
index 309bee7649b..d58dd0954c8 100644
--- a/srcpkgs/dnote-cli/template
+++ b/srcpkgs/dnote-cli/template
@@ -2,7 +2,7 @@
pkgname=dnote-cli
version=0.6.2
revision=1
-wrksrc="cli-${version}"
+wrksrc="dnote-${version}"
build_style=go
go_import_path=github.com/dnote-io/cli
go_build_tags="fts5"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="MIT"
homepage="https://dnote.io/"
distfiles="https://github.com/dnote-io/cli/archive/v${version}.tar.gz"
-checksum=886f09dc20ff9cb56bdbc71eb7e78e7099b541fa0d830d4b4d0251b2fb32ad06
+checksum=6eb3f824f22d5821c08e832dabadf5664c73b83201a7a5c65632fc8d60bd041e
pre_build() {
cd $GOSRCPATH
From 1ebc7cd9ff37af2bb6b4b8edcdeecfe8810f1aff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:46:35 -0300
Subject: [PATCH 04/12] gfuzz: fix checksum, homepage and module paths.
---
srcpkgs/gfuzz/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index a51ea912896..59061b2904f 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -2,13 +2,13 @@
pkgname=gfuzz
version=0.2
revision=1
-wrksrc="gfuzz-${version}"
+wrksrc="gfz-${version}"
build_style=go
-go_import_path=github.com/braaaax/gfuzz
+go_import_path=github.com/braaaax/gfz
hostmakedepends="git"
short_desc="Web fuzzer like wfuzz written in Golang"
maintainer="Alex Childs <misuchiru03+void@gmail.com>"
license="Apache-2.0"
-homepage="https://github.com/braaaax/gfuzz"
-distfiles="https://github.com/braaaax/gfuzz/archive/v${version}.tar.gz"
-checksum=054163243181db528715bf904ee7656aa0a12e9feb120c8afbfd43bd6504ccd1
+homepage="https://github.com/braaaax/gfz"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=8b6a3df0c385fe993ead673df53daa290943220f2cde73e6b1c706ef94aa4e5f
From cc8c39abb3347a8948affbb1eaa061e5e95222f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 01:20:29 -0300
Subject: [PATCH 05/12] golangci-lint: temporarily broken.
Should be solved once Go 1.15.6 is released.
---
srcpkgs/golangci-lint/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 06dba517cda..4821b086a96 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -12,6 +12,7 @@ license="GPL-3.0-only"
homepage="https://github.com/golangci/golangci-lint"
distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
checksum=ff0e52ec28b5cf1dbc632db301c89dcf4352dd7376d0cc82e36571c609a0b339
+broken="broken until Go 1.15.6: https://github.com/golang/go/issues/42567"
# Cross builds fail with -fuse-ld=gold
LDFLAGS="-fuse-ld=bfd"
From b49b2c582b7ff9cb79ca8e051d439ae571104b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:05:19 -0300
Subject: [PATCH 06/12] wtplan: temporarily broken.
---
srcpkgs/wtplan/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/wtplan/template b/srcpkgs/wtplan/template
index 5a5b3a54740..0596fda0260 100644
--- a/srcpkgs/wtplan/template
+++ b/srcpkgs/wtplan/template
@@ -11,6 +11,7 @@ license="MIT"
homepage="https://github.com/kjellwinblad/wtplan/"
distfiles="https://github.com/kjellwinblad/wtplan/archive/${version}.tar.gz"
checksum=31c66181f815889828eb2bd3739d6b23582ec75a5a8d6c6bf76c2a6679112bb4
+broken="broken until Go 1.15.6: https://github.com/golang/go/issues/42567"
do_build() {
export GOPATH=$(pwd)
From 023f5467b590b09f9eb9cc585bf1be8f739b026c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:05:45 -0300
Subject: [PATCH 07/12] rkt: mark broken.
---
srcpkgs/rkt/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template
index 84d4e32837a..e1e8cb35eeb 100644
--- a/srcpkgs/rkt/template
+++ b/srcpkgs/rkt/template
@@ -16,6 +16,7 @@ license="Apache-2.0"
homepage="https://github.com/coreos/rkt"
distfiles="https://github.com/coreos/rkt/archive/v${version}.tar.gz"
checksum=4d22c742b87d15c226cc28970c7daf66a64c6a95af9d752f5b72d9a4012aca1d
+broken="Build can't find usr_from_coreoskvmhostsrcfly.mk"
patch_args="-Np1"
nopie=yes
From 6ea764acbb32e61c25e1ef1d49823a490dcf3dc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:11:30 -0300
Subject: [PATCH 08/12] srcpkgs: remove go from hostmakedepends for packages
with build_style=go.
---
srcpkgs/darch/template | 2 +-
srcpkgs/docker/template | 2 +-
srcpkgs/git-lfs/template | 2 +-
srcpkgs/kubernetes-helm/template | 2 +-
srcpkgs/yggdrasil/template | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 238eebd3158..161af0a666b 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -7,7 +7,7 @@ build_style=go
go_import_path=github.com/godarch/darch
conf_files="/etc/darch/hooks/ssh/hook /etc/darch/hooks/hostname/hook /etc/darch/hooks/fstab/hook"
make_dirs="/var/lib/darch 0755 root root"
-hostmakedepends="git go"
+hostmakedepends="git"
depends="containerd"
short_desc="Tool for building/booting stateless and immutable images, bare metal"
maintainer="Paul Knopf <pauldotknopf@gmail.com>"
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 5141443fa58..cbaad14fb81 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -4,7 +4,7 @@ version=19.03.13
revision=1
create_wrksrc=yes
build_style=go
-hostmakedepends="go pkg-config cmake tar"
+hostmakedepends="pkg-config cmake tar"
makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
libapparmor-devel libltdl-devel"
depends="containerd runc"
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 8a4c8af65b3..588d7fe9aa3 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -4,7 +4,7 @@ version=2.12.1
revision=1
build_style=go
go_import_path="github.com/git-lfs/git-lfs"
-hostmakedepends="go git ruby-ronn"
+hostmakedepends="git ruby-ronn"
short_desc="Git extension for versioning large files"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="MIT"
diff --git a/srcpkgs/kubernetes-helm/template b/srcpkgs/kubernetes-helm/template
index 42f8d1bd443..e8278f10608 100644
--- a/srcpkgs/kubernetes-helm/template
+++ b/srcpkgs/kubernetes-helm/template
@@ -3,7 +3,7 @@ pkgname=kubernetes-helm
version=3.3.1
revision=1
wrksrc="helm-${version}"
-hostmakedepends="go make git mercurial tar"
+hostmakedepends="make git mercurial tar"
short_desc="Kubernetes Package Manager"
maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
license="Apache-2.0"
diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index b9e6246b1cd..74c3c32537e 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -5,7 +5,7 @@ revision=1
wrksrc="yggdrasil-go-${version}"
build_style=go
go_import_path=github.com/yggdrasil-network/yggdrasil-go
-hostmakedepends="go git"
+hostmakedepends="git"
short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"
maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
license="LGPL-3.0-only"
From 4185c510b4dacdc27007f0fd87b829a74b1f73be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:12:30 -0300
Subject: [PATCH 09/12] miniflux: fix checksum and wrksrc.
---
srcpkgs/miniflux/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 43ff6156c43..d0aa041b79f 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -2,6 +2,7 @@
pkgname=miniflux
version=2.0.24
revision=1
+wrksrc=v2-${version}
build_style=go
go_import_path="github.com/miniflux/miniflux"
go_package="miniflux.app"
@@ -12,7 +13,7 @@ license="Apache-2.0"
homepage="https://miniflux.app"
changelog="https://raw.githubusercontent.com/miniflux/miniflux/${version}/ChangeLog"
distfiles="https://github.com/miniflux/miniflux/archive/${version}.tar.gz"
-checksum=4f0fa176b80bc8c34e4bfa954eebb3dc49c38c38c057b60831cda3162de43637
+checksum=58c0136d4687a36a8950d5b7626e68cd0bed0e89193b4891a89d8a6cf081afc5
system_accounts="_miniflux"
post_install() {
From 2d5311e5f076d80241744f5fb7614e34a35945f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:16:35 -0300
Subject: [PATCH 10/12] k3s: mark broken.
---
srcpkgs/k3s/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/k3s/template b/srcpkgs/k3s/template
index b0ee98e9268..88bb1ebfd4a 100644
--- a/srcpkgs/k3s/template
+++ b/srcpkgs/k3s/template
@@ -25,6 +25,7 @@ checksum="7b9222dcaa4bbc387dd6f38a653b7b2b09079987c19a399c6c4f3e5b3dc1d39c
75e02aa09edcfb2b43d41cd576e24099e9bca21d80bda0dcdc3f98f2357f1363
15dd78d136d7c9bae7144072052ef6cd12821ae081a7c085f145d834d96c5d5c"
skip_extraction="${_traefik_file}"
+broken="bad module versions"
_git_commit=18bd921cddee1e95cc03467a1b9636ddacd9d670
From 465f53fd602fc185e1fe7096a110c04c7715b51f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:16:54 -0300
Subject: [PATCH 11/12] lxd-lts: add libco-devel to makedepends.
Necessary to fix final linking step.
---
srcpkgs/lxd-lts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lxd-lts/template b/srcpkgs/lxd-lts/template
index 12a119181f2..fe501323adb 100644
--- a/srcpkgs/lxd-lts/template
+++ b/srcpkgs/lxd-lts/template
@@ -9,7 +9,7 @@ go_build_tags="libsqlite3"
go_package="${go_import_path}/lxd ${go_import_path}/lxc
${go_import_path}/lxd-p2c ${go_import_path}/fuidshift"
hostmakedepends="pkg-config"
-makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel"
+makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel libco-devel"
depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables"
short_desc="Next generation system container manager (long term support channel)"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
From a8de9d9a3b6715f04068c9a48eae3b6bf5f9122b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:17:31 -0300
Subject: [PATCH 12/12] goproxy: mark broken.
---
srcpkgs/goproxy/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/goproxy/template b/srcpkgs/goproxy/template
index 437471ffa75..17360cc6fb1 100644
--- a/srcpkgs/goproxy/template
+++ b/srcpkgs/goproxy/template
@@ -11,3 +11,4 @@ license="GPL-3.0-or-later"
homepage="https://github.com/snail007/goproxy"
distfiles="https://github.com/snail007/goproxy/archive/v${version}.tar.gz"
checksum=13f8e37d274d2b7b7cdf1ae3d98723fbb9acf1476c92a1e0d43039109d238ccc
+broken="7.0 tag was removed from repository"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
2020-11-14 17:26 ` [PR PATCH] [Updated] " ericonr
@ 2020-11-14 17:28 ` ericonr
2020-11-14 17:34 ` ericonr
` (18 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-11-14 17:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 528 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gorebuild
https://github.com/void-linux/void-packages/pull/26377
Go package clean up
While I get ready to do a full go rebuild, I found packages with various issues. Some broken ones and some had changed paths.
ping @the-maldridge @thypon @Vaelatern @misuchiru03 @renatoaguiar @steinex @CameronNemo
A patch file from https://github.com/void-linux/void-packages/pull/26377.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gorebuild-26377.patch --]
[-- Type: text/x-diff, Size: 12456 bytes --]
From 82188fc0c38315b378d614c23fa32b4182327c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:34:46 -0300
Subject: [PATCH 01/12] chronograf: mark broken.
---
srcpkgs/chronograf/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index b23d2ef09a3..d0f9876fb1b 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -18,6 +18,7 @@ system_accounts="_chronograf"
_chronograf_homedir="/var/lib/${pkgname}"
make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
+broken="fails to build v8: error: 'class Nan::Persistent<v8::Object>' has no member named 'IsNearDeath'"
case "$XBPS_TARGET_MACHINE" in
i686*) broken="yarn not available" ;;
ppc*) broken="ftbfs in some js module" ;;
From ffa7111f48b172e402b861f28ceabbe00f1aee2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:35:55 -0300
Subject: [PATCH 02/12] etcd: mark broken.
---
srcpkgs/etcd/template | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index 85c797e5aca..4d905d3ce4f 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -17,6 +17,8 @@ conf_files="/etc/sv/etcd/conf"
system_accounts="etcd"
make_dirs="/var/lib/etcd 0755 etcd etcd"
+broken="module declares its path as: go.etcd.io/bbolt ; but was required as: github.com/coreos/bbolt"
+
post_install() {
vlicense LICENSE
vsv etcd
From 6389b7b17237af80607354a418c3f1861bb84576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:40:21 -0300
Subject: [PATCH 03/12] dnote-cli: fix checksum and wrksrc.
---
srcpkgs/dnote-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dnote-cli/template b/srcpkgs/dnote-cli/template
index 309bee7649b..d58dd0954c8 100644
--- a/srcpkgs/dnote-cli/template
+++ b/srcpkgs/dnote-cli/template
@@ -2,7 +2,7 @@
pkgname=dnote-cli
version=0.6.2
revision=1
-wrksrc="cli-${version}"
+wrksrc="dnote-${version}"
build_style=go
go_import_path=github.com/dnote-io/cli
go_build_tags="fts5"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="MIT"
homepage="https://dnote.io/"
distfiles="https://github.com/dnote-io/cli/archive/v${version}.tar.gz"
-checksum=886f09dc20ff9cb56bdbc71eb7e78e7099b541fa0d830d4b4d0251b2fb32ad06
+checksum=6eb3f824f22d5821c08e832dabadf5664c73b83201a7a5c65632fc8d60bd041e
pre_build() {
cd $GOSRCPATH
From 1ebc7cd9ff37af2bb6b4b8edcdeecfe8810f1aff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:46:35 -0300
Subject: [PATCH 04/12] gfuzz: fix checksum, homepage and module paths.
---
srcpkgs/gfuzz/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index a51ea912896..59061b2904f 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -2,13 +2,13 @@
pkgname=gfuzz
version=0.2
revision=1
-wrksrc="gfuzz-${version}"
+wrksrc="gfz-${version}"
build_style=go
-go_import_path=github.com/braaaax/gfuzz
+go_import_path=github.com/braaaax/gfz
hostmakedepends="git"
short_desc="Web fuzzer like wfuzz written in Golang"
maintainer="Alex Childs <misuchiru03+void@gmail.com>"
license="Apache-2.0"
-homepage="https://github.com/braaaax/gfuzz"
-distfiles="https://github.com/braaaax/gfuzz/archive/v${version}.tar.gz"
-checksum=054163243181db528715bf904ee7656aa0a12e9feb120c8afbfd43bd6504ccd1
+homepage="https://github.com/braaaax/gfz"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=8b6a3df0c385fe993ead673df53daa290943220f2cde73e6b1c706ef94aa4e5f
From cc8c39abb3347a8948affbb1eaa061e5e95222f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 01:20:29 -0300
Subject: [PATCH 05/12] golangci-lint: temporarily broken.
Should be solved once Go 1.15.6 is released.
---
srcpkgs/golangci-lint/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 06dba517cda..4821b086a96 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -12,6 +12,7 @@ license="GPL-3.0-only"
homepage="https://github.com/golangci/golangci-lint"
distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
checksum=ff0e52ec28b5cf1dbc632db301c89dcf4352dd7376d0cc82e36571c609a0b339
+broken="broken until Go 1.15.6: https://github.com/golang/go/issues/42567"
# Cross builds fail with -fuse-ld=gold
LDFLAGS="-fuse-ld=bfd"
From b49b2c582b7ff9cb79ca8e051d439ae571104b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:05:19 -0300
Subject: [PATCH 06/12] wtplan: temporarily broken.
---
srcpkgs/wtplan/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/wtplan/template b/srcpkgs/wtplan/template
index 5a5b3a54740..0596fda0260 100644
--- a/srcpkgs/wtplan/template
+++ b/srcpkgs/wtplan/template
@@ -11,6 +11,7 @@ license="MIT"
homepage="https://github.com/kjellwinblad/wtplan/"
distfiles="https://github.com/kjellwinblad/wtplan/archive/${version}.tar.gz"
checksum=31c66181f815889828eb2bd3739d6b23582ec75a5a8d6c6bf76c2a6679112bb4
+broken="broken until Go 1.15.6: https://github.com/golang/go/issues/42567"
do_build() {
export GOPATH=$(pwd)
From 023f5467b590b09f9eb9cc585bf1be8f739b026c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:05:45 -0300
Subject: [PATCH 07/12] rkt: mark broken.
---
srcpkgs/rkt/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template
index 84d4e32837a..e1e8cb35eeb 100644
--- a/srcpkgs/rkt/template
+++ b/srcpkgs/rkt/template
@@ -16,6 +16,7 @@ license="Apache-2.0"
homepage="https://github.com/coreos/rkt"
distfiles="https://github.com/coreos/rkt/archive/v${version}.tar.gz"
checksum=4d22c742b87d15c226cc28970c7daf66a64c6a95af9d752f5b72d9a4012aca1d
+broken="Build can't find usr_from_coreoskvmhostsrcfly.mk"
patch_args="-Np1"
nopie=yes
From 142a3e1a5ec0afd52b210326d7bc80fc9fb4b00d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:11:30 -0300
Subject: [PATCH 08/12] srcpkgs: remove go from hostmakedepends for packages
with build_style=go.
---
srcpkgs/darch/template | 2 +-
srcpkgs/docker/template | 2 +-
srcpkgs/git-lfs/template | 2 +-
srcpkgs/yggdrasil/template | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 238eebd3158..161af0a666b 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -7,7 +7,7 @@ build_style=go
go_import_path=github.com/godarch/darch
conf_files="/etc/darch/hooks/ssh/hook /etc/darch/hooks/hostname/hook /etc/darch/hooks/fstab/hook"
make_dirs="/var/lib/darch 0755 root root"
-hostmakedepends="git go"
+hostmakedepends="git"
depends="containerd"
short_desc="Tool for building/booting stateless and immutable images, bare metal"
maintainer="Paul Knopf <pauldotknopf@gmail.com>"
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 5141443fa58..cbaad14fb81 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -4,7 +4,7 @@ version=19.03.13
revision=1
create_wrksrc=yes
build_style=go
-hostmakedepends="go pkg-config cmake tar"
+hostmakedepends="pkg-config cmake tar"
makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
libapparmor-devel libltdl-devel"
depends="containerd runc"
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 8a4c8af65b3..588d7fe9aa3 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -4,7 +4,7 @@ version=2.12.1
revision=1
build_style=go
go_import_path="github.com/git-lfs/git-lfs"
-hostmakedepends="go git ruby-ronn"
+hostmakedepends="git ruby-ronn"
short_desc="Git extension for versioning large files"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="MIT"
diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index b9e6246b1cd..74c3c32537e 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -5,7 +5,7 @@ revision=1
wrksrc="yggdrasil-go-${version}"
build_style=go
go_import_path=github.com/yggdrasil-network/yggdrasil-go
-hostmakedepends="go git"
+hostmakedepends="git"
short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"
maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
license="LGPL-3.0-only"
From ebf37e3756e0e7e3ee236d679f71af6184afe92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:12:30 -0300
Subject: [PATCH 09/12] miniflux: fix checksum and wrksrc.
---
srcpkgs/miniflux/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 43ff6156c43..d0aa041b79f 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -2,6 +2,7 @@
pkgname=miniflux
version=2.0.24
revision=1
+wrksrc=v2-${version}
build_style=go
go_import_path="github.com/miniflux/miniflux"
go_package="miniflux.app"
@@ -12,7 +13,7 @@ license="Apache-2.0"
homepage="https://miniflux.app"
changelog="https://raw.githubusercontent.com/miniflux/miniflux/${version}/ChangeLog"
distfiles="https://github.com/miniflux/miniflux/archive/${version}.tar.gz"
-checksum=4f0fa176b80bc8c34e4bfa954eebb3dc49c38c38c057b60831cda3162de43637
+checksum=58c0136d4687a36a8950d5b7626e68cd0bed0e89193b4891a89d8a6cf081afc5
system_accounts="_miniflux"
post_install() {
From 287989dce1df8b4af700445d728079d2aebf63ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:16:35 -0300
Subject: [PATCH 10/12] k3s: mark broken.
---
srcpkgs/k3s/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/k3s/template b/srcpkgs/k3s/template
index b0ee98e9268..88bb1ebfd4a 100644
--- a/srcpkgs/k3s/template
+++ b/srcpkgs/k3s/template
@@ -25,6 +25,7 @@ checksum="7b9222dcaa4bbc387dd6f38a653b7b2b09079987c19a399c6c4f3e5b3dc1d39c
75e02aa09edcfb2b43d41cd576e24099e9bca21d80bda0dcdc3f98f2357f1363
15dd78d136d7c9bae7144072052ef6cd12821ae081a7c085f145d834d96c5d5c"
skip_extraction="${_traefik_file}"
+broken="bad module versions"
_git_commit=18bd921cddee1e95cc03467a1b9636ddacd9d670
From 73ea6724dd0ce0be67e1cfe91e83965bc50311e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:16:54 -0300
Subject: [PATCH 11/12] lxd-lts: add libco-devel to makedepends.
Necessary to fix final linking step.
---
srcpkgs/lxd-lts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lxd-lts/template b/srcpkgs/lxd-lts/template
index 12a119181f2..fe501323adb 100644
--- a/srcpkgs/lxd-lts/template
+++ b/srcpkgs/lxd-lts/template
@@ -9,7 +9,7 @@ go_build_tags="libsqlite3"
go_package="${go_import_path}/lxd ${go_import_path}/lxc
${go_import_path}/lxd-p2c ${go_import_path}/fuidshift"
hostmakedepends="pkg-config"
-makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel"
+makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel libco-devel"
depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables"
short_desc="Next generation system container manager (long term support channel)"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
From 2cf429a0066db9d15ac0eed6451241c45c77f67b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:17:31 -0300
Subject: [PATCH 12/12] goproxy: mark broken.
---
srcpkgs/goproxy/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/goproxy/template b/srcpkgs/goproxy/template
index 437471ffa75..17360cc6fb1 100644
--- a/srcpkgs/goproxy/template
+++ b/srcpkgs/goproxy/template
@@ -11,3 +11,4 @@ license="GPL-3.0-or-later"
homepage="https://github.com/snail007/goproxy"
distfiles="https://github.com/snail007/goproxy/archive/v${version}.tar.gz"
checksum=13f8e37d274d2b7b7cdf1ae3d98723fbb9acf1476c92a1e0d43039109d238ccc
+broken="7.0 tag was removed from repository"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
2020-11-14 17:26 ` [PR PATCH] [Updated] " ericonr
2020-11-14 17:28 ` ericonr
@ 2020-11-14 17:34 ` ericonr
2020-11-14 19:25 ` ericonr
` (17 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-11-14 17:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 528 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gorebuild
https://github.com/void-linux/void-packages/pull/26377
Go package clean up
While I get ready to do a full go rebuild, I found packages with various issues. Some broken ones and some had changed paths.
ping @the-maldridge @thypon @Vaelatern @misuchiru03 @renatoaguiar @steinex @CameronNemo
A patch file from https://github.com/void-linux/void-packages/pull/26377.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gorebuild-26377.patch --]
[-- Type: text/x-diff, Size: 12888 bytes --]
From 82188fc0c38315b378d614c23fa32b4182327c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:34:46 -0300
Subject: [PATCH 01/12] chronograf: mark broken.
---
srcpkgs/chronograf/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index b23d2ef09a3..d0f9876fb1b 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -18,6 +18,7 @@ system_accounts="_chronograf"
_chronograf_homedir="/var/lib/${pkgname}"
make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
+broken="fails to build v8: error: 'class Nan::Persistent<v8::Object>' has no member named 'IsNearDeath'"
case "$XBPS_TARGET_MACHINE" in
i686*) broken="yarn not available" ;;
ppc*) broken="ftbfs in some js module" ;;
From 662ababd67216b7fc52c2bf08166c19b3ed5df53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:40:21 -0300
Subject: [PATCH 02/12] dnote-cli: fix checksum and wrksrc.
---
srcpkgs/dnote-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dnote-cli/template b/srcpkgs/dnote-cli/template
index 309bee7649b..d58dd0954c8 100644
--- a/srcpkgs/dnote-cli/template
+++ b/srcpkgs/dnote-cli/template
@@ -2,7 +2,7 @@
pkgname=dnote-cli
version=0.6.2
revision=1
-wrksrc="cli-${version}"
+wrksrc="dnote-${version}"
build_style=go
go_import_path=github.com/dnote-io/cli
go_build_tags="fts5"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="MIT"
homepage="https://dnote.io/"
distfiles="https://github.com/dnote-io/cli/archive/v${version}.tar.gz"
-checksum=886f09dc20ff9cb56bdbc71eb7e78e7099b541fa0d830d4b4d0251b2fb32ad06
+checksum=6eb3f824f22d5821c08e832dabadf5664c73b83201a7a5c65632fc8d60bd041e
pre_build() {
cd $GOSRCPATH
From dbbcb0f89937542be8310d39891a2202d346a3c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:46:35 -0300
Subject: [PATCH 03/12] gfuzz: fix checksum, homepage and module paths.
---
srcpkgs/gfuzz/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index a51ea912896..59061b2904f 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -2,13 +2,13 @@
pkgname=gfuzz
version=0.2
revision=1
-wrksrc="gfuzz-${version}"
+wrksrc="gfz-${version}"
build_style=go
-go_import_path=github.com/braaaax/gfuzz
+go_import_path=github.com/braaaax/gfz
hostmakedepends="git"
short_desc="Web fuzzer like wfuzz written in Golang"
maintainer="Alex Childs <misuchiru03+void@gmail.com>"
license="Apache-2.0"
-homepage="https://github.com/braaaax/gfuzz"
-distfiles="https://github.com/braaaax/gfuzz/archive/v${version}.tar.gz"
-checksum=054163243181db528715bf904ee7656aa0a12e9feb120c8afbfd43bd6504ccd1
+homepage="https://github.com/braaaax/gfz"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=8b6a3df0c385fe993ead673df53daa290943220f2cde73e6b1c706ef94aa4e5f
From 101c5551ae702bbe2a2bf1df505855eb87e00dfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 01:20:29 -0300
Subject: [PATCH 04/12] golangci-lint: temporarily broken.
Should be solved once Go 1.15.6 is released.
---
srcpkgs/golangci-lint/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 06dba517cda..4821b086a96 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -12,6 +12,7 @@ license="GPL-3.0-only"
homepage="https://github.com/golangci/golangci-lint"
distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
checksum=ff0e52ec28b5cf1dbc632db301c89dcf4352dd7376d0cc82e36571c609a0b339
+broken="broken until Go 1.15.6: https://github.com/golang/go/issues/42567"
# Cross builds fail with -fuse-ld=gold
LDFLAGS="-fuse-ld=bfd"
From a12f7243c113f72252e2d41be64b0943808344ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:05:19 -0300
Subject: [PATCH 05/12] wtplan: temporarily broken.
---
srcpkgs/wtplan/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/wtplan/template b/srcpkgs/wtplan/template
index 5a5b3a54740..0596fda0260 100644
--- a/srcpkgs/wtplan/template
+++ b/srcpkgs/wtplan/template
@@ -11,6 +11,7 @@ license="MIT"
homepage="https://github.com/kjellwinblad/wtplan/"
distfiles="https://github.com/kjellwinblad/wtplan/archive/${version}.tar.gz"
checksum=31c66181f815889828eb2bd3739d6b23582ec75a5a8d6c6bf76c2a6679112bb4
+broken="broken until Go 1.15.6: https://github.com/golang/go/issues/42567"
do_build() {
export GOPATH=$(pwd)
From 7431083e56f17f7cdb813de1858367ab99ab42e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:05:45 -0300
Subject: [PATCH 06/12] rkt: mark broken.
---
srcpkgs/rkt/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template
index 84d4e32837a..e1e8cb35eeb 100644
--- a/srcpkgs/rkt/template
+++ b/srcpkgs/rkt/template
@@ -16,6 +16,7 @@ license="Apache-2.0"
homepage="https://github.com/coreos/rkt"
distfiles="https://github.com/coreos/rkt/archive/v${version}.tar.gz"
checksum=4d22c742b87d15c226cc28970c7daf66a64c6a95af9d752f5b72d9a4012aca1d
+broken="Build can't find usr_from_coreoskvmhostsrcfly.mk"
patch_args="-Np1"
nopie=yes
From 3c86a3fdd0ae5c177d0c2ede4c15f8cbaa7319fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:11:30 -0300
Subject: [PATCH 07/12] srcpkgs: remove go from hostmakedepends for packages
with build_style=go.
---
srcpkgs/darch/template | 2 +-
srcpkgs/docker/template | 2 +-
srcpkgs/git-lfs/template | 2 +-
srcpkgs/yggdrasil/template | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 238eebd3158..161af0a666b 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -7,7 +7,7 @@ build_style=go
go_import_path=github.com/godarch/darch
conf_files="/etc/darch/hooks/ssh/hook /etc/darch/hooks/hostname/hook /etc/darch/hooks/fstab/hook"
make_dirs="/var/lib/darch 0755 root root"
-hostmakedepends="git go"
+hostmakedepends="git"
depends="containerd"
short_desc="Tool for building/booting stateless and immutable images, bare metal"
maintainer="Paul Knopf <pauldotknopf@gmail.com>"
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 5141443fa58..cbaad14fb81 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -4,7 +4,7 @@ version=19.03.13
revision=1
create_wrksrc=yes
build_style=go
-hostmakedepends="go pkg-config cmake tar"
+hostmakedepends="pkg-config cmake tar"
makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
libapparmor-devel libltdl-devel"
depends="containerd runc"
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 8a4c8af65b3..588d7fe9aa3 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -4,7 +4,7 @@ version=2.12.1
revision=1
build_style=go
go_import_path="github.com/git-lfs/git-lfs"
-hostmakedepends="go git ruby-ronn"
+hostmakedepends="git ruby-ronn"
short_desc="Git extension for versioning large files"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="MIT"
diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index b9e6246b1cd..74c3c32537e 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -5,7 +5,7 @@ revision=1
wrksrc="yggdrasil-go-${version}"
build_style=go
go_import_path=github.com/yggdrasil-network/yggdrasil-go
-hostmakedepends="go git"
+hostmakedepends="git"
short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"
maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
license="LGPL-3.0-only"
From dabdf9468937ef303090fae4e3063ccd4f5f2cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:12:30 -0300
Subject: [PATCH 08/12] miniflux: fix checksum and wrksrc.
---
srcpkgs/miniflux/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 43ff6156c43..d0aa041b79f 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -2,6 +2,7 @@
pkgname=miniflux
version=2.0.24
revision=1
+wrksrc=v2-${version}
build_style=go
go_import_path="github.com/miniflux/miniflux"
go_package="miniflux.app"
@@ -12,7 +13,7 @@ license="Apache-2.0"
homepage="https://miniflux.app"
changelog="https://raw.githubusercontent.com/miniflux/miniflux/${version}/ChangeLog"
distfiles="https://github.com/miniflux/miniflux/archive/${version}.tar.gz"
-checksum=4f0fa176b80bc8c34e4bfa954eebb3dc49c38c38c057b60831cda3162de43637
+checksum=58c0136d4687a36a8950d5b7626e68cd0bed0e89193b4891a89d8a6cf081afc5
system_accounts="_miniflux"
post_install() {
From 74d68a0804bc7756f15ae23b90ce48eca0b477bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:16:35 -0300
Subject: [PATCH 09/12] k3s: mark broken.
---
srcpkgs/k3s/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/k3s/template b/srcpkgs/k3s/template
index b0ee98e9268..88bb1ebfd4a 100644
--- a/srcpkgs/k3s/template
+++ b/srcpkgs/k3s/template
@@ -25,6 +25,7 @@ checksum="7b9222dcaa4bbc387dd6f38a653b7b2b09079987c19a399c6c4f3e5b3dc1d39c
75e02aa09edcfb2b43d41cd576e24099e9bca21d80bda0dcdc3f98f2357f1363
15dd78d136d7c9bae7144072052ef6cd12821ae081a7c085f145d834d96c5d5c"
skip_extraction="${_traefik_file}"
+broken="bad module versions"
_git_commit=18bd921cddee1e95cc03467a1b9636ddacd9d670
From 519c58a047099aa06d85e2e5e1a5ca170bf41614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:16:54 -0300
Subject: [PATCH 10/12] lxd-lts: add libco-devel to makedepends.
Necessary to fix final linking step.
---
srcpkgs/lxd-lts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lxd-lts/template b/srcpkgs/lxd-lts/template
index 12a119181f2..fe501323adb 100644
--- a/srcpkgs/lxd-lts/template
+++ b/srcpkgs/lxd-lts/template
@@ -9,7 +9,7 @@ go_build_tags="libsqlite3"
go_package="${go_import_path}/lxd ${go_import_path}/lxc
${go_import_path}/lxd-p2c ${go_import_path}/fuidshift"
hostmakedepends="pkg-config"
-makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel"
+makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel libco-devel"
depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables"
short_desc="Next generation system container manager (long term support channel)"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
From 915edeb9df58dbf668ada32aced64032b97f5bf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:17:31 -0300
Subject: [PATCH 11/12] goproxy: mark broken.
---
srcpkgs/goproxy/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/goproxy/template b/srcpkgs/goproxy/template
index 437471ffa75..17360cc6fb1 100644
--- a/srcpkgs/goproxy/template
+++ b/srcpkgs/goproxy/template
@@ -11,3 +11,4 @@ license="GPL-3.0-or-later"
homepage="https://github.com/snail007/goproxy"
distfiles="https://github.com/snail007/goproxy/archive/v${version}.tar.gz"
checksum=13f8e37d274d2b7b7cdf1ae3d98723fbb9acf1476c92a1e0d43039109d238ccc
+broken="7.0 tag was removed from repository"
From 8a887c4c245b128e03158f9be0161c9db9c2f7d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 12 Sep 2020 07:57:27 +0700
Subject: [PATCH 12/12] etcd: replace github.com/coreos/bbolt =>
go.etcd.io/bbolt
For some reason, they changed their package path but not import path.
I don't use etcd, I don't want to be blamed for version bump.
---
srcpkgs/etcd/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index 85c797e5aca..ff45ca711d0 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -1,7 +1,7 @@
# Template file for 'etcd'
pkgname=etcd
version=3.4.4
-revision=1
+revision=2
build_style=go
short_desc="Distributed reliable key-value store"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -17,6 +17,10 @@ conf_files="/etc/sv/etcd/conf"
system_accounts="etcd"
make_dirs="/var/lib/etcd 0755 etcd etcd"
+post_patch() {
+ echo "replace github.com/coreos/bbolt => go.etcd.io/bbolt v1.3.5" >>go.mod
+}
+
post_install() {
vlicense LICENSE
vsv etcd
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
` (2 preceding siblings ...)
2020-11-14 17:34 ` ericonr
@ 2020-11-14 19:25 ` ericonr
2020-11-14 20:54 ` pullmoll
` (16 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-11-14 19:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 528 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gorebuild
https://github.com/void-linux/void-packages/pull/26377
Go package clean up
While I get ready to do a full go rebuild, I found packages with various issues. Some broken ones and some had changed paths.
ping @the-maldridge @thypon @Vaelatern @misuchiru03 @renatoaguiar @steinex @CameronNemo
A patch file from https://github.com/void-linux/void-packages/pull/26377.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gorebuild-26377.patch --]
[-- Type: text/x-diff, Size: 13921 bytes --]
From 28e1f2f5c1e6d7e8b807efed649da0fd422da5f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:34:46 -0300
Subject: [PATCH 01/12] chronograf: mark broken, xlintify.
---
srcpkgs/chronograf/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index b23d2ef09a3..46764aa6586 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -9,7 +9,7 @@ go_ldflags="-X main.version=${version}"
hostmakedepends="dep go-bindata nodejs-lts yarn python"
short_desc="Open source monitoring and visualization UI for the TICK stack"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="AGPL-3.0"
+license="AGPL-3.0-or-later"
homepage="https://www.influxdata.com/time-series-platform/chronograf/"
distfiles="https://github.com/influxdata/${pkgname}/archive/${version}.tar.gz"
checksum=245479b691e2ad484717778562ce9e0c21b1d769e7d748335d1c5f41cd677d4c
@@ -18,6 +18,7 @@ system_accounts="_chronograf"
_chronograf_homedir="/var/lib/${pkgname}"
make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
+broken="fails to build v8: error: 'class Nan::Persistent<v8::Object>' has no member named 'IsNearDeath'"
case "$XBPS_TARGET_MACHINE" in
i686*) broken="yarn not available" ;;
ppc*) broken="ftbfs in some js module" ;;
From 8c0aeab47f789f54192f8adb06b46c37bd263bbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:40:21 -0300
Subject: [PATCH 02/12] dnote-cli: fix checksum and wrksrc.
---
srcpkgs/dnote-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dnote-cli/template b/srcpkgs/dnote-cli/template
index 309bee7649b..d58dd0954c8 100644
--- a/srcpkgs/dnote-cli/template
+++ b/srcpkgs/dnote-cli/template
@@ -2,7 +2,7 @@
pkgname=dnote-cli
version=0.6.2
revision=1
-wrksrc="cli-${version}"
+wrksrc="dnote-${version}"
build_style=go
go_import_path=github.com/dnote-io/cli
go_build_tags="fts5"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="MIT"
homepage="https://dnote.io/"
distfiles="https://github.com/dnote-io/cli/archive/v${version}.tar.gz"
-checksum=886f09dc20ff9cb56bdbc71eb7e78e7099b541fa0d830d4b4d0251b2fb32ad06
+checksum=6eb3f824f22d5821c08e832dabadf5664c73b83201a7a5c65632fc8d60bd041e
pre_build() {
cd $GOSRCPATH
From 39ba229e04356f9fcea44d33e22a92d80ed7674e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:46:35 -0300
Subject: [PATCH 03/12] gfuzz: fix checksum, homepage and module paths.
---
srcpkgs/gfuzz/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index a51ea912896..59061b2904f 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -2,13 +2,13 @@
pkgname=gfuzz
version=0.2
revision=1
-wrksrc="gfuzz-${version}"
+wrksrc="gfz-${version}"
build_style=go
-go_import_path=github.com/braaaax/gfuzz
+go_import_path=github.com/braaaax/gfz
hostmakedepends="git"
short_desc="Web fuzzer like wfuzz written in Golang"
maintainer="Alex Childs <misuchiru03+void@gmail.com>"
license="Apache-2.0"
-homepage="https://github.com/braaaax/gfuzz"
-distfiles="https://github.com/braaaax/gfuzz/archive/v${version}.tar.gz"
-checksum=054163243181db528715bf904ee7656aa0a12e9feb120c8afbfd43bd6504ccd1
+homepage="https://github.com/braaaax/gfz"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=8b6a3df0c385fe993ead673df53daa290943220f2cde73e6b1c706ef94aa4e5f
From 1d60a4f9c3b88a1f3466fecc6f0808e9b905f429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 01:20:29 -0300
Subject: [PATCH 04/12] golangci-lint: temporarily broken.
Should be solved once Go 1.15.6 is released.
---
srcpkgs/golangci-lint/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 06dba517cda..4821b086a96 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -12,6 +12,7 @@ license="GPL-3.0-only"
homepage="https://github.com/golangci/golangci-lint"
distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
checksum=ff0e52ec28b5cf1dbc632db301c89dcf4352dd7376d0cc82e36571c609a0b339
+broken="broken until Go 1.15.6: https://github.com/golang/go/issues/42567"
# Cross builds fail with -fuse-ld=gold
LDFLAGS="-fuse-ld=bfd"
From 8b9376a042adf57581e61dc68b5974ac26bb461c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:05:19 -0300
Subject: [PATCH 05/12] wtplan: temporarily broken.
---
srcpkgs/wtplan/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/wtplan/template b/srcpkgs/wtplan/template
index 5a5b3a54740..0596fda0260 100644
--- a/srcpkgs/wtplan/template
+++ b/srcpkgs/wtplan/template
@@ -11,6 +11,7 @@ license="MIT"
homepage="https://github.com/kjellwinblad/wtplan/"
distfiles="https://github.com/kjellwinblad/wtplan/archive/${version}.tar.gz"
checksum=31c66181f815889828eb2bd3739d6b23582ec75a5a8d6c6bf76c2a6679112bb4
+broken="broken until Go 1.15.6: https://github.com/golang/go/issues/42567"
do_build() {
export GOPATH=$(pwd)
From cbd10dc4067a1fa41d758f4ecc07c426302e1755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:05:45 -0300
Subject: [PATCH 06/12] rkt: mark broken.
---
srcpkgs/rkt/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template
index 84d4e32837a..e1e8cb35eeb 100644
--- a/srcpkgs/rkt/template
+++ b/srcpkgs/rkt/template
@@ -16,6 +16,7 @@ license="Apache-2.0"
homepage="https://github.com/coreos/rkt"
distfiles="https://github.com/coreos/rkt/archive/v${version}.tar.gz"
checksum=4d22c742b87d15c226cc28970c7daf66a64c6a95af9d752f5b72d9a4012aca1d
+broken="Build can't find usr_from_coreoskvmhostsrcfly.mk"
patch_args="-Np1"
nopie=yes
From 3efa7ca7c0d81ad29bd8f237983e8d6ad6d5c1b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:11:30 -0300
Subject: [PATCH 07/12] srcpkgs: remove go from hostmakedepends for packages
with build_style=go.
---
srcpkgs/darch/template | 2 +-
srcpkgs/docker/template | 2 +-
srcpkgs/git-lfs/template | 2 +-
srcpkgs/yggdrasil/template | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 238eebd3158..161af0a666b 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -7,7 +7,7 @@ build_style=go
go_import_path=github.com/godarch/darch
conf_files="/etc/darch/hooks/ssh/hook /etc/darch/hooks/hostname/hook /etc/darch/hooks/fstab/hook"
make_dirs="/var/lib/darch 0755 root root"
-hostmakedepends="git go"
+hostmakedepends="git"
depends="containerd"
short_desc="Tool for building/booting stateless and immutable images, bare metal"
maintainer="Paul Knopf <pauldotknopf@gmail.com>"
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 5141443fa58..cbaad14fb81 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -4,7 +4,7 @@ version=19.03.13
revision=1
create_wrksrc=yes
build_style=go
-hostmakedepends="go pkg-config cmake tar"
+hostmakedepends="pkg-config cmake tar"
makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
libapparmor-devel libltdl-devel"
depends="containerd runc"
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 8a4c8af65b3..588d7fe9aa3 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -4,7 +4,7 @@ version=2.12.1
revision=1
build_style=go
go_import_path="github.com/git-lfs/git-lfs"
-hostmakedepends="go git ruby-ronn"
+hostmakedepends="git ruby-ronn"
short_desc="Git extension for versioning large files"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="MIT"
diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index b9e6246b1cd..74c3c32537e 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -5,7 +5,7 @@ revision=1
wrksrc="yggdrasil-go-${version}"
build_style=go
go_import_path=github.com/yggdrasil-network/yggdrasil-go
-hostmakedepends="go git"
+hostmakedepends="git"
short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"
maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
license="LGPL-3.0-only"
From 04cfba92375c8e72718bb02a39af05fb4cb4db9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:12:30 -0300
Subject: [PATCH 08/12] miniflux: fix checksum and wrksrc.
---
srcpkgs/miniflux/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 43ff6156c43..d0aa041b79f 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -2,6 +2,7 @@
pkgname=miniflux
version=2.0.24
revision=1
+wrksrc=v2-${version}
build_style=go
go_import_path="github.com/miniflux/miniflux"
go_package="miniflux.app"
@@ -12,7 +13,7 @@ license="Apache-2.0"
homepage="https://miniflux.app"
changelog="https://raw.githubusercontent.com/miniflux/miniflux/${version}/ChangeLog"
distfiles="https://github.com/miniflux/miniflux/archive/${version}.tar.gz"
-checksum=4f0fa176b80bc8c34e4bfa954eebb3dc49c38c38c057b60831cda3162de43637
+checksum=58c0136d4687a36a8950d5b7626e68cd0bed0e89193b4891a89d8a6cf081afc5
system_accounts="_miniflux"
post_install() {
From 2959a64e7bee84118628f6f21ff509c7dc590c60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:16:35 -0300
Subject: [PATCH 09/12] k3s: mark broken.
---
srcpkgs/k3s/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/k3s/template b/srcpkgs/k3s/template
index b0ee98e9268..88bb1ebfd4a 100644
--- a/srcpkgs/k3s/template
+++ b/srcpkgs/k3s/template
@@ -25,6 +25,7 @@ checksum="7b9222dcaa4bbc387dd6f38a653b7b2b09079987c19a399c6c4f3e5b3dc1d39c
75e02aa09edcfb2b43d41cd576e24099e9bca21d80bda0dcdc3f98f2357f1363
15dd78d136d7c9bae7144072052ef6cd12821ae081a7c085f145d834d96c5d5c"
skip_extraction="${_traefik_file}"
+broken="bad module versions"
_git_commit=18bd921cddee1e95cc03467a1b9636ddacd9d670
From 96408ee706753d117297db1089b02b57d88f1866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:16:54 -0300
Subject: [PATCH 10/12] lxd-lts: add libco-devel to makedepends.
Necessary to fix final linking step.
---
srcpkgs/lxd-lts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lxd-lts/template b/srcpkgs/lxd-lts/template
index 12a119181f2..fe501323adb 100644
--- a/srcpkgs/lxd-lts/template
+++ b/srcpkgs/lxd-lts/template
@@ -9,7 +9,7 @@ go_build_tags="libsqlite3"
go_package="${go_import_path}/lxd ${go_import_path}/lxc
${go_import_path}/lxd-p2c ${go_import_path}/fuidshift"
hostmakedepends="pkg-config"
-makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel"
+makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel libco-devel"
depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables"
short_desc="Next generation system container manager (long term support channel)"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
From f08baa5fca506646166b8f5650972817e4b3451c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:17:31 -0300
Subject: [PATCH 11/12] goproxy: mark broken.
---
srcpkgs/goproxy/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/goproxy/template b/srcpkgs/goproxy/template
index 437471ffa75..17360cc6fb1 100644
--- a/srcpkgs/goproxy/template
+++ b/srcpkgs/goproxy/template
@@ -11,3 +11,4 @@ license="GPL-3.0-or-later"
homepage="https://github.com/snail007/goproxy"
distfiles="https://github.com/snail007/goproxy/archive/v${version}.tar.gz"
checksum=13f8e37d274d2b7b7cdf1ae3d98723fbb9acf1476c92a1e0d43039109d238ccc
+broken="7.0 tag was removed from repository"
From fc046c5d8aae8e411f424fd3d23e7fb09966cd59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 12 Sep 2020 07:57:27 +0700
Subject: [PATCH 12/12] etcd: replace github.com/coreos/bbolt =>
go.etcd.io/bbolt
For some reason, they changed their package path but not import path.
Also xlintify.
---
srcpkgs/etcd/template | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index 85c797e5aca..88b89336beb 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -1,15 +1,15 @@
# Template file for 'etcd'
pkgname=etcd
version=3.4.4
-revision=1
+revision=2
build_style=go
-short_desc="Distributed reliable key-value store"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0"
-hostmakedepends="git glide"
go_import_path="github.com/coreos/etcd"
go_package="${go_import_path} ${go_import_path}/etcdctl"
go_mod_mode="default"
+hostmakedepends="git glide"
+short_desc="Distributed reliable key-value store"
+maintainer="Andrea Brancaleoni <abc@pompel.me>"
+license="Apache-2.0"
homepage="https://coreos.com/etcd/docs/latest/"
distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
checksum=46bcd0d034fe9cc6ae86a9f2a72bdc78761ca99bfd5ae4b96b24e4ad93fc627e
@@ -17,7 +17,10 @@ conf_files="/etc/sv/etcd/conf"
system_accounts="etcd"
make_dirs="/var/lib/etcd 0755 etcd etcd"
+post_patch() {
+ echo "replace github.com/coreos/bbolt => go.etcd.io/bbolt v1.3.5" >>go.mod
+}
+
post_install() {
- vlicense LICENSE
vsv etcd
}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
` (3 preceding siblings ...)
2020-11-14 19:25 ` ericonr
@ 2020-11-14 20:54 ` pullmoll
2020-11-14 22:34 ` [PR REVIEW] " the-maldridge
` (15 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: pullmoll @ 2020-11-14 20:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/26377#issuecomment-727263968
Comment:
For `chronograf` see https://github.com/void-linux/void-packages/pull/26197
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
` (5 preceding siblings ...)
2020-11-14 22:34 ` [PR REVIEW] " the-maldridge
@ 2020-11-14 22:34 ` the-maldridge
2020-11-14 22:59 ` ericonr
` (13 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: the-maldridge @ 2020-11-14 22:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New review comment by the-maldridge on void-packages repository
https://github.com/void-linux/void-packages/pull/26377#discussion_r523471421
Comment:
Might be worth just switching to upstream assets if they vendor a tarball.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
` (4 preceding siblings ...)
2020-11-14 20:54 ` pullmoll
@ 2020-11-14 22:34 ` the-maldridge
2020-11-14 22:34 ` the-maldridge
` (14 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: the-maldridge @ 2020-11-14 22:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
New review comment by the-maldridge on void-packages repository
https://github.com/void-linux/void-packages/pull/26377#discussion_r523471469
Comment:
Reviewing the upstream licensing this whole project appears kind of shady. There is a v10.1 tag, is there a reason you did not use that instead of upgrading?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
` (6 preceding siblings ...)
2020-11-14 22:34 ` the-maldridge
@ 2020-11-14 22:59 ` ericonr
2020-11-14 23:07 ` ericonr
` (12 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-11-14 22:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26377#discussion_r523473487
Comment:
Not sure this one is necessary anymore, since you merged the fix.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
` (7 preceding siblings ...)
2020-11-14 22:59 ` ericonr
@ 2020-11-14 23:07 ` ericonr
2020-11-15 17:04 ` sgn
` (11 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-11-14 23:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 439 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26377#discussion_r523474146
Comment:
By upgrading do you mean marking as broken?
I didn't want to update the package without having an idea of how it works / is supposed to work, and using a newer tag doesn't protect us from them dropping it in the future again. I'd consider dropping the package, if you think it makes sense.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
` (8 preceding siblings ...)
2020-11-14 23:07 ` ericonr
@ 2020-11-15 17:04 ` sgn
2020-11-15 17:05 ` sgn
` (10 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: sgn @ 2020-11-15 17:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/26377#discussion_r523785157
Comment:
I would say this is worth to warrant a rebuild.
1.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
` (9 preceding siblings ...)
2020-11-15 17:04 ` sgn
@ 2020-11-15 17:05 ` sgn
2020-11-15 17:06 ` sgn
` (9 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: sgn @ 2020-11-15 17:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 370 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/26377#discussion_r523785157
Comment:
I would say this is worth to warrant a rebuild.
Thinking a bit more, there's something that was changed here. The `distfiles` is still the same but the extracted directory is different. Have you check if they have same source?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
` (10 preceding siblings ...)
2020-11-15 17:05 ` sgn
@ 2020-11-15 17:06 ` sgn
2020-11-15 17:08 ` sgn
` (8 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: sgn @ 2020-11-15 17:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/26377#discussion_r523785415
Comment:
Same comment with `dnote-cli`
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
` (11 preceding siblings ...)
2020-11-15 17:06 ` sgn
@ 2020-11-15 17:08 ` sgn
2020-11-15 21:01 ` ericonr
` (7 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: sgn @ 2020-11-15 17:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/26377#discussion_r523785627
Comment:
We need to diff the distfiles, and warrant a rebuild.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
` (12 preceding siblings ...)
2020-11-15 17:08 ` sgn
@ 2020-11-15 21:01 ` ericonr
2020-11-15 23:22 ` [PR PATCH] [Updated] " ericonr
` (6 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-11-15 21:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 168 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26377#issuecomment-727636137
Comment:
Thanks, I will investigate.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
` (13 preceding siblings ...)
2020-11-15 21:01 ` ericonr
@ 2020-11-15 23:22 ` ericonr
2020-11-17 1:24 ` ericonr
` (5 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-11-15 23:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 528 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gorebuild
https://github.com/void-linux/void-packages/pull/26377
Go package clean up
While I get ready to do a full go rebuild, I found packages with various issues. Some broken ones and some had changed paths.
ping @the-maldridge @thypon @Vaelatern @misuchiru03 @renatoaguiar @steinex @CameronNemo
A patch file from https://github.com/void-linux/void-packages/pull/26377.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gorebuild-26377.patch --]
[-- Type: text/x-diff, Size: 12523 bytes --]
From 1def77be17bc043cfff1ed81225b52bf86ae29b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:40:21 -0300
Subject: [PATCH 01/11] dnote-cli: fix checksum and wrksrc.
---
srcpkgs/dnote-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dnote-cli/template b/srcpkgs/dnote-cli/template
index 309bee7649b..d58dd0954c8 100644
--- a/srcpkgs/dnote-cli/template
+++ b/srcpkgs/dnote-cli/template
@@ -2,7 +2,7 @@
pkgname=dnote-cli
version=0.6.2
revision=1
-wrksrc="cli-${version}"
+wrksrc="dnote-${version}"
build_style=go
go_import_path=github.com/dnote-io/cli
go_build_tags="fts5"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="MIT"
homepage="https://dnote.io/"
distfiles="https://github.com/dnote-io/cli/archive/v${version}.tar.gz"
-checksum=886f09dc20ff9cb56bdbc71eb7e78e7099b541fa0d830d4b4d0251b2fb32ad06
+checksum=6eb3f824f22d5821c08e832dabadf5664c73b83201a7a5c65632fc8d60bd041e
pre_build() {
cd $GOSRCPATH
From bf038402658ccb388944a6b29469924ce2d854d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:46:35 -0300
Subject: [PATCH 02/11] gfuzz: fix checksum, homepage and module paths.
---
srcpkgs/gfuzz/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index a51ea912896..59061b2904f 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -2,13 +2,13 @@
pkgname=gfuzz
version=0.2
revision=1
-wrksrc="gfuzz-${version}"
+wrksrc="gfz-${version}"
build_style=go
-go_import_path=github.com/braaaax/gfuzz
+go_import_path=github.com/braaaax/gfz
hostmakedepends="git"
short_desc="Web fuzzer like wfuzz written in Golang"
maintainer="Alex Childs <misuchiru03+void@gmail.com>"
license="Apache-2.0"
-homepage="https://github.com/braaaax/gfuzz"
-distfiles="https://github.com/braaaax/gfuzz/archive/v${version}.tar.gz"
-checksum=054163243181db528715bf904ee7656aa0a12e9feb120c8afbfd43bd6504ccd1
+homepage="https://github.com/braaaax/gfz"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=8b6a3df0c385fe993ead673df53daa290943220f2cde73e6b1c706ef94aa4e5f
From c6f1502c13ec81243aec29062ca8503282964026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 01:20:29 -0300
Subject: [PATCH 03/11] golangci-lint: temporarily broken.
Should be solved once Go 1.15.6 is released.
---
srcpkgs/golangci-lint/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 06dba517cda..4821b086a96 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -12,6 +12,7 @@ license="GPL-3.0-only"
homepage="https://github.com/golangci/golangci-lint"
distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
checksum=ff0e52ec28b5cf1dbc632db301c89dcf4352dd7376d0cc82e36571c609a0b339
+broken="broken until Go 1.15.6: https://github.com/golang/go/issues/42567"
# Cross builds fail with -fuse-ld=gold
LDFLAGS="-fuse-ld=bfd"
From a395c6a839972e9abe8c28bcc6439d0dcd3dbf07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:05:19 -0300
Subject: [PATCH 04/11] wtplan: temporarily broken.
---
srcpkgs/wtplan/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/wtplan/template b/srcpkgs/wtplan/template
index 5a5b3a54740..0596fda0260 100644
--- a/srcpkgs/wtplan/template
+++ b/srcpkgs/wtplan/template
@@ -11,6 +11,7 @@ license="MIT"
homepage="https://github.com/kjellwinblad/wtplan/"
distfiles="https://github.com/kjellwinblad/wtplan/archive/${version}.tar.gz"
checksum=31c66181f815889828eb2bd3739d6b23582ec75a5a8d6c6bf76c2a6679112bb4
+broken="broken until Go 1.15.6: https://github.com/golang/go/issues/42567"
do_build() {
export GOPATH=$(pwd)
From f6f5fe5914c5ad6f7670d6683e150f37f0e7202b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:05:45 -0300
Subject: [PATCH 05/11] rkt: mark broken.
---
srcpkgs/rkt/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template
index 84d4e32837a..e1e8cb35eeb 100644
--- a/srcpkgs/rkt/template
+++ b/srcpkgs/rkt/template
@@ -16,6 +16,7 @@ license="Apache-2.0"
homepage="https://github.com/coreos/rkt"
distfiles="https://github.com/coreos/rkt/archive/v${version}.tar.gz"
checksum=4d22c742b87d15c226cc28970c7daf66a64c6a95af9d752f5b72d9a4012aca1d
+broken="Build can't find usr_from_coreoskvmhostsrcfly.mk"
patch_args="-Np1"
nopie=yes
From 9fe8bc089e0bfb0bd61f99e12dd0334884929c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:11:30 -0300
Subject: [PATCH 06/11] srcpkgs: remove go from hostmakedepends for packages
with build_style=go.
---
srcpkgs/darch/template | 2 +-
srcpkgs/docker/template | 2 +-
srcpkgs/git-lfs/template | 2 +-
srcpkgs/yggdrasil/template | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 238eebd3158..161af0a666b 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -7,7 +7,7 @@ build_style=go
go_import_path=github.com/godarch/darch
conf_files="/etc/darch/hooks/ssh/hook /etc/darch/hooks/hostname/hook /etc/darch/hooks/fstab/hook"
make_dirs="/var/lib/darch 0755 root root"
-hostmakedepends="git go"
+hostmakedepends="git"
depends="containerd"
short_desc="Tool for building/booting stateless and immutable images, bare metal"
maintainer="Paul Knopf <pauldotknopf@gmail.com>"
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 5141443fa58..cbaad14fb81 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -4,7 +4,7 @@ version=19.03.13
revision=1
create_wrksrc=yes
build_style=go
-hostmakedepends="go pkg-config cmake tar"
+hostmakedepends="pkg-config cmake tar"
makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
libapparmor-devel libltdl-devel"
depends="containerd runc"
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 8a4c8af65b3..588d7fe9aa3 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -4,7 +4,7 @@ version=2.12.1
revision=1
build_style=go
go_import_path="github.com/git-lfs/git-lfs"
-hostmakedepends="go git ruby-ronn"
+hostmakedepends="git ruby-ronn"
short_desc="Git extension for versioning large files"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="MIT"
diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index b9e6246b1cd..74c3c32537e 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -5,7 +5,7 @@ revision=1
wrksrc="yggdrasil-go-${version}"
build_style=go
go_import_path=github.com/yggdrasil-network/yggdrasil-go
-hostmakedepends="go git"
+hostmakedepends="git"
short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"
maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
license="LGPL-3.0-only"
From f2b77e2b46a16928ad57635d885610509336cc3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:12:30 -0300
Subject: [PATCH 07/11] miniflux: fix checksum and wrksrc.
---
srcpkgs/miniflux/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 43ff6156c43..d0aa041b79f 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -2,6 +2,7 @@
pkgname=miniflux
version=2.0.24
revision=1
+wrksrc=v2-${version}
build_style=go
go_import_path="github.com/miniflux/miniflux"
go_package="miniflux.app"
@@ -12,7 +13,7 @@ license="Apache-2.0"
homepage="https://miniflux.app"
changelog="https://raw.githubusercontent.com/miniflux/miniflux/${version}/ChangeLog"
distfiles="https://github.com/miniflux/miniflux/archive/${version}.tar.gz"
-checksum=4f0fa176b80bc8c34e4bfa954eebb3dc49c38c38c057b60831cda3162de43637
+checksum=58c0136d4687a36a8950d5b7626e68cd0bed0e89193b4891a89d8a6cf081afc5
system_accounts="_miniflux"
post_install() {
From 0f4b3a88329fd862d21023f994bba9c30d93541c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:16:35 -0300
Subject: [PATCH 08/11] k3s: mark broken.
---
srcpkgs/k3s/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/k3s/template b/srcpkgs/k3s/template
index b0ee98e9268..88bb1ebfd4a 100644
--- a/srcpkgs/k3s/template
+++ b/srcpkgs/k3s/template
@@ -25,6 +25,7 @@ checksum="7b9222dcaa4bbc387dd6f38a653b7b2b09079987c19a399c6c4f3e5b3dc1d39c
75e02aa09edcfb2b43d41cd576e24099e9bca21d80bda0dcdc3f98f2357f1363
15dd78d136d7c9bae7144072052ef6cd12821ae081a7c085f145d834d96c5d5c"
skip_extraction="${_traefik_file}"
+broken="bad module versions"
_git_commit=18bd921cddee1e95cc03467a1b9636ddacd9d670
From 6d69d271a25dd9fed0d8e56a4be377a995e272f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:16:54 -0300
Subject: [PATCH 09/11] lxd-lts: add libco-devel to makedepends.
Necessary to fix final linking step.
---
srcpkgs/lxd-lts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lxd-lts/template b/srcpkgs/lxd-lts/template
index 12a119181f2..fe501323adb 100644
--- a/srcpkgs/lxd-lts/template
+++ b/srcpkgs/lxd-lts/template
@@ -9,7 +9,7 @@ go_build_tags="libsqlite3"
go_package="${go_import_path}/lxd ${go_import_path}/lxc
${go_import_path}/lxd-p2c ${go_import_path}/fuidshift"
hostmakedepends="pkg-config"
-makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel"
+makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel libco-devel"
depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables"
short_desc="Next generation system container manager (long term support channel)"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
From e925739c19d18539f76518dd8fca76bdc701f763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:17:31 -0300
Subject: [PATCH 10/11] goproxy: mark broken.
---
srcpkgs/goproxy/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/goproxy/template b/srcpkgs/goproxy/template
index 437471ffa75..17360cc6fb1 100644
--- a/srcpkgs/goproxy/template
+++ b/srcpkgs/goproxy/template
@@ -11,3 +11,4 @@ license="GPL-3.0-or-later"
homepage="https://github.com/snail007/goproxy"
distfiles="https://github.com/snail007/goproxy/archive/v${version}.tar.gz"
checksum=13f8e37d274d2b7b7cdf1ae3d98723fbb9acf1476c92a1e0d43039109d238ccc
+broken="7.0 tag was removed from repository"
From 28bbf149272f3b9b27c68073d624711d1f9fe502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 12 Sep 2020 07:57:27 +0700
Subject: [PATCH 11/11] etcd: replace github.com/coreos/bbolt =>
go.etcd.io/bbolt
For some reason, they changed their package path but not import path.
Also xlintify.
---
srcpkgs/etcd/template | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index 85c797e5aca..88b89336beb 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -1,15 +1,15 @@
# Template file for 'etcd'
pkgname=etcd
version=3.4.4
-revision=1
+revision=2
build_style=go
-short_desc="Distributed reliable key-value store"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0"
-hostmakedepends="git glide"
go_import_path="github.com/coreos/etcd"
go_package="${go_import_path} ${go_import_path}/etcdctl"
go_mod_mode="default"
+hostmakedepends="git glide"
+short_desc="Distributed reliable key-value store"
+maintainer="Andrea Brancaleoni <abc@pompel.me>"
+license="Apache-2.0"
homepage="https://coreos.com/etcd/docs/latest/"
distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
checksum=46bcd0d034fe9cc6ae86a9f2a72bdc78761ca99bfd5ae4b96b24e4ad93fc627e
@@ -17,7 +17,10 @@ conf_files="/etc/sv/etcd/conf"
system_accounts="etcd"
make_dirs="/var/lib/etcd 0755 etcd etcd"
+post_patch() {
+ echo "replace github.com/coreos/bbolt => go.etcd.io/bbolt v1.3.5" >>go.mod
+}
+
post_install() {
- vlicense LICENSE
vsv etcd
}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
` (14 preceding siblings ...)
2020-11-15 23:22 ` [PR PATCH] [Updated] " ericonr
@ 2020-11-17 1:24 ` ericonr
2020-12-30 7:01 ` the-maldridge
` (4 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-11-17 1:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 528 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gorebuild
https://github.com/void-linux/void-packages/pull/26377
Go package clean up
While I get ready to do a full go rebuild, I found packages with various issues. Some broken ones and some had changed paths.
ping @the-maldridge @thypon @Vaelatern @misuchiru03 @renatoaguiar @steinex @CameronNemo
A patch file from https://github.com/void-linux/void-packages/pull/26377.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gorebuild-26377.patch --]
[-- Type: text/x-diff, Size: 10906 bytes --]
From 6a102d7389ce3bfae563876f0ab21a6c16d2e69c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:40:21 -0300
Subject: [PATCH 01/10] dnote-cli: fix checksum and wrksrc.
---
srcpkgs/dnote-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dnote-cli/template b/srcpkgs/dnote-cli/template
index 309bee7649b..d58dd0954c8 100644
--- a/srcpkgs/dnote-cli/template
+++ b/srcpkgs/dnote-cli/template
@@ -2,7 +2,7 @@
pkgname=dnote-cli
version=0.6.2
revision=1
-wrksrc="cli-${version}"
+wrksrc="dnote-${version}"
build_style=go
go_import_path=github.com/dnote-io/cli
go_build_tags="fts5"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="MIT"
homepage="https://dnote.io/"
distfiles="https://github.com/dnote-io/cli/archive/v${version}.tar.gz"
-checksum=886f09dc20ff9cb56bdbc71eb7e78e7099b541fa0d830d4b4d0251b2fb32ad06
+checksum=6eb3f824f22d5821c08e832dabadf5664c73b83201a7a5c65632fc8d60bd041e
pre_build() {
cd $GOSRCPATH
From b81195833c52589bb31ca87ca39f552b469adce1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:46:35 -0300
Subject: [PATCH 02/10] gfuzz: fix checksum, homepage and module paths.
---
srcpkgs/gfuzz/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index a51ea912896..59061b2904f 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -2,13 +2,13 @@
pkgname=gfuzz
version=0.2
revision=1
-wrksrc="gfuzz-${version}"
+wrksrc="gfz-${version}"
build_style=go
-go_import_path=github.com/braaaax/gfuzz
+go_import_path=github.com/braaaax/gfz
hostmakedepends="git"
short_desc="Web fuzzer like wfuzz written in Golang"
maintainer="Alex Childs <misuchiru03+void@gmail.com>"
license="Apache-2.0"
-homepage="https://github.com/braaaax/gfuzz"
-distfiles="https://github.com/braaaax/gfuzz/archive/v${version}.tar.gz"
-checksum=054163243181db528715bf904ee7656aa0a12e9feb120c8afbfd43bd6504ccd1
+homepage="https://github.com/braaaax/gfz"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=8b6a3df0c385fe993ead673df53daa290943220f2cde73e6b1c706ef94aa4e5f
From 837c09f87162c730555e8bbc78709ba8de948c8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 01:20:29 -0300
Subject: [PATCH 03/10] golangci-lint: temporarily broken.
Should be solved once Go 1.15.6 is released.
---
srcpkgs/golangci-lint/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 06dba517cda..4821b086a96 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -12,6 +12,7 @@ license="GPL-3.0-only"
homepage="https://github.com/golangci/golangci-lint"
distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
checksum=ff0e52ec28b5cf1dbc632db301c89dcf4352dd7376d0cc82e36571c609a0b339
+broken="broken until Go 1.15.6: https://github.com/golang/go/issues/42567"
# Cross builds fail with -fuse-ld=gold
LDFLAGS="-fuse-ld=bfd"
From 297c15121ac8394baa8ce227c7e0ab8cac8ac29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:05:19 -0300
Subject: [PATCH 04/10] wtplan: temporarily broken.
---
srcpkgs/wtplan/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/wtplan/template b/srcpkgs/wtplan/template
index 5a5b3a54740..0596fda0260 100644
--- a/srcpkgs/wtplan/template
+++ b/srcpkgs/wtplan/template
@@ -11,6 +11,7 @@ license="MIT"
homepage="https://github.com/kjellwinblad/wtplan/"
distfiles="https://github.com/kjellwinblad/wtplan/archive/${version}.tar.gz"
checksum=31c66181f815889828eb2bd3739d6b23582ec75a5a8d6c6bf76c2a6679112bb4
+broken="broken until Go 1.15.6: https://github.com/golang/go/issues/42567"
do_build() {
export GOPATH=$(pwd)
From fad78a77e2cb7f2a95776432366dfc23df3c4859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:05:45 -0300
Subject: [PATCH 05/10] rkt: mark broken.
---
srcpkgs/rkt/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template
index 84d4e32837a..e1e8cb35eeb 100644
--- a/srcpkgs/rkt/template
+++ b/srcpkgs/rkt/template
@@ -16,6 +16,7 @@ license="Apache-2.0"
homepage="https://github.com/coreos/rkt"
distfiles="https://github.com/coreos/rkt/archive/v${version}.tar.gz"
checksum=4d22c742b87d15c226cc28970c7daf66a64c6a95af9d752f5b72d9a4012aca1d
+broken="Build can't find usr_from_coreoskvmhostsrcfly.mk"
patch_args="-Np1"
nopie=yes
From c2213f5a22f9c6ddd258af0bd2ab8614d83b971e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:11:30 -0300
Subject: [PATCH 06/10] srcpkgs: remove go from hostmakedepends for packages
with build_style=go.
---
srcpkgs/darch/template | 2 +-
srcpkgs/docker/template | 2 +-
srcpkgs/git-lfs/template | 2 +-
srcpkgs/yggdrasil/template | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 238eebd3158..161af0a666b 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -7,7 +7,7 @@ build_style=go
go_import_path=github.com/godarch/darch
conf_files="/etc/darch/hooks/ssh/hook /etc/darch/hooks/hostname/hook /etc/darch/hooks/fstab/hook"
make_dirs="/var/lib/darch 0755 root root"
-hostmakedepends="git go"
+hostmakedepends="git"
depends="containerd"
short_desc="Tool for building/booting stateless and immutable images, bare metal"
maintainer="Paul Knopf <pauldotknopf@gmail.com>"
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 5141443fa58..cbaad14fb81 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -4,7 +4,7 @@ version=19.03.13
revision=1
create_wrksrc=yes
build_style=go
-hostmakedepends="go pkg-config cmake tar"
+hostmakedepends="pkg-config cmake tar"
makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
libapparmor-devel libltdl-devel"
depends="containerd runc"
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 8a4c8af65b3..588d7fe9aa3 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -4,7 +4,7 @@ version=2.12.1
revision=1
build_style=go
go_import_path="github.com/git-lfs/git-lfs"
-hostmakedepends="go git ruby-ronn"
+hostmakedepends="git ruby-ronn"
short_desc="Git extension for versioning large files"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="MIT"
diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index b9e6246b1cd..74c3c32537e 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -5,7 +5,7 @@ revision=1
wrksrc="yggdrasil-go-${version}"
build_style=go
go_import_path=github.com/yggdrasil-network/yggdrasil-go
-hostmakedepends="go git"
+hostmakedepends="git"
short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"
maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
license="LGPL-3.0-only"
From 2ef6461f863996116b4beeace048f304dac568f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:12:30 -0300
Subject: [PATCH 07/10] miniflux: fix checksum and wrksrc.
---
srcpkgs/miniflux/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 43ff6156c43..d0aa041b79f 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -2,6 +2,7 @@
pkgname=miniflux
version=2.0.24
revision=1
+wrksrc=v2-${version}
build_style=go
go_import_path="github.com/miniflux/miniflux"
go_package="miniflux.app"
@@ -12,7 +13,7 @@ license="Apache-2.0"
homepage="https://miniflux.app"
changelog="https://raw.githubusercontent.com/miniflux/miniflux/${version}/ChangeLog"
distfiles="https://github.com/miniflux/miniflux/archive/${version}.tar.gz"
-checksum=4f0fa176b80bc8c34e4bfa954eebb3dc49c38c38c057b60831cda3162de43637
+checksum=58c0136d4687a36a8950d5b7626e68cd0bed0e89193b4891a89d8a6cf081afc5
system_accounts="_miniflux"
post_install() {
From 13514e981c6e5d1ec44747f34e240e73fb0352da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:16:35 -0300
Subject: [PATCH 08/10] k3s: mark broken.
---
srcpkgs/k3s/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/k3s/template b/srcpkgs/k3s/template
index b0ee98e9268..88bb1ebfd4a 100644
--- a/srcpkgs/k3s/template
+++ b/srcpkgs/k3s/template
@@ -25,6 +25,7 @@ checksum="7b9222dcaa4bbc387dd6f38a653b7b2b09079987c19a399c6c4f3e5b3dc1d39c
75e02aa09edcfb2b43d41cd576e24099e9bca21d80bda0dcdc3f98f2357f1363
15dd78d136d7c9bae7144072052ef6cd12821ae081a7c085f145d834d96c5d5c"
skip_extraction="${_traefik_file}"
+broken="bad module versions"
_git_commit=18bd921cddee1e95cc03467a1b9636ddacd9d670
From 7a77f62b2b83d59898a353f355da84c582595325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:16:54 -0300
Subject: [PATCH 09/10] lxd-lts: add libco-devel to makedepends.
Necessary to fix final linking step.
---
srcpkgs/lxd-lts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lxd-lts/template b/srcpkgs/lxd-lts/template
index 12a119181f2..fe501323adb 100644
--- a/srcpkgs/lxd-lts/template
+++ b/srcpkgs/lxd-lts/template
@@ -9,7 +9,7 @@ go_build_tags="libsqlite3"
go_package="${go_import_path}/lxd ${go_import_path}/lxc
${go_import_path}/lxd-p2c ${go_import_path}/fuidshift"
hostmakedepends="pkg-config"
-makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel"
+makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel libco-devel"
depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables"
short_desc="Next generation system container manager (long term support channel)"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
From bbe41dac234045ec8e5c8aa454c77ec4881b37be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:17:31 -0300
Subject: [PATCH 10/10] goproxy: mark broken.
---
srcpkgs/goproxy/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/goproxy/template b/srcpkgs/goproxy/template
index 437471ffa75..17360cc6fb1 100644
--- a/srcpkgs/goproxy/template
+++ b/srcpkgs/goproxy/template
@@ -11,3 +11,4 @@ license="GPL-3.0-or-later"
homepage="https://github.com/snail007/goproxy"
distfiles="https://github.com/snail007/goproxy/archive/v${version}.tar.gz"
checksum=13f8e37d274d2b7b7cdf1ae3d98723fbb9acf1476c92a1e0d43039109d238ccc
+broken="7.0 tag was removed from repository"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
` (15 preceding siblings ...)
2020-11-17 1:24 ` ericonr
@ 2020-12-30 7:01 ` the-maldridge
2021-01-04 2:16 ` [PR PATCH] [Updated] " ericonr
` (3 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: the-maldridge @ 2020-12-30 7:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
New comment by the-maldridge on void-packages repository
https://github.com/void-linux/void-packages/pull/26377#issuecomment-752352313
Comment:
@ericonr what's the status on this PR?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
` (16 preceding siblings ...)
2020-12-30 7:01 ` the-maldridge
@ 2021-01-04 2:16 ` ericonr
2021-02-14 3:52 ` ericonr
` (2 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2021-01-04 2:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 528 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gorebuild
https://github.com/void-linux/void-packages/pull/26377
Go package clean up
While I get ready to do a full go rebuild, I found packages with various issues. Some broken ones and some had changed paths.
ping @the-maldridge @thypon @Vaelatern @misuchiru03 @renatoaguiar @steinex @CameronNemo
A patch file from https://github.com/void-linux/void-packages/pull/26377.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gorebuild-26377.patch --]
[-- Type: text/x-diff, Size: 9796 bytes --]
From 92eefb2c6eb7aea0b5f7e74aa9f01d815c3ef33d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:40:21 -0300
Subject: [PATCH 1/9] dnote-cli: fix checksum and wrksrc.
---
srcpkgs/dnote-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dnote-cli/template b/srcpkgs/dnote-cli/template
index 309bee7649b..d58dd0954c8 100644
--- a/srcpkgs/dnote-cli/template
+++ b/srcpkgs/dnote-cli/template
@@ -2,7 +2,7 @@
pkgname=dnote-cli
version=0.6.2
revision=1
-wrksrc="cli-${version}"
+wrksrc="dnote-${version}"
build_style=go
go_import_path=github.com/dnote-io/cli
go_build_tags="fts5"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="MIT"
homepage="https://dnote.io/"
distfiles="https://github.com/dnote-io/cli/archive/v${version}.tar.gz"
-checksum=886f09dc20ff9cb56bdbc71eb7e78e7099b541fa0d830d4b4d0251b2fb32ad06
+checksum=6eb3f824f22d5821c08e832dabadf5664c73b83201a7a5c65632fc8d60bd041e
pre_build() {
cd $GOSRCPATH
From 3b2a0fd200abde55d0adbeb5f48e6daf77a99e2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:46:35 -0300
Subject: [PATCH 2/9] gfuzz: fix checksum, homepage and module paths.
---
srcpkgs/gfuzz/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index a51ea912896..59061b2904f 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -2,13 +2,13 @@
pkgname=gfuzz
version=0.2
revision=1
-wrksrc="gfuzz-${version}"
+wrksrc="gfz-${version}"
build_style=go
-go_import_path=github.com/braaaax/gfuzz
+go_import_path=github.com/braaaax/gfz
hostmakedepends="git"
short_desc="Web fuzzer like wfuzz written in Golang"
maintainer="Alex Childs <misuchiru03+void@gmail.com>"
license="Apache-2.0"
-homepage="https://github.com/braaaax/gfuzz"
-distfiles="https://github.com/braaaax/gfuzz/archive/v${version}.tar.gz"
-checksum=054163243181db528715bf904ee7656aa0a12e9feb120c8afbfd43bd6504ccd1
+homepage="https://github.com/braaaax/gfz"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=8b6a3df0c385fe993ead673df53daa290943220f2cde73e6b1c706ef94aa4e5f
From 756c7eb4d87c15ecfaac29d01535cd748a994589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 01:20:29 -0300
Subject: [PATCH 3/9] golangci-lint: temporarily broken.
Should be solved once Go 1.15.6 is released.
---
srcpkgs/golangci-lint/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 06dba517cda..4821b086a96 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -12,6 +12,7 @@ license="GPL-3.0-only"
homepage="https://github.com/golangci/golangci-lint"
distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
checksum=ff0e52ec28b5cf1dbc632db301c89dcf4352dd7376d0cc82e36571c609a0b339
+broken="broken until Go 1.15.6: https://github.com/golang/go/issues/42567"
# Cross builds fail with -fuse-ld=gold
LDFLAGS="-fuse-ld=bfd"
From af48dfba536fdb57104607777b191b00694bdcb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:05:19 -0300
Subject: [PATCH 4/9] wtplan: temporarily broken.
---
srcpkgs/wtplan/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/wtplan/template b/srcpkgs/wtplan/template
index 5a5b3a54740..0596fda0260 100644
--- a/srcpkgs/wtplan/template
+++ b/srcpkgs/wtplan/template
@@ -11,6 +11,7 @@ license="MIT"
homepage="https://github.com/kjellwinblad/wtplan/"
distfiles="https://github.com/kjellwinblad/wtplan/archive/${version}.tar.gz"
checksum=31c66181f815889828eb2bd3739d6b23582ec75a5a8d6c6bf76c2a6679112bb4
+broken="broken until Go 1.15.6: https://github.com/golang/go/issues/42567"
do_build() {
export GOPATH=$(pwd)
From 51bb9097ad9a97e1d26b63fb4d685be794861006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:05:45 -0300
Subject: [PATCH 5/9] rkt: mark broken.
---
srcpkgs/rkt/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template
index 84d4e32837a..e1e8cb35eeb 100644
--- a/srcpkgs/rkt/template
+++ b/srcpkgs/rkt/template
@@ -16,6 +16,7 @@ license="Apache-2.0"
homepage="https://github.com/coreos/rkt"
distfiles="https://github.com/coreos/rkt/archive/v${version}.tar.gz"
checksum=4d22c742b87d15c226cc28970c7daf66a64c6a95af9d752f5b72d9a4012aca1d
+broken="Build can't find usr_from_coreoskvmhostsrcfly.mk"
patch_args="-Np1"
nopie=yes
From 13ce5148495ac5c24c580ace72bd1b4b45a7a1a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:11:30 -0300
Subject: [PATCH 6/9] srcpkgs: remove go from hostmakedepends for packages with
build_style=go.
---
srcpkgs/darch/template | 2 +-
srcpkgs/docker/template | 2 +-
srcpkgs/git-lfs/template | 2 +-
srcpkgs/yggdrasil/template | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 238eebd3158..161af0a666b 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -7,7 +7,7 @@ build_style=go
go_import_path=github.com/godarch/darch
conf_files="/etc/darch/hooks/ssh/hook /etc/darch/hooks/hostname/hook /etc/darch/hooks/fstab/hook"
make_dirs="/var/lib/darch 0755 root root"
-hostmakedepends="git go"
+hostmakedepends="git"
depends="containerd"
short_desc="Tool for building/booting stateless and immutable images, bare metal"
maintainer="Paul Knopf <pauldotknopf@gmail.com>"
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 823d471d214..8e2b3a36c2f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -4,7 +4,7 @@ version=19.03.13
revision=1
create_wrksrc=yes
build_style=go
-hostmakedepends="go pkg-config cmake tar"
+hostmakedepends="pkg-config cmake tar"
makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
libapparmor-devel libltdl-devel"
depends="containerd runc"
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 8a4c8af65b3..588d7fe9aa3 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -4,7 +4,7 @@ version=2.12.1
revision=1
build_style=go
go_import_path="github.com/git-lfs/git-lfs"
-hostmakedepends="go git ruby-ronn"
+hostmakedepends="git ruby-ronn"
short_desc="Git extension for versioning large files"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="MIT"
diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index b9e6246b1cd..74c3c32537e 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -5,7 +5,7 @@ revision=1
wrksrc="yggdrasil-go-${version}"
build_style=go
go_import_path=github.com/yggdrasil-network/yggdrasil-go
-hostmakedepends="go git"
+hostmakedepends="git"
short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"
maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
license="LGPL-3.0-only"
From 7cfb863e40743528b56eddbaec5be5e88f0afaad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:16:35 -0300
Subject: [PATCH 7/9] k3s: mark broken.
---
srcpkgs/k3s/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/k3s/template b/srcpkgs/k3s/template
index b0ee98e9268..88bb1ebfd4a 100644
--- a/srcpkgs/k3s/template
+++ b/srcpkgs/k3s/template
@@ -25,6 +25,7 @@ checksum="7b9222dcaa4bbc387dd6f38a653b7b2b09079987c19a399c6c4f3e5b3dc1d39c
75e02aa09edcfb2b43d41cd576e24099e9bca21d80bda0dcdc3f98f2357f1363
15dd78d136d7c9bae7144072052ef6cd12821ae081a7c085f145d834d96c5d5c"
skip_extraction="${_traefik_file}"
+broken="bad module versions"
_git_commit=18bd921cddee1e95cc03467a1b9636ddacd9d670
From 728cebd66d0a910c034879a3d6adfc5d5380bf57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:16:54 -0300
Subject: [PATCH 8/9] lxd-lts: add libco-devel to makedepends.
Necessary to fix final linking step.
---
srcpkgs/lxd-lts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lxd-lts/template b/srcpkgs/lxd-lts/template
index 12a119181f2..fe501323adb 100644
--- a/srcpkgs/lxd-lts/template
+++ b/srcpkgs/lxd-lts/template
@@ -9,7 +9,7 @@ go_build_tags="libsqlite3"
go_package="${go_import_path}/lxd ${go_import_path}/lxc
${go_import_path}/lxd-p2c ${go_import_path}/fuidshift"
hostmakedepends="pkg-config"
-makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel"
+makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel libco-devel"
depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables"
short_desc="Next generation system container manager (long term support channel)"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
From 6bd1148790d72a82c2e56800751854e79bc36907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:17:31 -0300
Subject: [PATCH 9/9] goproxy: mark broken.
---
srcpkgs/goproxy/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/goproxy/template b/srcpkgs/goproxy/template
index 437471ffa75..17360cc6fb1 100644
--- a/srcpkgs/goproxy/template
+++ b/srcpkgs/goproxy/template
@@ -11,3 +11,4 @@ license="GPL-3.0-or-later"
homepage="https://github.com/snail007/goproxy"
distfiles="https://github.com/snail007/goproxy/archive/v${version}.tar.gz"
checksum=13f8e37d274d2b7b7cdf1ae3d98723fbb9acf1476c92a1e0d43039109d238ccc
+broken="7.0 tag was removed from repository"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
` (17 preceding siblings ...)
2021-01-04 2:16 ` [PR PATCH] [Updated] " ericonr
@ 2021-02-14 3:52 ` ericonr
2021-04-18 21:01 ` ericonr
2021-04-18 21:05 ` [PR PATCH] [Merged]: " ericonr
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2021-02-14 3:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 528 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gorebuild
https://github.com/void-linux/void-packages/pull/26377
Go package clean up
While I get ready to do a full go rebuild, I found packages with various issues. Some broken ones and some had changed paths.
ping @the-maldridge @thypon @Vaelatern @misuchiru03 @renatoaguiar @steinex @CameronNemo
A patch file from https://github.com/void-linux/void-packages/pull/26377.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gorebuild-26377.patch --]
[-- Type: text/x-diff, Size: 5569 bytes --]
From e070c3c9e2ddcdc92a768e2ed01a09aca8c57e76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:40:21 -0300
Subject: [PATCH 1/6] dnote-cli: fix checksum and wrksrc.
---
srcpkgs/dnote-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dnote-cli/template b/srcpkgs/dnote-cli/template
index 309bee7649b..d58dd0954c8 100644
--- a/srcpkgs/dnote-cli/template
+++ b/srcpkgs/dnote-cli/template
@@ -2,7 +2,7 @@
pkgname=dnote-cli
version=0.6.2
revision=1
-wrksrc="cli-${version}"
+wrksrc="dnote-${version}"
build_style=go
go_import_path=github.com/dnote-io/cli
go_build_tags="fts5"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="MIT"
homepage="https://dnote.io/"
distfiles="https://github.com/dnote-io/cli/archive/v${version}.tar.gz"
-checksum=886f09dc20ff9cb56bdbc71eb7e78e7099b541fa0d830d4b4d0251b2fb32ad06
+checksum=6eb3f824f22d5821c08e832dabadf5664c73b83201a7a5c65632fc8d60bd041e
pre_build() {
cd $GOSRCPATH
From ae14d8d4dcc769da0595f3da3eba40d1f9f3f807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:46:35 -0300
Subject: [PATCH 2/6] gfuzz: fix checksum, homepage and module paths.
---
srcpkgs/gfuzz/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index a51ea912896..59061b2904f 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -2,13 +2,13 @@
pkgname=gfuzz
version=0.2
revision=1
-wrksrc="gfuzz-${version}"
+wrksrc="gfz-${version}"
build_style=go
-go_import_path=github.com/braaaax/gfuzz
+go_import_path=github.com/braaaax/gfz
hostmakedepends="git"
short_desc="Web fuzzer like wfuzz written in Golang"
maintainer="Alex Childs <misuchiru03+void@gmail.com>"
license="Apache-2.0"
-homepage="https://github.com/braaaax/gfuzz"
-distfiles="https://github.com/braaaax/gfuzz/archive/v${version}.tar.gz"
-checksum=054163243181db528715bf904ee7656aa0a12e9feb120c8afbfd43bd6504ccd1
+homepage="https://github.com/braaaax/gfz"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=8b6a3df0c385fe993ead673df53daa290943220f2cde73e6b1c706ef94aa4e5f
From dff35bffe63a62fe0f0b3198deb80d12cb8e6c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:05:45 -0300
Subject: [PATCH 3/6] rkt: mark broken.
---
srcpkgs/rkt/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template
index 84d4e32837a..e1e8cb35eeb 100644
--- a/srcpkgs/rkt/template
+++ b/srcpkgs/rkt/template
@@ -16,6 +16,7 @@ license="Apache-2.0"
homepage="https://github.com/coreos/rkt"
distfiles="https://github.com/coreos/rkt/archive/v${version}.tar.gz"
checksum=4d22c742b87d15c226cc28970c7daf66a64c6a95af9d752f5b72d9a4012aca1d
+broken="Build can't find usr_from_coreoskvmhostsrcfly.mk"
patch_args="-Np1"
nopie=yes
From 1039cb7b154821c3329b2d53cfdf0834816ae3ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:16:35 -0300
Subject: [PATCH 4/6] k3s: mark broken.
---
srcpkgs/k3s/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/k3s/template b/srcpkgs/k3s/template
index b0ee98e9268..88bb1ebfd4a 100644
--- a/srcpkgs/k3s/template
+++ b/srcpkgs/k3s/template
@@ -25,6 +25,7 @@ checksum="7b9222dcaa4bbc387dd6f38a653b7b2b09079987c19a399c6c4f3e5b3dc1d39c
75e02aa09edcfb2b43d41cd576e24099e9bca21d80bda0dcdc3f98f2357f1363
15dd78d136d7c9bae7144072052ef6cd12821ae081a7c085f145d834d96c5d5c"
skip_extraction="${_traefik_file}"
+broken="bad module versions"
_git_commit=18bd921cddee1e95cc03467a1b9636ddacd9d670
From aa13ddf283e8004878291bbcbf2343847fbbb97d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:16:54 -0300
Subject: [PATCH 5/6] lxd-lts: add libco-devel to makedepends.
Necessary to fix final linking step.
---
srcpkgs/lxd-lts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lxd-lts/template b/srcpkgs/lxd-lts/template
index 42e8a958093..c0e783c54b3 100644
--- a/srcpkgs/lxd-lts/template
+++ b/srcpkgs/lxd-lts/template
@@ -9,7 +9,7 @@ go_build_tags="libsqlite3"
go_package="${go_import_path}/lxd ${go_import_path}/lxc
${go_import_path}/lxd-p2c ${go_import_path}/fuidshift"
hostmakedepends="pkg-config"
-makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel"
+makedepends="lxc-devel acl-devel dqlite-devel eudev-libudev-devel libco-devel"
depends="lxc acl acl-progs rsync squashfs-tools xz dnsmasq iptables"
short_desc="Next generation system container manager (long term support channel)"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
From 18966044990f57595f141a83be831bd421ae98b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 14:17:31 -0300
Subject: [PATCH 6/6] goproxy: mark broken.
---
srcpkgs/goproxy/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/goproxy/template b/srcpkgs/goproxy/template
index 437471ffa75..17360cc6fb1 100644
--- a/srcpkgs/goproxy/template
+++ b/srcpkgs/goproxy/template
@@ -11,3 +11,4 @@ license="GPL-3.0-or-later"
homepage="https://github.com/snail007/goproxy"
distfiles="https://github.com/snail007/goproxy/archive/v${version}.tar.gz"
checksum=13f8e37d274d2b7b7cdf1ae3d98723fbb9acf1476c92a1e0d43039109d238ccc
+broken="7.0 tag was removed from repository"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
` (18 preceding siblings ...)
2021-02-14 3:52 ` ericonr
@ 2021-04-18 21:01 ` ericonr
2021-04-18 21:05 ` [PR PATCH] [Merged]: " ericonr
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2021-04-18 21:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 528 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gorebuild
https://github.com/void-linux/void-packages/pull/26377
Go package clean up
While I get ready to do a full go rebuild, I found packages with various issues. Some broken ones and some had changed paths.
ping @the-maldridge @thypon @Vaelatern @misuchiru03 @renatoaguiar @steinex @CameronNemo
A patch file from https://github.com/void-linux/void-packages/pull/26377.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gorebuild-26377.patch --]
[-- Type: text/x-diff, Size: 1253 bytes --]
From 9d3a5943b087e62d2416fbebfbfa9db7e9d7c04e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:46:35 -0300
Subject: [PATCH] gfuzz: fix checksum, homepage and module paths.
---
srcpkgs/gfuzz/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index a51ea912896f..3925f06c9500 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -1,14 +1,14 @@
# Template file for 'gfuzz'
pkgname=gfuzz
version=0.2
-revision=1
-wrksrc="gfuzz-${version}"
+revision=2
+wrksrc="gfz-${version}"
build_style=go
-go_import_path=github.com/braaaax/gfuzz
+go_import_path=github.com/braaaax/gfz
hostmakedepends="git"
short_desc="Web fuzzer like wfuzz written in Golang"
maintainer="Alex Childs <misuchiru03+void@gmail.com>"
license="Apache-2.0"
-homepage="https://github.com/braaaax/gfuzz"
-distfiles="https://github.com/braaaax/gfuzz/archive/v${version}.tar.gz"
-checksum=054163243181db528715bf904ee7656aa0a12e9feb120c8afbfd43bd6504ccd1
+homepage="https://github.com/braaaax/gfz"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=8b6a3df0c385fe993ead673df53daa290943220f2cde73e6b1c706ef94aa4e5f
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Merged]: Go package clean up
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
` (19 preceding siblings ...)
2021-04-18 21:01 ` ericonr
@ 2021-04-18 21:05 ` ericonr
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2021-04-18 21:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 370 bytes --]
There's a merged pull request on the void-packages repository
Go package clean up
https://github.com/void-linux/void-packages/pull/26377
Description:
While I get ready to do a full go rebuild, I found packages with various issues. Some broken ones and some had changed paths.
ping @the-maldridge @thypon @Vaelatern @misuchiru03 @renatoaguiar @steinex @CameronNemo
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2021-04-18 21:05 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-14 17:22 [PR PATCH] Go package clean up ericonr
2020-11-14 17:26 ` [PR PATCH] [Updated] " ericonr
2020-11-14 17:28 ` ericonr
2020-11-14 17:34 ` ericonr
2020-11-14 19:25 ` ericonr
2020-11-14 20:54 ` pullmoll
2020-11-14 22:34 ` [PR REVIEW] " the-maldridge
2020-11-14 22:34 ` the-maldridge
2020-11-14 22:59 ` ericonr
2020-11-14 23:07 ` ericonr
2020-11-15 17:04 ` sgn
2020-11-15 17:05 ` sgn
2020-11-15 17:06 ` sgn
2020-11-15 17:08 ` sgn
2020-11-15 21:01 ` ericonr
2020-11-15 23:22 ` [PR PATCH] [Updated] " ericonr
2020-11-17 1:24 ` ericonr
2020-12-30 7:01 ` the-maldridge
2021-01-04 2:16 ` [PR PATCH] [Updated] " ericonr
2021-02-14 3:52 ` ericonr
2021-04-18 21:01 ` ericonr
2021-04-18 21:05 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).