Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] New package: singularity-3.7.1
@ 2021-01-23 23:58 olafmersmann
  2021-01-24 20:34 ` [PR PATCH] [Updated] " olafmersmann
                   ` (34 more replies)
  0 siblings, 35 replies; 36+ messages in thread
From: olafmersmann @ 2021-01-23 23:58 UTC (permalink / raw)
  To: ml

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

There is a new pull request by olafmersmann against master on the void-packages repository

https://github.com/olafmersmann/void-packages singularity
https://github.com/void-linux/void-packages/pull/28129

[WIP] New package: singularity-3.7.1
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the package proposed for inclusion on a regular basis and confirm it works for me

The tests require `sudo`, so they are disabled. To start an interactive Alpine container, run installation 
```
$ singularity pull alpine
$ singularity run alpine_latest.sif
``` 

#### Does it build and run successfully? 
- [x] I built this PR locally for my native architecture, (x86_64)


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

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

From afdc5a0deee16a4cb71dfa5d2d3b3eeb5dc81ae8 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 16 Jan 2021 23:17:17 +0100
Subject: [PATCH] New package: singularity-3.7.1

---
 srcpkgs/singularity/INSTALL  |  9 ++++++
 srcpkgs/singularity/template | 59 ++++++++++++++++++++++++++++++++++++
 2 files changed, 68 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 00000000000..144a3203649
--- /dev/null
+++ b/srcpkgs/singularity/INSTALL
@@ -0,0 +1,9 @@
+case "${ACTION}" in
+post)
+	if [ ! -d var/lib/singularity/mnt/session ]; then
+		mkdir -p var/lib/singularity/mnt/session
+	fi
+	chown root:root var/lib/singularity/mnt/session
+	chown root:users usr/libexec/singularity/bin/starter-suid
+	chmod 4755 usr/libexec/singularity/bin/starter-suid
+esac
diff --git a/srcpkgs/singularity/template b/srcpkgs/singularity/template
new file mode 100644
index 00000000000..3df0aac56fb
--- /dev/null
+++ b/srcpkgs/singularity/template
@@ -0,0 +1,59 @@
+# Template file for 'singularity'
+pkgname=singularity
+version=3.7.1
+revision=1
+archs="aarch64* armv[567]* i686* x86_64* ppc64le*"
+wrksrc="${pkgname}"
+build_style=go
+go_import_path=github.com/sylabs.io/singularity
+go_mod_mode=vendor
+hostmakedepends="wget pkg-config go cryptsetup"
+makedepends="libressl-devel libseccomp-devel"
+depends="squashfs-tools cryptsetup"
+short_desc="HPC centric container platform"
+maintainer="Olaf Mersmann <olafm@p-value.net>"
+license="BSD-3-Clause-LBNL"
+homepage="https://sylabs.io/singularity/"
+distfiles="https://github.com/hpcng/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=82d2c65063560195ec34551931be3c325b95e8e2009e92755fd7daad346e083c
+nocross=yes
+
+do_configure() {
+	./mconfig \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--libexecdir=/usr/libexec \
+		--sysconfdir=/etc \
+		--sharedstatedir=/var/lib \
+		--mandir=/usr/share/man \
+		--localstatedir=/var/lib
+
+	# 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() {
+	export srcdir=$PWD
+	make -C builddir old_config=
+}
+
+do_install() {
+	make DESTDIR="${DESTDIR}" -C builddir install man
+	vlicense LICENSE.md
+	vcompletion builddir/etc/bash_completion.d/singularity bash
+	rm -fr "${DESTDIR}"/usr/lib64
+}
+
+do_check() {
+	# XXX: tests require sudo, so skip for now.
+	# make -C builddir unit-test
+	# make -C builddir integration-test
+	# make -C builddir e2e-test
+	: "Pass"
+}

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
@ 2021-01-24 20:34 ` olafmersmann
  2021-01-26  2:29 ` [PR REVIEW] " ericonr
                   ` (33 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: olafmersmann @ 2021-01-24 20:34 UTC (permalink / raw)
  To: ml

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

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

https://github.com/olafmersmann/void-packages singularity
https://github.com/void-linux/void-packages/pull/28129

[WIP] New package: singularity-3.7.1
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the package proposed for inclusion on a regular basis and confirm it works for me

The tests require `sudo`, so they are disabled. To start an interactive Alpine container, run installation 
```
$ singularity pull alpine
$ singularity run alpine_latest.sif
``` 

#### Does it build and run successfully? 
- [x] I built this PR locally for my native architecture, (x86_64)


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

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

From 962213d30fce5e8ba27fdd6716468870264f589a Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 16 Jan 2021 23:17:17 +0100
Subject: [PATCH] New package: singularity-3.7.1

---
 srcpkgs/singularity/INSTALL  |  9 ++++++
 srcpkgs/singularity/template | 58 ++++++++++++++++++++++++++++++++++++
 2 files changed, 67 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 00000000000..144a3203649
--- /dev/null
+++ b/srcpkgs/singularity/INSTALL
@@ -0,0 +1,9 @@
+case "${ACTION}" in
+post)
+	if [ ! -d var/lib/singularity/mnt/session ]; then
+		mkdir -p var/lib/singularity/mnt/session
+	fi
+	chown root:root var/lib/singularity/mnt/session
+	chown root:users usr/libexec/singularity/bin/starter-suid
+	chmod 4755 usr/libexec/singularity/bin/starter-suid
+esac
diff --git a/srcpkgs/singularity/template b/srcpkgs/singularity/template
new file mode 100644
index 00000000000..69a88a72957
--- /dev/null
+++ b/srcpkgs/singularity/template
@@ -0,0 +1,58 @@
+# Template file for 'singularity'
+pkgname=singularity
+version=3.7.1
+revision=1
+wrksrc="${pkgname}"
+build_style=go
+go_import_path=github.com/sylabs.io/singularity
+go_mod_mode=vendor
+hostmakedepends="wget pkg-config go cryptsetup"
+makedepends="libressl-devel libseccomp-devel"
+depends="squashfs-tools cryptsetup"
+short_desc="HPC centric container platform"
+maintainer="Olaf Mersmann <olafm@p-value.net>"
+license="BSD-3-Clause-LBNL"
+homepage="https://sylabs.io/singularity/"
+distfiles="https://github.com/hpcng/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=82d2c65063560195ec34551931be3c325b95e8e2009e92755fd7daad346e083c
+nocross=yes
+
+do_configure() {
+	./mconfig \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--libexecdir=/usr/libexec \
+		--sysconfdir=/etc \
+		--sharedstatedir=/var/lib \
+		--mandir=/usr/share/man \
+		--localstatedir=/var/lib
+
+	# 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() {
+	export srcdir=$PWD
+	make -C builddir old_config=
+}
+
+do_install() {
+	make DESTDIR="${DESTDIR}" -C builddir install man
+	vlicense LICENSE.md
+	vcompletion builddir/etc/bash_completion.d/singularity bash
+	rm -fr "${DESTDIR}"/usr/lib64
+}
+
+do_check() {
+	# XXX: tests require sudo, so skip for now.
+	# make -C builddir unit-test
+	# make -C builddir integration-test
+	# make -C builddir e2e-test
+	: "Pass"
+}

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
  2021-01-24 20:34 ` [PR PATCH] [Updated] " olafmersmann
