Re: [PR PATCH] [Updated] go: update to 1.20.

[paper42 <paper42@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages go1.12
https://github.com/void-linux/void-packages/pull/42038

go: update to 1.20.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/42038.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-go1.12-42038.patch --]
[-- Type: text/x-diff, Size: 9794 bytes --]

From dda54ade3de283e3394756c4a3c80ad8f26eee83 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 2 Feb 2023 19:20:37 +0100
Subject: [PATCH 1/6] New package: go1.17-bootstrap-1.17.13

---
 srcpkgs/go1.17-bootstrap/INSTALL.msg |  4 +++
 srcpkgs/go1.17-bootstrap/template    | 51 ++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 srcpkgs/go1.17-bootstrap/INSTALL.msg
 create mode 100644 srcpkgs/go1.17-bootstrap/template

diff --git a/srcpkgs/go1.17-bootstrap/INSTALL.msg b/srcpkgs/go1.17-bootstrap/INSTALL.msg
new file mode 100644
index 000000000000..142aeabbc1b1
--- /dev/null
+++ b/srcpkgs/go1.17-bootstrap/INSTALL.msg
@@ -0,0 +1,4 @@
+This is a copy of the official Go language toolchain binaries as provided by
+the project on its download page. Please do keep in mind that it is almost
+definitely not what you want to use and exists purely for the purpose of
+bootstrapping the official compiler package (called simply 'go').
diff --git a/srcpkgs/go1.17-bootstrap/template b/srcpkgs/go1.17-bootstrap/template
new file mode 100644
index 000000000000..555eb97f52e7
--- /dev/null
+++ b/srcpkgs/go1.17-bootstrap/template
@@ -0,0 +1,51 @@
+# Template file for 'go1.17-bootstrap'
+pkgname=go1.17-bootstrap
+version=1.17.13
+revision=1
+archs="x86_64* i686* armv[67]l* aarch64* ppc64le*"
+short_desc="Go 1.17 (bootstrap compiler)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://golang.org"
+nostrip=yes
+noverifyrdeps=yes
+nocross=yes
+lib32disabled=yes
+repository=bootstrap
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	depends+=" gcompat"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*)
+		_dist_arch="amd64"
+		checksum="4cdd2bc664724dc7db94ad51b503512c5ae7220951cac568120f64f8e94399fc"
+		;;
+	i686*)
+		_dist_arch="386"
+		checksum="5e02f35aecc6b89679f631e0edf12c49922dd31c8140cf8dd725c5797a9f2425"
+		;;
+	arm*)
+		_dist_arch="armv6l"
+		checksum="260431d7deeb8893c21e71fcbbb1fde3258616d8eba584c8d72060228ab42c86"
+		;;
+	aarch64*)
+		_dist_arch="arm64"
+		checksum="914daad3f011cc2014dea799bb7490442677e4ad6de0b2ac3ded6cee7e3f493d"
+		;;
+	ppc64le*)
+		_dist_arch="ppc64le"
+		checksum="bd0763fb130f8412672ffe1e4a8e65888ebe2419e5caa9a67ac21e8c298aa254"
+		;;
+esac
+
+distfiles="https://dl.google.com/go/go${version}.linux-${_dist_arch}.tar.gz"
+
+do_install() {
+	vmkdir usr/lib/go${version}
+	vcopy bin usr/lib/go${version}
+	vcopy src usr/lib/go${version}
+	vcopy pkg usr/lib/go${version}
+	vlicense LICENSE
+}

From aa7f666d90fdd261ea671b980bd2bbe1a7705cc4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 1 Feb 2023 09:40:37 +0100
Subject: [PATCH 2/6] go: update to 1.20.

---
 srcpkgs/go/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 029c00cc09e1..80469c3b6c43 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,10 +1,10 @@
 # Template file for 'go'
 pkgname=go
-version=1.19.5
+version=1.20
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
-hostmakedepends="go1.12-bootstrap"
+hostmakedepends="go1.17-bootstrap"
 checkdepends="iana-etc clang gcc-fortran"
 short_desc="Go Programming Language"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f
+checksum=3a29ff0421beaf6329292b8a46311c9fbf06c800077ceddef5fb7f8d5b1ace33
 nostrip=yes
 noverifyrdeps=yes
 # on CI it tries to use `git submodule`, which is not part of chroot-git
