Merge branch 'main' of git.bgme.me:bgme/lilac

repo/ooniprobe-cli/PKGBUILD

@@ -5,26 +5,29 @@ _pkgname=probe-cli
 pkgname=ooniprobe-cli
 pkgver=3.19.0
 _pkgver=3.19.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Next generation OONI Probe CLI'
 arch=('x86_64')
 url='https://ooni.org/'
 license=('GPL3')
 depends=('glibc')
-makedepends=('go1.20')
+makedepends=('go')
 source=("${_pkgname}-${_pkgver}.tar.gz::https://github.com/ooni/${_pkgname}/archive/refs/tags/v${_pkgver}.tar.gz")
 sha256sums=('9ec38edb7bb4254e16a58f184ddceafc4a0ede060e08f6741ab02d1e7d6820a2')
 sha512sums=('3780d7439f51b9a6dc7190ba5414fc88fbdd0ffdb9bbc4a9b7cee924beebcde5556b1199542ec4f7981ee960cc050299742e728c9d87bb2872991929ba550978')
 
 build() {
   cd "${_pkgname}-${_pkgver}"
+  GOVERSION=$(cat GOVERSION)
+  export GOTOOLCHAIN=go${GOVERSION}
+
   export CGO_ENABLED=1
   export CGO_LDFLAGS="$LDFLAGS"
   export CGO_CFLAGS="$CFLAGS"
   export CGO_CPPFLAGS="$CPPFLAGS"
   export CGO_CXXFLAGS="$CXXFLAGS"
   export GOFLAGS='-ldflags=-linkmode=external -buildmode=pie -trimpath -modcacherw'
-  go1.20 build ./cmd/ooniprobe
+  go build ./cmd/ooniprobe
 }
 
 package() {

repo/sing-geoip/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=sing-geoip
 pkgver=20231012
-pkgrel=2
+pkgrel=3
 pkgdesc='sing-geoip database'
 arch=('any')
 url="https://github.com/SagerNet/sing-geoip"

repo/sing-geosite/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=sing-geosite
 pkgver=20231031055637
-pkgrel=2
+pkgrel=3
 pkgdesc='sing-geosite database'
 arch=('any')
 url="https://github.com/SagerNet/sing-geosite"