@ 2021-01-26  2:29 ` ericonr
  2021-01-26  2:29 ` ericonr
                   ` (32 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: ericonr @ 2021-01-26  2:29 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r564172517

Comment:
Isn't `mkdir -p` enough here?

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (4 preceding siblings ...)
  2021-01-26  2:29 ` ericonr
@ 2021-01-26  2:29 ` ericonr
  2021-01-26  2:29 ` ericonr
                   ` (28 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: ericonr @ 2021-01-26  2:29 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r564174894

Comment:
Given that `/usr/lib64` should be a symlink to `/usr/lib`, this seems very wrong... Why is it required?

Also, I prefer to use `-r` so it errors out if the file doesn't exist, which would mean the command isn't necessary :)

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (3 preceding siblings ...)
  2021-01-26  2:29 ` ericonr
@ 2021-01-26  2:29 ` ericonr
  2021-01-26  2:29 ` ericonr
                   ` (29 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: ericonr @ 2021-01-26  2:29 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r564172374

Comment:
This looks like a datapoint for #26417 :p 

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
  2021-01-24 20:34 ` [PR PATCH] [Updated] " olafmersmann
  2021-01-26  2:29 ` [PR REVIEW] " ericonr
@ 2021-01-26  2:29 ` ericonr
  2021-01-26  2:29 ` ericonr
                   ` (31 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: ericonr @ 2021-01-26  2:29 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r564172837

Comment:
Why is this necessary? Root should be the owner by default.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (2 preceding siblings ...)
  2021-01-26  2:29 ` ericonr
@ 2021-01-26  2:29 ` ericonr
  2021-01-26  2:29 ` ericonr
                   ` (30 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: ericonr @ 2021-01-26  2:29 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r564173506

Comment:
Shouldn't this be 4750? That's what xbps-uchroot uses, at least.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (6 preceding siblings ...)
  2021-01-26  2:29 ` ericonr
@ 2021-01-26  2:29 ` ericonr
  2021-01-26  2:29 ` ericonr
                   ` (26 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: ericonr @ 2021-01-26  2:29 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r564174175

Comment:
```suggestion
	srcdir=$PWD make -C builddir old_config=
```

Avoids polluting the environment :)

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (7 preceding siblings ...)
  2021-01-26  2:29 ` ericonr
@ 2021-01-26  2:29 ` ericonr
  2021-01-27 23:16 ` olafmersmann
                   ` (25 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: ericonr @ 2021-01-26  2:29 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r564175093

Comment:
```suggestion
	# make -C builddir unit-test integration-test e2e-test
```

For brevity

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (5 preceding siblings ...)
  2021-01-26  2:29 ` ericonr
@ 2021-01-26  2:29 ` ericonr
  2021-01-26  2:29 ` ericonr
                   ` (27 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: ericonr @ 2021-01-26  2:29 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r564173781

Comment:
What kind of errors did you get?

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (8 preceding siblings ...)
  2021-01-26  2:29 ` ericonr
@ 2021-01-27 23:16 ` olafmersmann
  2021-01-27 23:16 ` olafmersmann
                   ` (24 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: olafmersmann @ 2021-01-27 23:16 UTC (permalink / raw)
  To: ml

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

New review comment by olafmersmann on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r565704144

Comment:
Yes. Similar situation to `aerc`.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (9 preceding siblings ...)
  2021-01-27 23:16 ` olafmersmann
@ 2021-01-27 23:16 ` olafmersmann
  2021-01-27 23:17 ` olafmersmann
                   ` (23 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: olafmersmann @ 2021-01-27 23:16 UTC (permalink / raw)
  To: ml

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

New review comment by olafmersmann on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r565704258

Comment:
Yes, fixed.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (10 preceding siblings ...)
  2021-01-27 23:16 ` olafmersmann
@ 2021-01-27 23:17 ` olafmersmann
  2021-01-27 23:21 ` olafmersmann
                   ` (22 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: olafmersmann @ 2021-01-27 23:17 UTC (permalink / raw)
  To: ml

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

New review comment by olafmersmann on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r565704476

Comment:
Yes, wanted to be safe. Removed it.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (11 preceding siblings ...)
  2021-01-27 23:17 ` olafmersmann
@ 2021-01-27 23:21 ` olafmersmann
  2021-01-27 23:25 ` olafmersmann
                   ` (21 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: olafmersmann @ 2021-01-27 23:21 UTC (permalink / raw)
  To: ml

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

New review comment by olafmersmann on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r565706588

Comment:
4755 is the upstream default but 4750 works fine as well.
In that case, do we also want to add a `singularity` group to further restrict access? 

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (12 preceding siblings ...)
  2021-01-27 23:21 ` olafmersmann
@ 2021-01-27 23:25 ` olafmersmann
  2021-01-27 23:30 ` ericonr
                   ` (20 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: olafmersmann @ 2021-01-27 23:25 UTC (permalink / raw)
  To: ml

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

New review comment by olafmersmann on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r565708088

Comment:
Good point, fixed.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (13 preceding siblings ...)
  2021-01-27 23:25 ` olafmersmann
@ 2021-01-27 23:30 ` ericonr
  2021-01-27 23:34 ` olafmersmann
                   ` (19 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: ericonr @ 2021-01-27 23:30 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r565712227

Comment:
I assume you want 4750 since you made it belong to the `users` group, otherwise chown'ing it makes no difference that I can see.

And yes, it's likely that a `_singularity` group would be best.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (14 preceding siblings ...)
  2021-01-27 23:30 ` ericonr
@ 2021-01-27 23:34 ` olafmersmann
  2021-01-27 23:35 ` olafmersmann
                   ` (18 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: olafmersmann @ 2021-01-27 23:34 UTC (permalink / raw)
  To: ml

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

New review comment by olafmersmann on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r565713910

Comment:
The `makeit` configure doesn't support GO crossbuilds so it chokes wenn GOARCH is set:
```
...
 checking: host C++ compiler... c++
 checking: host Go compiler (at least version 1.13)... not found!
mconfig: could not complete configuration
```

I'd really like to avoid patching crossbuild support into their Makefiles.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (15 preceding siblings ...)
  2021-01-27 23:34 ` olafmersmann
@ 2021-01-27 23:35 ` olafmersmann
  2021-01-27 23:39 ` olafmersmann
                   ` (17 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: olafmersmann @ 2021-01-27 23:35 UTC (permalink / raw)
  To: ml

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

New review comment by olafmersmann on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r565714381

Comment:
Fixed.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (16 preceding siblings ...)
  2021-01-27 23:35 ` olafmersmann
@ 2021-01-27 23:39 ` olafmersmann
  2021-01-27 23:41 ` [PR PATCH] [Updated] " olafmersmann
                   ` (16 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: olafmersmann @ 2021-01-27 23:39 UTC (permalink / raw)
  To: ml

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

New review comment by olafmersmann on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r565717056

Comment:
Can't remember why I added it, it's not necessary so I removed it.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (17 preceding siblings ...)
  2021-01-27 23:39 ` olafmersmann
@ 2021-01-27 23:41 ` olafmersmann
  2021-01-27 23:47 ` [PR REVIEW] " ericonr
                   ` (15 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: olafmersmann @ 2021-01-27 23:41 UTC (permalink / raw)
  To: ml

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

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

https://github.com/olafmersmann/void-packages singularity
https://github.com/void-linux/void-packages/pull/28129

[WIP] New package: singularity-3.7.1
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the package proposed for inclusion on a regular basis and confirm it works for me

The tests require `sudo`, so they are disabled. To start an interactive Alpine container, run installation 
```
$ singularity pull alpine
$ singularity run alpine_latest.sif
``` 

#### Does it build and run successfully? 
- [x] I built this PR locally for my native architecture, (x86_64)


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

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

From 996185365fbc8abdd2fef1b5d151cfaad67d9e05 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 16 Jan 2021 23:17:17 +0100
Subject: [PATCH] New package: singularity-3.7.1

---
 srcpkgs/singularity/INSTALL  |  6 ++++
 srcpkgs/singularity/template | 54 ++++++++++++++++++++++++++++++++++++
 2 files changed, 60 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 00000000000..151dd5eefd7
--- /dev/null
+++ b/srcpkgs/singularity/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+	mkdir -p var/lib/singularity/mnt/session
+	chown root:users usr/libexec/singularity/bin/starter-suid
+	chmod 4755 usr/libexec/singularity/bin/starter-suid
+esac
diff --git a/srcpkgs/singularity/template b/srcpkgs/singularity/template
new file mode 100644
index 00000000000..06e73ad14d1
--- /dev/null
+++ b/srcpkgs/singularity/template
@@ -0,0 +1,54 @@
+# Template file for 'singularity'
+pkgname=singularity
+version=3.7.1
+revision=1
+wrksrc="${pkgname}"
+build_style=go
+go_import_path=github.com/sylabs.io/singularity
+go_mod_mode=vendor
+hostmakedepends="wget pkg-config go cryptsetup"
+makedepends="libressl-devel libseccomp-devel"
+depends="squashfs-tools cryptsetup"
+short_desc="HPC centric container platform"
+maintainer="Olaf Mersmann <olafm@p-value.net>"
+license="BSD-3-Clause-LBNL"
+homepage="https://sylabs.io/singularity/"
+distfiles="https://github.com/hpcng/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=82d2c65063560195ec34551931be3c325b95e8e2009e92755fd7daad346e083c
+nocross=yes
+
+do_configure() {
+	./mconfig \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--libexecdir=/usr/libexec \
+		--sysconfdir=/etc \
+		--sharedstatedir=/var/lib \
+		--mandir=/usr/share/man \
+		--localstatedir=/var/lib
+
+	# 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() {
+	srcdir=$PWD make -C builddir old_config=
+}
+
+do_install() {
+	make DESTDIR="${DESTDIR}" -C builddir install man
+	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"
+}

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (18 preceding siblings ...)
  2021-01-27 23:41 ` [PR PATCH] [Updated] " olafmersmann
@ 2021-01-27 23:47 ` ericonr
  2021-01-27 23:53 ` [PR PATCH] [Updated] " olafmersmann
                   ` (14 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: ericonr @ 2021-01-27 23:47 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r565719929

Comment:
Heh, np. You could consider making changes upstream, though :P 

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (19 preceding siblings ...)
  2021-01-27 23:47 ` [PR REVIEW] " ericonr
@ 2021-01-27 23:53 ` olafmersmann
  2021-01-27 23:54 ` [PR REVIEW] " olafmersmann
                   ` (13 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: olafmersmann @ 2021-01-27 23:53 UTC (permalink / raw)
  To: ml

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

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

https://github.com/olafmersmann/void-packages singularity
https://github.com/void-linux/void-packages/pull/28129

[WIP] New package: singularity-3.7.1
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the package proposed for inclusion on a regular basis and confirm it works for me

The tests require `sudo`, so they are disabled. To start an interactive Alpine container, run installation 
```
$ singularity pull alpine
$ singularity run alpine_latest.sif
``` 

#### Does it build and run successfully? 
- [x] I built this PR locally for my native architecture, (x86_64)


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

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

From 9d68a51ec06929d33b39c390cac6f81b8197e800 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 16 Jan 2021 23:17:17 +0100
Subject: [PATCH] New package: singularity-3.7.1

---
 srcpkgs/singularity/INSTALL  |  6 ++++
 srcpkgs/singularity/template | 55 ++++++++++++++++++++++++++++++++++++
 2 files changed, 61 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 00000000000..a549cd1e2ef
--- /dev/null
+++ b/srcpkgs/singularity/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+	mkdir -p var/lib/singularity/mnt/session
+	chown root:_singularity usr/libexec/singularity/bin/starter-suid
+	chmod 4755 usr/libexec/singularity/bin/starter-suid
+esac
diff --git a/srcpkgs/singularity/template b/srcpkgs/singularity/template
new file mode 100644
index 00000000000..d6461d08509
--- /dev/null
+++ b/srcpkgs/singularity/template
@@ -0,0 +1,55 @@
+# Template file for 'singularity'
+pkgname=singularity
+version=3.7.1
+revision=1
+wrksrc="${pkgname}"
+build_style=go
+go_import_path=github.com/sylabs.io/singularity
+go_mod_mode=vendor
+hostmakedepends="wget pkg-config go cryptsetup"
+makedepends="libressl-devel libseccomp-devel"
+depends="squashfs-tools cryptsetup"
+short_desc="HPC centric container platform"
+maintainer="Olaf Mersmann <olafm@p-value.net>"
+license="BSD-3-Clause-LBNL"
+homepage="https://sylabs.io/singularity/"
+distfiles="https://github.com/hpcng/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=82d2c65063560195ec34551931be3c325b95e8e2009e92755fd7daad346e083c
+nocross=yes
+system_groups="_singularity"
+
+do_configure() {
+	./mconfig \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--libexecdir=/usr/libexec \
+		--sysconfdir=/etc \
+		--sharedstatedir=/var/lib \
+		--mandir=/usr/share/man \
+		--localstatedir=/var/lib
+
+	# 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() {
+	srcdir=$PWD make -C builddir old_config=
+}
+
+do_install() {
+	make DESTDIR="${DESTDIR}" -C builddir install man
+	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"
+}

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (20 preceding siblings ...)
  2021-01-27 23:53 ` [PR PATCH] [Updated] " olafmersmann
@ 2021-01-27 23:54 ` olafmersmann
  2021-01-28  0:04 ` ericonr
                   ` (12 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: olafmersmann @ 2021-01-27 23:54 UTC (permalink / raw)
  To: ml

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

New review comment by olafmersmann on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r565722777

Comment:
Changed. 

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (21 preceding siblings ...)
  2021-01-27 23:54 ` [PR REVIEW] " olafmersmann
@ 2021-01-28  0:04 ` ericonr
  2021-01-28  0:15 ` [PR PATCH] [Updated] " olafmersmann
                   ` (11 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: ericonr @ 2021-01-28  0:04 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r565726776

Comment:
Btw, `chmod`'ing to 4750 in `do_install` is also necessary, otherwise there will be a window of time where the binary is 4755 and anyone can run anything.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (22 preceding siblings ...)
  2021-01-28  0:04 ` ericonr
@ 2021-01-28  0:15 ` olafmersmann
  2021-01-28  0:15 ` [PR REVIEW] " olafmersmann
                   ` (10 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: olafmersmann @ 2021-01-28  0:15 UTC (permalink / raw)
  To: ml

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

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

https://github.com/olafmersmann/void-packages singularity
https://github.com/void-linux/void-packages/pull/28129

[WIP] New package: singularity-3.7.1
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the package proposed for inclusion on a regular basis and confirm it works for me

The tests require `sudo`, so they are disabled. To start an interactive Alpine container, run installation 
```
$ singularity pull alpine
$ singularity run alpine_latest.sif
``` 

#### Does it build and run successfully? 
- [x] I built this PR locally for my native architecture, (x86_64)


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

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

From 34c28094eb3da7b187e64d6a579b954e91311b5d Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 16 Jan 2021 23:17:17 +0100
Subject: [PATCH] New package: singularity-3.7.1

---
 srcpkgs/singularity/INSTALL  |  6 ++++
 srcpkgs/singularity/template | 56 ++++++++++++++++++++++++++++++++++++
 2 files changed, 62 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 00000000000..a549cd1e2ef
--- /dev/null
+++ b/srcpkgs/singularity/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+	mkdir -p var/lib/singularity/mnt/session
+	chown root:_singularity usr/libexec/singularity/bin/starter-suid
+	chmod 4755 usr/libexec/singularity/bin/starter-suid
+esac
diff --git a/srcpkgs/singularity/template b/srcpkgs/singularity/template
new file mode 100644
index 00000000000..6474620f2c7
--- /dev/null
+++ b/srcpkgs/singularity/template
@@ -0,0 +1,56 @@
+# Template file for 'singularity'
+pkgname=singularity
+version=3.7.1
+revision=1
+wrksrc="${pkgname}"
+build_style=go
+go_import_path=github.com/sylabs.io/singularity
+go_mod_mode=vendor
+hostmakedepends="wget pkg-config go cryptsetup"
+makedepends="libressl-devel libseccomp-devel"
+depends="squashfs-tools cryptsetup"
+short_desc="HPC centric container platform"
+maintainer="Olaf Mersmann <olafm@p-value.net>"
+license="BSD-3-Clause-LBNL"
+homepage="https://sylabs.io/singularity/"
+distfiles="https://github.com/hpcng/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=82d2c65063560195ec34551931be3c325b95e8e2009e92755fd7daad346e083c
+nocross=yes
+system_groups="_singularity"
+
+do_configure() {
+	./mconfig \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--libexecdir=/usr/libexec \
+		--sysconfdir=/etc \
+		--sharedstatedir=/var/lib \
+		--mandir=/usr/share/man \
+		--localstatedir=/var/lib
+
+	# 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() {
+	srcdir=$PWD make -C builddir old_config=
+}
+
+do_install() {
+	make DESTDIR="${DESTDIR}" -C builddir install man
+	chmod $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"
+}

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (23 preceding siblings ...)
  2021-01-28  0:15 ` [PR PATCH] [Updated] " olafmersmann
@ 2021-01-28  0:15 ` olafmersmann
  2021-01-28  0:21 ` [PR PATCH] [Updated] " olafmersmann
                   ` (9 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: olafmersmann @ 2021-01-28  0:15 UTC (permalink / raw)
  To: ml

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

New review comment by olafmersmann on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r565730778

Comment:
Fixed.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (24 preceding siblings ...)
  2021-01-28  0:15 ` [PR REVIEW] " olafmersmann
@ 2021-01-28  0:21 ` olafmersmann
  2021-01-30 23:29 ` [PR REVIEW] " Johnnynator
                   ` (8 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: olafmersmann @ 2021-01-28  0:21 UTC (permalink / raw)
  To: ml

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

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

https://github.com/olafmersmann/void-packages singularity
https://github.com/void-linux/void-packages/pull/28129

[WIP] New package: singularity-3.7.1
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the package proposed for inclusion on a regular basis and confirm it works for me

The tests require `sudo`, so they are disabled. To start an interactive Alpine container, run installation 
```
$ singularity pull alpine
$ singularity run alpine_latest.sif
``` 

#### Does it build and run successfully? 
- [x] I built this PR locally for my native architecture, (x86_64)


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

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

From 7c1adfcb6bc2650e124db133a1e9054a6f8efa47 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 16 Jan 2021 23:17:17 +0100
Subject: [PATCH] New package: singularity-3.7.1

---
 srcpkgs/singularity/INSTALL  |  6 ++++
 srcpkgs/singularity/template | 56 ++++++++++++++++++++++++++++++++++++
 2 files changed, 62 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 00000000000..a549cd1e2ef
--- /dev/null
+++ b/srcpkgs/singularity/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+	mkdir -p var/lib/singularity/mnt/session
+	chown root:_singularity usr/libexec/singularity/bin/starter-suid
+	chmod 4755 usr/libexec/singularity/bin/starter-suid
+esac
diff --git a/srcpkgs/singularity/template b/srcpkgs/singularity/template
new file mode 100644
index 00000000000..094d81c3f92
--- /dev/null
+++ b/srcpkgs/singularity/template
@@ -0,0 +1,56 @@
+# Template file for 'singularity'
+pkgname=singularity
+version=3.7.1
+revision=1
+wrksrc="${pkgname}"
+build_style=go
+go_import_path=github.com/sylabs.io/singularity
+go_mod_mode=vendor
+hostmakedepends="wget pkg-config go cryptsetup"
+makedepends="libressl-devel libseccomp-devel"
+depends="squashfs-tools cryptsetup"
+short_desc="HPC centric container platform"
+maintainer="Olaf Mersmann <olafm@p-value.net>"
+license="BSD-3-Clause-LBNL"
+homepage="https://sylabs.io/singularity/"
+distfiles="https://github.com/hpcng/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=82d2c65063560195ec34551931be3c325b95e8e2009e92755fd7daad346e083c
+nocross=yes
+system_groups="_singularity"
+
+do_configure() {
+	./mconfig \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--libexecdir=/usr/libexec \
+		--sysconfdir=/etc \
+		--sharedstatedir=/var/lib \
+		--mandir=/usr/share/man \
+		--localstatedir=/var/lib
+
+	# 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() {
+	srcdir=$PWD make -C builddir old_config=
+}
+
+do_install() {
+	make DESTDIR="${DESTDIR}" -C builddir install man
+	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"
+}

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (25 preceding siblings ...)
  2021-01-28  0:21 ` [PR PATCH] [Updated] " olafmersmann
@ 2021-01-30 23:29 ` Johnnynator
  2021-01-30 23:34 ` ericonr
                   ` (7 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Johnnynator @ 2021-01-30 23:29 UTC (permalink / raw)
  To: ml

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r567335991

Comment:
```suggestion
post)
if [ "$(readlink -f . 2>/dev/null || echo .)" != "/" ]; then
	exit 1
else
	mkdir -p var/lib/singularity/mnt/session
	chown root:_singularity usr/libexec/singularity/bin/starter-suid
	chmod 4755 usr/libexec/singularity/bin/starter-suid
fi
```
Maybe do smth like this to prevent changing the binary to a potentially wrong group when executing xbps-install with `--rootidr`


^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (26 preceding siblings ...)
  2021-01-30 23:29 ` [PR REVIEW] " Johnnynator
@ 2021-01-30 23:34 ` ericonr
  2021-01-30 23:34 ` ericonr
                   ` (6 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: ericonr @ 2021-01-30 23:34 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r567336350

Comment:
I like the idea, but I'd prefer to have it as a general helper, otherwise this will have to be repeated across a few INSTALL scripts (including XBPS; it's not a huge issue there because the gid for `xbuilder` is constant, but still not great).

The helper shouldn't be added here though, so I will do it afterwards.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (27 preceding siblings ...)
  2021-01-30 23:34 ` ericonr
@ 2021-01-30 23:34 ` ericonr
  2021-01-30 23:48 ` [PR PATCH] [Updated] " olafmersmann
                   ` (5 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: ericonr @ 2021-01-30 23:34 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r567336350

Comment:
I like the idea, but I'd prefer to have it as a general helper, otherwise this will have to be repeated across a few INSTALL scripts (including XBPS; it's not a huge issue there because the gid for `xbuilder` is constant, but still not great).

The helper shouldn't be added here (this PR) though, so I will do it afterwards.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR PATCH] [Updated] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (28 preceding siblings ...)
  2021-01-30 23:34 ` ericonr
@ 2021-01-30 23:48 ` olafmersmann
  2021-01-30 23:50 ` [PR REVIEW] " olafmersmann
                   ` (4 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: olafmersmann @ 2021-01-30 23:48 UTC (permalink / raw)
  To: ml

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

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

https://github.com/olafmersmann/void-packages singularity
https://github.com/void-linux/void-packages/pull/28129

New package: singularity-3.7.1
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the package proposed for inclusion on a regular basis and confirm it works for me

The tests require `sudo`, so they are disabled. To start an interactive Alpine container, run installation 
```
$ singularity pull alpine
$ singularity run alpine_latest.sif
``` 

#### Does it build and run successfully? 
- [x] I built this PR locally for my native architecture, (x86_64)


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

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

From 35959104e57d6c267f090cb150b9df0d0a12f36c Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Sat, 16 Jan 2021 23:17:17 +0100
Subject: [PATCH] New package: singularity-3.7.1

---
 srcpkgs/singularity/INSTALL  | 10 +++++++
 srcpkgs/singularity/template | 57 ++++++++++++++++++++++++++++++++++++
 2 files changed, 67 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 00000000000..77fe1c22bdc
--- /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 00000000000..9848fe92a7d
--- /dev/null
+++ b/srcpkgs/singularity/template
@@ -0,0 +1,57 @@
+# Template file for 'singularity'
+pkgname=singularity
+version=3.7.1
+revision=1
+wrksrc="${pkgname}"
+build_style=go
+go_import_path=github.com/sylabs.io/singularity
+go_mod_mode=vendor
+hostmakedepends="wget pkg-config go cryptsetup"
+makedepends="libressl-devel libseccomp-devel"
+depends="squashfs-tools cryptsetup"
+short_desc="HPC centric container platform"
+maintainer="Olaf Mersmann <olafm@p-value.net>"
+license="BSD-3-Clause-LBNL"
+homepage="https://sylabs.io/singularity/"
+distfiles="https://github.com/hpcng/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=82d2c65063560195ec34551931be3c325b95e8e2009e92755fd7daad346e083c
+nocross=yes
+system_groups="_singularity"
+make_dirs="/var/lib/singularity/mnt/session 755 root root"
+
+do_configure() {
+	./mconfig \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--libexecdir=/usr/libexec \
+		--sysconfdir=/etc \
+		--sharedstatedir=/var/lib \
+		--mandir=/usr/share/man \
+		--localstatedir=/var/lib
+
+	# 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() {
+	srcdir=$PWD make -C builddir old_config=
+}
+
+do_install() {
+	make DESTDIR="${DESTDIR}" -C builddir install man
+	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"
+}

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (29 preceding siblings ...)
  2021-01-30 23:48 ` [PR PATCH] [Updated] " olafmersmann
@ 2021-01-30 23:50 ` olafmersmann
  2021-01-31  2:08 ` ericonr
                   ` (3 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: olafmersmann @ 2021-01-30 23:50 UTC (permalink / raw)
  To: ml

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

New review comment by olafmersmann on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r567339914

Comment:
I added the check and replaced the `mkdir` with `make_dirs` in the template.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (30 preceding siblings ...)
  2021-01-30 23:50 ` [PR REVIEW] " olafmersmann
@ 2021-01-31  2:08 ` ericonr
  2021-01-31  2:16 ` Johnnynator
                   ` (2 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: ericonr @ 2021-01-31  2:08 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r567351493

Comment:
Isn't an explicit failure here pretty bad? I think XBPS stops updates if you die with failure (instead of returning 0).

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR REVIEW] New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (31 preceding siblings ...)
  2021-01-31  2:08 ` ericonr
@ 2021-01-31  2:16 ` Johnnynator
  2022-05-02  2:16 ` github-actions
  2022-05-17  2:13 ` [PR PATCH] [Closed]: " github-actions
  34 siblings, 0 replies; 36+ messages in thread
From: Johnnynator @ 2021-01-31  2:16 UTC (permalink / raw)
  To: ml

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#discussion_r567352217

Comment:
True that. Didn't think of that.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (32 preceding siblings ...)
  2021-01-31  2:16 ` Johnnynator
@ 2022-05-02  2:16 ` github-actions
  2022-05-17  2:13 ` [PR PATCH] [Closed]: " github-actions
  34 siblings, 0 replies; 36+ messages in thread
From: github-actions @ 2022-05-02  2:16 UTC (permalink / raw)
  To: ml

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/28129#issuecomment-1114433365

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* Re: [PR PATCH] [Closed]: New package: singularity-3.7.1
  2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
                   ` (33 preceding siblings ...)
  2022-05-02  2:16 ` github-actions
@ 2022-05-17  2:13 ` github-actions
  34 siblings, 0 replies; 36+ messages in thread
From: github-actions @ 2022-05-17  2:13 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

New package: singularity-3.7.1
https://github.com/void-linux/void-packages/pull/28129

Description:
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the package proposed for inclusion on a regular basis and confirm it works for me

The tests require `sudo`, so they are disabled. To start an interactive Alpine container, run installation 
```
$ singularity pull alpine
$ singularity run alpine_latest.sif
``` 

#### Does it build and run successfully? 
- [x] I built this PR locally for my native architecture, (x86_64)


^ permalink raw reply	[flat|nested] 36+ messages in thread

end of thread, other threads:[~2022-05-17  2:13 UTC | newest]

Thread overview: 36+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-23 23:58 [PR PATCH] [WIP] New package: singularity-3.7.1 olafmersmann
2021-01-24 20:34 ` [PR PATCH] [Updated] " olafmersmann
2021-01-26  2:29 ` [PR REVIEW] " ericonr
2021-01-26  2:29 ` ericonr
2021-01-26  2:29 ` ericonr
2021-01-26  2:29 ` ericonr
2021-01-26  2:29 ` ericonr
2021-01-26  2:29 ` ericonr
2021-01-26  2:29 ` ericonr
2021-01-26  2:29 ` ericonr
2021-01-27 23:16 ` olafmersmann
2021-01-27 23:16 ` olafmersmann
2021-01-27 23:17 ` olafmersmann
2021-01-27 23:21 ` olafmersmann
2021-01-27 23:25 ` olafmersmann
2021-01-27 23:30 ` ericonr
2021-01-27 23:34 ` olafmersmann
2021-01-27 23:35 ` olafmersmann
2021-01-27 23:39 ` olafmersmann
2021-01-27 23:41 ` [PR PATCH] [Updated] " olafmersmann
2021-01-27 23:47 ` [PR REVIEW] " ericonr
2021-01-27 23:53 ` [PR PATCH] [Updated] " olafmersmann
2021-01-27 23:54 ` [PR REVIEW] " olafmersmann
2021-01-28  0:04 ` ericonr
2021-01-28  0:15 ` [PR PATCH] [Updated] " olafmersmann
2021-01-28  0:15 ` [PR REVIEW] " olafmersmann
2021-01-28  0:21 ` [PR PATCH] [Updated] " olafmersmann
2021-01-30 23:29 ` [PR REVIEW] " Johnnynator
2021-01-30 23:34 ` ericonr
2021-01-30 23:34 ` ericonr
2021-01-30 23:48 ` [PR PATCH] [Updated] " olafmersmann
2021-01-30 23:50 ` [PR REVIEW] " olafmersmann
2021-01-31  2:08 ` ericonr
2021-01-31  2:16 ` Johnnynator
2022-05-02  2:16 ` github-actions
2022-05-17  2:13 ` [PR PATCH] [Closed]: " github-actions

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).