@@ -53,7 +53,7 @@ do_build() {
 	# dependency
 	unset CGO_CXXFLAGS CGO_ENABLED # CGO_CFLAGS
 
-	export GOROOT_BOOTSTRAP="/usr/lib/go1.12"
+	export GOROOT_BOOTSTRAP="/usr/lib/go1.17.13"
 	export GOROOT=$PWD
 	export GOROOT_FINAL="/usr/lib/go"
 	export GOARCH=${_goarch}

From c71208e90fe2500b6575a6df00430cf023716cea Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 2 Feb 2023 19:19:31 +0100
Subject: [PATCH 3/6] go1.12-bootstrap: remove package

unused, go (1.20) now uses go1.17-bootstrap
---
 srcpkgs/go1.12-bootstrap/INSTALL.msg |  4 ---
 srcpkgs/go1.12-bootstrap/template    | 51 ----------------------------
 2 files changed, 55 deletions(-)
 delete mode 100644 srcpkgs/go1.12-bootstrap/INSTALL.msg
 delete mode 100644 srcpkgs/go1.12-bootstrap/template

diff --git a/srcpkgs/go1.12-bootstrap/INSTALL.msg b/srcpkgs/go1.12-bootstrap/INSTALL.msg
deleted file mode 100644
index 142aeabbc1b1..000000000000
--- a/srcpkgs/go1.12-bootstrap/INSTALL.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a copy of the official Go language toolchain binaries as provided by
-the project on its download page. Please do keep in mind that it is almost
-definitely not what you want to use and exists purely for the purpose of
-bootstrapping the official compiler package (called simply 'go').
diff --git a/srcpkgs/go1.12-bootstrap/template b/srcpkgs/go1.12-bootstrap/template
deleted file mode 100644
index 304d2053d041..000000000000
--- a/srcpkgs/go1.12-bootstrap/template
+++ /dev/null
@@ -1,51 +0,0 @@
-# Template file for 'go1.12-bootstrap'
-pkgname=go1.12-bootstrap
-version=1.12.17
-revision=2
-archs="x86_64* i686* armv[67]l* aarch64* ppc64le*"
-short_desc="Go 1.12 (bootstrap compiler)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://golang.org"
-nostrip=yes
-noverifyrdeps=yes
-nocross=yes
-lib32disabled=yes
-repository=bootstrap
-
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	depends+=" gcompat"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	x86_64*)
-		_dist_arch="amd64"
-		checksum="a53dd476129d496047487bfd53d021dd17e0c96895865a0e7d0469ce3db8c8d2"
-		;;
-	i686*)
-		_dist_arch="386"
-		checksum="e33fc10c0486b02a019f120996d77792d8f19aae8bfdda97350a622a65d6b824"
-		;;
-	arm*)
-		_dist_arch="armv6l"
-		checksum="a883c806fccb3eddb26da4a1a1f8536de863aee6807ed6c99606261877af7b99"
-		;;
-	aarch64*)
-		_dist_arch="arm64"
-		checksum="9d0819cce1451abdb090071880fe8771f16a3bcee71d6f6906023d17799574e2"
-		;;
-	ppc64le*)
-		_dist_arch="ppc64le"
-		checksum="dca4df132da7579c352bccd9d6f4ecb8d8d61893a84b0feffcee2bb4246114a3"
-		;;
-esac
-
-distfiles="https://dl.google.com/go/go${version}.linux-${_dist_arch}.tar.gz"
-
-do_install() {
-	vmkdir usr/lib/go1.12
-	vcopy bin usr/lib/go1.12
-	vcopy src usr/lib/go1.12
-	vcopy pkg usr/lib/go1.12
-	vlicense LICENSE
-}

From eac2072e5f7a5e10b4d890d213c602357c8581e2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 2 Feb 2023 19:54:31 +0100
Subject: [PATCH 4/6] domain_exporter: update to 0.1.24.

---
 srcpkgs/domain_exporter/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/domain_exporter/template b/srcpkgs/domain_exporter/template
index 5035a3b4240c..b122720b0c71 100644
--- a/srcpkgs/domain_exporter/template
+++ b/srcpkgs/domain_exporter/template
@@ -1,13 +1,12 @@
 # Template file for 'domain_exporter'
 pkgname=domain_exporter
-version=0.1.8
+version=0.1.24
 revision=1
 build_style=go
 go_import_path="github.com/shift/domain_exporter"
-hostmakedepends="git"
 short_desc="Prometheus WHOIS domain details exporter"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/shift/domain_exporter"
 distfiles="https://github.com/shift/domain_exporter/archive/v${version}.tar.gz"
-checksum=f45a60f75832cf6b2df8943b570a636956901399d01f10b2d6bbf7e5ed24077d
+checksum=62262d3234f7404859b21647dbb3661e425eeb44b9fad8e5368ddc4bd91364f2

From a614894f8a8ddd1e7dcf1330e9abd3cc02d38fa9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 8 Feb 2023 22:00:03 +0100
Subject: [PATCH 5/6] caddy: update to 2.6.3.

---
 srcpkgs/caddy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 8a52cdf5933b..5fd43bb04758 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
-version=2.6.2
-revision=2
+version=2.6.3
+revision=1
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
 go_package="${go_import_path}/cmd/caddy"
@@ -11,7 +11,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="Apache-2.0"
 homepage="https://caddyserver.com"
 distfiles="https://github.com/caddyserver/caddy/archive/v${version}.tar.gz"
-checksum=563d027a78919f859188fb894ae5f3669508a3430db347aa726cd73c19fb7038
+checksum=86d6bb9b90fb21b223dc570eb2ccc8cf917750d70fb0d9c4a86d3ec6c13c712c
 
 system_accounts="caddy"
 caddy_homedir="/var/lib/caddy"

From c5dcd3d59c07d81d9c4f5daea7da987193e3fc3f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 8 Feb 2023 22:24:54 +0100
Subject: [PATCH 6/6] v2ray: update to 5.3.0.

---
 srcpkgs/v2ray/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
index 300d28896d32..27dee8754f7e 100644
--- a/srcpkgs/v2ray/template
+++ b/srcpkgs/v2ray/template
@@ -1,6 +1,6 @@
 # Template file for 'v2ray'
 pkgname=v2ray
-version=5.2.1
+version=5.3.0
 revision=1
 build_style=go
 go_import_path="github.com/v2fly/v2ray-core/v5"
@@ -12,7 +12,7 @@ maintainer="ipkalm <ipkalm@outlook.com>"
 license="MIT"
 homepage="https://github.com/v2fly/v2ray-core"
 distfiles="https://github.com/v2fly/v2ray-core/archive/v${version}/${pkgname}-${version}.tar.gz"
-checksum=97bc872e798fed51c23c39f8f63ee25984658e2b252b0ec2c8ec469c00a4d77a
+checksum=8e97e2647cb1dee8aa7e71df276c56d74258b2d97bb490a362afa84bdf1b9e25
 conf_files="/etc/v2ray/config.json"
 
 system_accounts="_v2ray"