* [PR PATCH] New package: catatonit-0.1.5
@ 2021-05-26 15:50 jsbronder
2021-05-26 15:56 ` [PR REVIEW] " ericonr
` (13 more replies)
0 siblings, 14 replies; 15+ messages in thread
From: jsbronder @ 2021-05-26 15:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
There is a new pull request by jsbronder against master on the void-packages repository
https://github.com/jsbronder/void-packages next
https://github.com/void-linux/void-packages/pull/31133
New package: catatonit-0.1.5
<!-- Mark items with [x] where applicable -->
#### 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 packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [ ] 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/31133.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-next-31133.patch --]
[-- Type: text/x-diff, Size: 1295 bytes --]
From 03b2ae7cadd0362b15e8c7f6ffdf82afdcd155df Mon Sep 17 00:00:00 2001
From: Justin Bronder <jsbronder@cold-front.org>
Date: Wed, 26 May 2021 11:04:45 -0400
Subject: [PATCH] New package: catatonit-0.1.5
---
srcpkgs/catatonit/template | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 srcpkgs/catatonit/template
diff --git a/srcpkgs/catatonit/template b/srcpkgs/catatonit/template
new file mode 100644
index 000000000000..6ddbba0f0525
--- /dev/null
+++ b/srcpkgs/catatonit/template
@@ -0,0 +1,24 @@
+# Template file for 'catatonit'
+pkgname=catatonit
+version=0.1.5
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool"
+short_desc="Container init that is so simple it's effectively brain-dead"
+maintainer="Justin Bronder <jsbronder@cold-front.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/openSUSE/catatonit"
+distfiles="https://github.com/openSUSE/catatonit/releases/download/v${version}/catatonit.tar.xz"
+checksum=4c45e2230235751731da3daabe130abce70b3ef37d0b1936cbc90a46b475cf08
+
+pre_configure() {
+ ./autogen.sh
+}
+
+do_install() {
+ vmkdir usr/libexec/catatonit
+ vinstall catatonit 0755 usr/libexec/catatonit
+
+ vmkdir usr/libexec/podman
+ ln -sf ../catatonit/catatonit "${DESTDIR}/usr/libexec/podman"
+}
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] New package: catatonit-0.1.5
2021-05-26 15:50 [PR PATCH] New package: catatonit-0.1.5 jsbronder
@ 2021-05-26 15:56 ` ericonr
2021-05-26 15:56 ` ericonr
` (12 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-05-26 15:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31133#discussion_r639869104
Comment:
Please call `autoreconf -fi` explicitly.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] New package: catatonit-0.1.5
2021-05-26 15:50 [PR PATCH] New package: catatonit-0.1.5 jsbronder
2021-05-26 15:56 ` [PR REVIEW] " ericonr
@ 2021-05-26 15:56 ` ericonr
2021-05-26 15:56 ` ericonr
` (11 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-05-26 15:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 165 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31133#discussion_r639868650
Comment:
Funky indentation.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] New package: catatonit-0.1.5
2021-05-26 15:50 [PR PATCH] New package: catatonit-0.1.5 jsbronder
2021-05-26 15:56 ` [PR REVIEW] " ericonr
2021-05-26 15:56 ` ericonr
@ 2021-05-26 15:56 ` ericonr
2021-05-26 16:07 ` [PR PATCH] [Updated] " jsbronder
` (10 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-05-26 15:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31133#discussion_r639869347
Comment:
Explain why this is necessary.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] New package: catatonit-0.1.5
2021-05-26 15:50 [PR PATCH] New package: catatonit-0.1.5 jsbronder
` (2 preceding siblings ...)
2021-05-26 15:56 ` ericonr
@ 2021-05-26 16:07 ` jsbronder
2021-05-26 16:07 ` [PR REVIEW] " jsbronder
` (9 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: jsbronder @ 2021-05-26 16:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1593 bytes --]
There is an updated pull request by jsbronder against master on the void-packages repository
https://github.com/jsbronder/void-packages next
https://github.com/void-linux/void-packages/pull/31133
New package: catatonit-0.1.5
<!-- Mark items with [x] where applicable -->
#### 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 packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [ ] 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/31133.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-next-31133.patch --]
[-- Type: text/x-diff, Size: 1427 bytes --]
From 6148aeb73f4cf11070a7c425a47395b398faea5f Mon Sep 17 00:00:00 2001
From: Justin Bronder <jsbronder@cold-front.org>
Date: Wed, 26 May 2021 11:04:45 -0400
Subject: [PATCH] New package: catatonit-0.1.5
---
srcpkgs/catatonit/template | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 srcpkgs/catatonit/template
diff --git a/srcpkgs/catatonit/template b/srcpkgs/catatonit/template
new file mode 100644
index 000000000000..29cc233b7d51
--- /dev/null
+++ b/srcpkgs/catatonit/template
@@ -0,0 +1,26 @@
+# Template file for 'catatonit'
+pkgname=catatonit
+version=0.1.5
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool"
+short_desc="Container init that is so simple it's effectively brain-dead"
+maintainer="Justin Bronder <jsbronder@cold-front.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/openSUSE/catatonit"
+distfiles="https://github.com/openSUSE/catatonit/releases/download/v${version}/catatonit.tar.xz"
+checksum=4c45e2230235751731da3daabe130abce70b3ef37d0b1936cbc90a46b475cf08
+
+pre_configure() {
+ autoreconf -fi
+}
+
+do_install() {
+ vmkdir usr/libexec/catatonit
+ vinstall catatonit 0755 usr/libexec/catatonit
+
+ # Following suit with Fedora/Ubuntu, podman-run will default to looking
+ # for catatonit here when passed the "--init" argument
+ vmkdir usr/libexec/podman
+ ln -sf ../catatonit/catatonit "${DESTDIR}/usr/libexec/podman"
+}
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] New package: catatonit-0.1.5
2021-05-26 15:50 [PR PATCH] New package: catatonit-0.1.5 jsbronder
` (3 preceding siblings ...)
2021-05-26 16:07 ` [PR PATCH] [Updated] " jsbronder
@ 2021-05-26 16:07 ` jsbronder
2021-05-26 16:07 ` jsbronder
` (8 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: jsbronder @ 2021-05-26 16:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 155 bytes --]
New review comment by jsbronder on void-packages repository
https://github.com/void-linux/void-packages/pull/31133#discussion_r639878686
Comment:
fixed.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] New package: catatonit-0.1.5
2021-05-26 15:50 [PR PATCH] New package: catatonit-0.1.5 jsbronder
` (4 preceding siblings ...)
2021-05-26 16:07 ` [PR REVIEW] " jsbronder
@ 2021-05-26 16:07 ` jsbronder
2021-05-26 16:08 ` jsbronder
` (7 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: jsbronder @ 2021-05-26 16:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
New review comment by jsbronder on void-packages repository
https://github.com/void-linux/void-packages/pull/31133#discussion_r639878779
Comment:
done.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] New package: catatonit-0.1.5
2021-05-26 15:50 [PR PATCH] New package: catatonit-0.1.5 jsbronder
` (5 preceding siblings ...)
2021-05-26 16:07 ` jsbronder
@ 2021-05-26 16:08 ` jsbronder
2021-05-26 16:33 ` paper42
` (6 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: jsbronder @ 2021-05-26 16:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 346 bytes --]
New review comment by jsbronder on void-packages repository
https://github.com/void-linux/void-packages/pull/31133#discussion_r639879369
Comment:
Added a comment in the template. For convenience:
```
# Following suit with Fedora/Ubuntu, podman-run will default to looking
# for catatonit here when passed the "--init" argument
```
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: New package: catatonit-0.1.5
2021-05-26 15:50 [PR PATCH] New package: catatonit-0.1.5 jsbronder
` (6 preceding siblings ...)
2021-05-26 16:08 ` jsbronder
@ 2021-05-26 16:33 ` paper42
2021-05-26 16:39 ` jsbronder
` (5 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: paper42 @ 2021-05-26 16:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/31133#issuecomment-848923285
Comment:
Did you see #19638? I don't use this package right now, so it's fine for you to take it over.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: New package: catatonit-0.1.5
2021-05-26 15:50 [PR PATCH] New package: catatonit-0.1.5 jsbronder
` (7 preceding siblings ...)
2021-05-26 16:33 ` paper42
@ 2021-05-26 16:39 ` jsbronder
2021-05-26 16:50 ` paper42
` (4 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: jsbronder @ 2021-05-26 16:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 521 bytes --]
New comment by jsbronder on void-packages repository
https://github.com/void-linux/void-packages/pull/31133#issuecomment-848932960
Comment:
> Did you see #19638? I don't use this package right now, so it's fine for you to take it over.
No, my apologies. I completely failed to search and just assumed no one had submitted it. I'll be an active user via podman for the foreseeable future at $DAY_JOB, but I don't particularly care which PR goes in. Looks like you did build with, and then fix building with, musl.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: New package: catatonit-0.1.5
2021-05-26 15:50 [PR PATCH] New package: catatonit-0.1.5 jsbronder
` (8 preceding siblings ...)
2021-05-26 16:39 ` jsbronder
@ 2021-05-26 16:50 ` paper42
2021-05-26 17:16 ` [PR PATCH] [Updated] " jsbronder
` (3 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: paper42 @ 2021-05-26 16:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 659 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/31133#issuecomment-848941870
Comment:
> > Did you see #19638? I don't use this package right now, so it's fine for you to take it over.
>
> No, my apologies. I completely failed to search and just assumed no one had submitted it. I'll be an active user via podman for the foreseeable future at $DAY_JOB, but I don't particularly care which PR goes in. Looks like you did build with, and then fix building with, musl.
It's totally ok, you can pull in the patch in my PR. I believe I got it from alpine. Please continue with this PR, I will close mine.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] New package: catatonit-0.1.5
2021-05-26 15:50 [PR PATCH] New package: catatonit-0.1.5 jsbronder
` (9 preceding siblings ...)
2021-05-26 16:50 ` paper42
@ 2021-05-26 17:16 ` jsbronder
2021-05-26 17:16 ` jsbronder
` (2 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: jsbronder @ 2021-05-26 17:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1606 bytes --]
There is an updated pull request by jsbronder against master on the void-packages repository
https://github.com/jsbronder/void-packages next
https://github.com/void-linux/void-packages/pull/31133
New package: catatonit-0.1.5
<!-- Mark items with [x] where applicable -->
#### 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 packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [x] armv7l (crossbuild)
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/31133.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-next-31133.patch --]
[-- Type: text/x-diff, Size: 2758 bytes --]
From 8ade87b6a0cec4ca6b20059e7e8192484d5afe9e Mon Sep 17 00:00:00 2001
From: Justin Bronder <jsbronder@cold-front.org>
Date: Wed, 26 May 2021 11:04:45 -0400
Subject: [PATCH] New package: catatonit-0.1.5
---
.../use-environ-instead-of-__environ.patch | 29 +++++++++++++++++++
srcpkgs/catatonit/template | 27 +++++++++++++++++
2 files changed, 56 insertions(+)
create mode 100644 srcpkgs/catatonit/patches/use-environ-instead-of-__environ.patch
create mode 100644 srcpkgs/catatonit/template
diff --git a/srcpkgs/catatonit/patches/use-environ-instead-of-__environ.patch b/srcpkgs/catatonit/patches/use-environ-instead-of-__environ.patch
new file mode 100644
index 000000000000..c32276f9cbc6
--- /dev/null
+++ b/srcpkgs/catatonit/patches/use-environ-instead-of-__environ.patch
@@ -0,0 +1,29 @@
+From 75014b1c3099245b7d0f44f24d7f6dc4888a45fd Mon Sep 17 00:00:00 2001
+From: Andrey Golovizin <ag@sologoc.com>
+Date: Mon, 1 Mar 2021 18:41:42 +0100
+Subject: [PATCH] Use environ instead of __environ
+
+The `__environ` variable is internal and undocumented. It also breaks
+compilation with musl.
+
+Signed-off-by: Andrey Golovizin <ag@sologoc.com>
+---
+ catatonit.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/catatonit.c b/catatonit.c
+index a05451e..fd746bb 100644
+--- a/catatonit.c
++++ b/catatonit.c
+@@ -216,7 +216,7 @@ static int spawn_pid1(char *file, char **argv, sigset_t *sigmask)
+ if (sigprocmask(SIG_SETMASK, sigmask, NULL) < 0)
+ bail("failed to reset sigmask: %m");
+
+- execvpe(file, argv, __environ);
++ execvpe(file, argv, environ);
+ bail("failed to exec pid1: %m");
+ }
+
+--
+2.31.1
+
diff --git a/srcpkgs/catatonit/template b/srcpkgs/catatonit/template
new file mode 100644
index 000000000000..445d384baa75
--- /dev/null
+++ b/srcpkgs/catatonit/template
@@ -0,0 +1,27 @@
+# Template file for 'catatonit'
+pkgname=catatonit
+version=0.1.5
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool"
+short_desc="Container init that is so simple it's effectively brain-dead"
+maintainer="Justin Bronder <jsbronder@cold-front.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/openSUSE/catatonit"
+distfiles="https://github.com/openSUSE/catatonit/releases/download/v${version}/catatonit.tar.xz"
+checksum=4c45e2230235751731da3daabe130abce70b3ef37d0b1936cbc90a46b475cf08
+patch_args=-Np1
+
+pre_configure() {
+ autoreconf -fi
+}
+
+do_install() {
+ vmkdir usr/libexec/catatonit
+ vinstall catatonit 0755 usr/libexec/catatonit
+
+ # Following suit with Fedora/Ubuntu, podman-run will default to looking
+ # for catatonit here when passed the "--init" argument
+ vmkdir usr/libexec/podman
+ ln -sf ../catatonit/catatonit "${DESTDIR}/usr/libexec/podman"
+}
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: New package: catatonit-0.1.5
2021-05-26 15:50 [PR PATCH] New package: catatonit-0.1.5 jsbronder
` (10 preceding siblings ...)
2021-05-26 17:16 ` [PR PATCH] [Updated] " jsbronder
@ 2021-05-26 17:16 ` jsbronder
2021-08-18 17:43 ` [PR PATCH] [Updated] " paper42
2021-08-18 17:49 ` [PR PATCH] [Merged]: " paper42
13 siblings, 0 replies; 15+ messages in thread
From: jsbronder @ 2021-05-26 17:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 742 bytes --]
New comment by jsbronder on void-packages repository
https://github.com/void-linux/void-packages/pull/31133#issuecomment-848960830
Comment:
> > > Did you see #19638? I don't use this package right now, so it's fine for you to take it over.
> >
> >
> > No, my apologies. I completely failed to search and just assumed no one had submitted it. I'll be an active user via podman for the foreseeable future at $DAY_JOB, but I don't particularly care which PR goes in. Looks like you did build with, and then fix building with, musl.
>
> It's totally ok, you can pull in the patch in my PR. I believe I got it from alpine. Please continue with this PR, I will close mine.
Looks like upstream already got to it. I pulled their patch.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] New package: catatonit-0.1.5
2021-05-26 15:50 [PR PATCH] New package: catatonit-0.1.5 jsbronder
` (11 preceding siblings ...)
2021-05-26 17:16 ` jsbronder
@ 2021-08-18 17:43 ` paper42
2021-08-18 17:49 ` [PR PATCH] [Merged]: " paper42
13 siblings, 0 replies; 15+ messages in thread
From: paper42 @ 2021-08-18 17:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1622 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/jsbronder/void-packages next
https://github.com/void-linux/void-packages/pull/31133
New package: catatonit-0.1.5
<!-- Mark items with [x] where applicable -->
#### 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 packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] aarch64-musl (crossbuild)
- [x] armv7l (crossbuild)
- [x] armv6l-musl (crossbuild)
A patch file from https://github.com/void-linux/void-packages/pull/31133.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-next-31133.patch --]
[-- Type: text/x-diff, Size: 2741 bytes --]
From 7c4e9c635ed1a03ee98f20f534c26cddd19d944d Mon Sep 17 00:00:00 2001
From: Justin Bronder <jsbronder@cold-front.org>
Date: Wed, 26 May 2021 11:04:45 -0400
Subject: [PATCH] New package: catatonit-0.1.5
---
.../use-environ-instead-of-__environ.patch | 29 +++++++++++++++++++
srcpkgs/catatonit/template | 26 +++++++++++++++++
2 files changed, 55 insertions(+)
create mode 100644 srcpkgs/catatonit/patches/use-environ-instead-of-__environ.patch
create mode 100644 srcpkgs/catatonit/template
diff --git a/srcpkgs/catatonit/patches/use-environ-instead-of-__environ.patch b/srcpkgs/catatonit/patches/use-environ-instead-of-__environ.patch
new file mode 100644
index 000000000000..c32276f9cbc6
--- /dev/null
+++ b/srcpkgs/catatonit/patches/use-environ-instead-of-__environ.patch
@@ -0,0 +1,29 @@
+From 75014b1c3099245b7d0f44f24d7f6dc4888a45fd Mon Sep 17 00:00:00 2001
+From: Andrey Golovizin <ag@sologoc.com>
+Date: Mon, 1 Mar 2021 18:41:42 +0100
+Subject: [PATCH] Use environ instead of __environ
+
+The `__environ` variable is internal and undocumented. It also breaks
+compilation with musl.
+
+Signed-off-by: Andrey Golovizin <ag@sologoc.com>
+---
+ catatonit.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/catatonit.c b/catatonit.c
+index a05451e..fd746bb 100644
+--- a/catatonit.c
++++ b/catatonit.c
+@@ -216,7 +216,7 @@ static int spawn_pid1(char *file, char **argv, sigset_t *sigmask)
+ if (sigprocmask(SIG_SETMASK, sigmask, NULL) < 0)
+ bail("failed to reset sigmask: %m");
+
+- execvpe(file, argv, __environ);
++ execvpe(file, argv, environ);
+ bail("failed to exec pid1: %m");
+ }
+
+--
+2.31.1
+
diff --git a/srcpkgs/catatonit/template b/srcpkgs/catatonit/template
new file mode 100644
index 000000000000..29cc233b7d51
--- /dev/null
+++ b/srcpkgs/catatonit/template
@@ -0,0 +1,26 @@
+# Template file for 'catatonit'
+pkgname=catatonit
+version=0.1.5
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool"
+short_desc="Container init that is so simple it's effectively brain-dead"
+maintainer="Justin Bronder <jsbronder@cold-front.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/openSUSE/catatonit"
+distfiles="https://github.com/openSUSE/catatonit/releases/download/v${version}/catatonit.tar.xz"
+checksum=4c45e2230235751731da3daabe130abce70b3ef37d0b1936cbc90a46b475cf08
+
+pre_configure() {
+ autoreconf -fi
+}
+
+do_install() {
+ vmkdir usr/libexec/catatonit
+ vinstall catatonit 0755 usr/libexec/catatonit
+
+ # Following suit with Fedora/Ubuntu, podman-run will default to looking
+ # for catatonit here when passed the "--init" argument
+ vmkdir usr/libexec/podman
+ ln -sf ../catatonit/catatonit "${DESTDIR}/usr/libexec/podman"
+}
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Merged]: New package: catatonit-0.1.5
2021-05-26 15:50 [PR PATCH] New package: catatonit-0.1.5 jsbronder
` (12 preceding siblings ...)
2021-08-18 17:43 ` [PR PATCH] [Updated] " paper42
@ 2021-08-18 17:49 ` paper42
13 siblings, 0 replies; 15+ messages in thread
From: paper42 @ 2021-08-18 17:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1467 bytes --]
There's a merged pull request on the void-packages repository
New package: catatonit-0.1.5
https://github.com/void-linux/void-packages/pull/31133
Description:
<!-- Mark items with [x] where applicable -->
#### 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 packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] aarch64-musl (crossbuild)
- [x] armv7l (crossbuild)
- [x] armv6l-musl (crossbuild)
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2021-08-18 17:49 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-26 15:50 [PR PATCH] New package: catatonit-0.1.5 jsbronder
2021-05-26 15:56 ` [PR REVIEW] " ericonr
2021-05-26 15:56 ` ericonr
2021-05-26 15:56 ` ericonr
2021-05-26 16:07 ` [PR PATCH] [Updated] " jsbronder
2021-05-26 16:07 ` [PR REVIEW] " jsbronder
2021-05-26 16:07 ` jsbronder
2021-05-26 16:08 ` jsbronder
2021-05-26 16:33 ` paper42
2021-05-26 16:39 ` jsbronder
2021-05-26 16:50 ` paper42
2021-05-26 17:16 ` [PR PATCH] [Updated] " jsbronder
2021-05-26 17:16 ` jsbronder
2021-08-18 17:43 ` [PR PATCH] [Updated] " paper42
2021-08-18 17:49 ` [PR PATCH] [Merged]: " paper42
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).