Re: [PR PATCH] [Updated] [WIP] New package: singularity-3.11.0

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

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

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

https://github.com/snwnde/void-packages singularity
https://github.com/void-linux/void-packages/pull/42592

[WIP] New package: singularity-3.11.0
This is based on the work of @olafmersmann, https://github.com/void-linux/void-packages/pull/28129.
When merged, this should close https://github.com/void-linux/void-packages/issues/8135.

<!-- 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**

<!-- 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, (x86_64-glibc)


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

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

From 0380ee99d993be2f6e41e3cbd2cf1c5a40cc6578 Mon Sep 17 00:00:00 2001
From: Senwen Deng <void@snwn.de>
Date: Sat, 4 Mar 2023 23:06:11 +0100
Subject: [PATCH] New package: singularity-3.11.0

---
 srcpkgs/singularity/INSTALL  | 10 ++++++
 srcpkgs/singularity/template | 66 ++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 srcpkgs/singularity/INSTALL
 create mode 100644 srcpkgs/singularity/template

diff --git a/srcpkgs/singularity/INSTALL b/srcpkgs/singularity/INSTALL
new file mode 100644
index 000000000000..77fe1c22bdcd
--- /dev/null
+++ b/srcpkgs/singularity/INSTALL
@@ -0,0 +1,10 @@
+case "${ACTION}" in
+post)
+	if [ "$(readlink -f . 2>/dev/null || echo .)" != "/" ]; then
+		exit 1
+	else
+		chown root:_singularity usr/libexec/singularity/bin/starter-suid
+		chmod 4755 usr/libexec/singularity/bin/starter-suid
+	fi
+	;;
+esac
diff --git a/srcpkgs/singularity/template b/srcpkgs/singularity/template
new file mode 100644
index 000000000000..864e933d99fb
--- /dev/null
+++ b/srcpkgs/singularity/template
@@ -0,0 +1,66 @@
+# Template file for 'singularity'
+pkgname=singularity
+version=3.11.0
+revision=1
+configure_script=./mconfig
+configure_args="--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--libexecdir=/usr/libexec \
+		--sysconfdir=/etc \
+		--sharedstatedir=/var/lib \
+		--mandir=/usr/share/man \
+		--localstatedir=/var/lib \
+		--without-conmon"
+make_dirs="/var/lib/singularity/mnt/session 755 root root"
+hostmakedepends="wget pkg-config go cryptsetup"
+# makedepends="libseccomp-devel glib-devel squashfs-tools runc"
+makedepends="libseccomp-devel squashfs-tools runc"
+depends="squashfs-tools cryptsetup conmon"
+short_desc="HPC centric container platform"
+maintainer="Senwen Deng <void@snwn.de>"
+license="BSD-3-Clause-LBNL"
+homepage="https://sylabs.io/singularity/"
+distfiles="https://github.com/sylabs/${pkgname}/releases/download/v${version}/${pkgname}-ce-${version}.tar.gz"
+checksum=45c297f05065c7c920898af37acb781070b2330f141d7a566073197801577753
+
+do_configure() {
+	if ! [[ -z ${CROSS_BUILD} ]]; then
+		if [ -f ./mlocal/checks/project-post.chk ]; then
+			rm ./mlocal/checks/project-post.chk
+		fi
+		GOOS=linux GOARCH=amd64 ${configure_script} ${configure_args} -C ${XBPS_CROSS_TRIPLET}-gcc -X ${XBPS_CROSS_TRIPLET}-c++
+	else
+		${configure_script} ${configure_args}
+	fi
+}
+
+post_configure() {
+	# Fixup Makefile
+	# * Force use of vendored packages
+	# * Don't install bash completions into /etc/bash_completion.d
+	vsed -i \
+		-e 's@^GO_MODFLAGS := .*@GO_MODFLAGS := -mod=vendor@' \
+		-e 's@INSTALLFILES += $(bash_completion_INSTALL)@@' \
+		builddir/Makefile
+}
+
+do_build() {
+	if ! [[ -z ${CROSS_BUILD} ]]; then
+		GOOS=linux GOARCH=amd64 srcdir=$PWD make -C builddir old_config=
+	fi
+	srcdir=$PWD make -C builddir old_config=
+}
+
+do_install() {
+	make DESTDIR="${DESTDIR}" -C builddir install all
+	chmod 0750 $DESTDIR/usr/libexec/singularity/bin/starter-suid
+	vlicense LICENSE.md
+	vcompletion builddir/etc/bash_completion.d/singularity bash
+}
+
+do_check() {
+	# XXX: tests require sudo, so skip for now.
+	# make -C builddir unit-test integration-test e2e-test
+	: "Pass"
+}