From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Go package clean up
Date: Sat, 14 Nov 2020 18:34:39 +0100 [thread overview]
Message-ID: <20201114173439.W9Ik7pHPTevD4NavTXLSLaQDZRa5mqERo51BJsEOIvQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26377@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2020-11-14 17:34 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-14 17:22 [PR PATCH] " ericonr
2020-11-14 17:26 ` [PR PATCH] [Updated] " ericonr
2020-11-14 17:28 ` ericonr
2020-11-14 17:34 ` ericonr [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201114173439.W9Ik7pHPTevD4NavTXLSLaQDZRa5mqERo51BJsEOIvQ@z \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).