From 8aaa3a05dc7e30db81bc56c6241c60b88e24fe2d Mon Sep 17 00:00:00 2001
From: Oleg Titov <oleg.titov@gmail.com>
Date: Sat, 26 Mar 2022 23:04:04 -0600
Subject: [PATCH] testing/singularity: add dependency on community/cni-plugins

- Modernize
---
 testing/singularity/APKBUILD | 49 +++++++++++++++---------------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/testing/singularity/APKBUILD b/testing/singularity/APKBUILD
index 2c53e4c2072..1b403483a5b 100644
--- a/testing/singularity/APKBUILD
+++ b/testing/singularity/APKBUILD
@@ -2,30 +2,24 @@
 # Maintainer: Oleg Titov <oleg.titov@gmail.com>
 pkgname=singularity
 pkgver=3.8.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Application containers focused on reproducibility for scientific computing and HPC world."
 url="https://www.sylabs.io/singularity/"
 # aarch64: segmentation fault during build
 # ppc64le: produces a non-PIE suid binary
-# riscv64 blocked by binutils-gold
-arch="all !aarch64 !ppc64le !riscv64"
+arch="all !aarch64 !ppc64le"
 license="BSD-3-Clause AND BSD-3-Clause-LBNL"
-options="chmod-clean suid !check" # no test suite from upstream
+options="suid !check" # no test suite from upstream
 depends="squashfs-tools"
 makedepends="
-	go
-	linux-headers
-	binutils-gold
-	openssl-dev
-	libuuid
-	util-linux-dev
-	libseccomp-dev
-	cryptsetup
 	bash
+	cni-plugins
+	cryptsetup
+	go
+	libseccomp-dev
 	"
-subpackages="$pkgname-doc $pkgname-bash-completion::noarch"
-source="https://github.com/hpcng/singularity/releases/download/v$pkgver/singularity-$pkgver.tar.gz"
-builddir="$srcdir/src/github.com/hpcng/$pkgname"
+subpackages="$pkgname-doc $pkgname-bash-completion"
+source="https://github.com/apptainer/singularity/releases/download/v$pkgver/singularity-$pkgver.tar.gz"
 
 # secfixes:
 #   3.8.5-r0:
@@ -47,34 +41,31 @@ builddir="$srcdir/src/github.com/hpcng/$pkgname"
 #   3.5.2-r0:
 #     - CVE-2019-19724
 
+export GOPATH="$srcdir"
+export GOFLAGS="$GOFLAGS -modcacherw -trimpath"
+
 prepare() {
-	export GOPATH="$srcdir"
-
-	mkdir -p "$(dirname $builddir)"
-	mv "$srcdir"/$pkgname-$pkgver "$builddir"/
-
-	echo "$pkgver" > "$builddir"/VERSION
 	default_prepare
+	echo "$pkgver" > "$builddir"/VERSION
 }
 
 build() {
-	export GOPATH="$srcdir"
-	export GOBIN="$GOPATH/bin"
-
-	./mconfig \
+	# override git dir so it picks up our version above
+	GIT_DIR=. ./mconfig \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/infodir \
-		--localstatedir=/var
+		--localstatedir=/var \
+		--without-network
 
-	make -C builddir
+	make -C builddir GOFLAGS="$GOFLAGS"
 }
 
 package() {
-	make -C builddir DESTDIR="$pkgdir" install
+	make -C builddir DESTDIR="$pkgdir" GOFLAGS="$GOFLAGS" install
 
-	install -m644 -D -t "$pkgdir/usr/share/doc/$pkgname" README.md
+	install -Dm644 -t "$pkgdir"/usr/share/doc/$pkgname README.md
 
 	mkdir -p "$pkgdir"/usr/share/bash-completion/completions
 	mv "$pkgdir"/etc/bash_completion.d/singularity \