gentoo resync : 22.12.2021

4 files changed, 135 insertions, 0 deletions

diff --git a/app-containers/s6-overlay/Manifest b/app-containers/s6-overlay/Manifest
new file mode 100644
index 000000000000..8ea286ae9fd4
--- /dev/null
+++ b/app-containers/s6-overlay/Manifest
@@ -0,0 +1,5 @@
+DIST s6-overlay-1.18.1.3.tar.gz 20067 BLAKE2B 7006549052fb27c8e7ec2a756854ebd82a41a88e14be45657c375321f4c18f482aefc8d21f1d57d8432ff1b836f114aac75a28b56bdd7722b14de3c06330024d SHA512 2b17b86a93e1efc27181a100bb86aacbce2e2c58cfd0d0855a293b99ba5c871a2f17bd10fa14b173b297816ae2d1658aaee2e6a6e25b957ad60f93d535955775
+DIST s6-overlay-2.1.0.2.tar.gz 30688 BLAKE2B 14d631a23be831d9dbc62a7e5ca341320eb8a0f46ae94d243bba4d6ba8fe9f6102dc818555398af64a207ea3056eb2cbbe045b5ec3baaf7d3a058217ad20e4f7 SHA512 6ff18566c64031fca985b36d6cbba646c3fb5c7f16a9d2dcca74e66ed4de5f10399c2142453e550c4e711f716158b91dd5777c7f6a03a91ed61ca9e81d6cef30
+EBUILD s6-overlay-1.18.1.3.ebuild 1561 BLAKE2B 1432c8ef3f47561dbd517bff8d1390049e7451afaf2f5869daef4ab9f888496f85917026cfd81e94d18480b0c20cb89f74372c1d4dd9c244796bfd60473feabf SHA512 9d672afde5c015c5d7ea89abedd3e7a5126c1ad2d8c3e0702bab1b4f93127b21f64ed2828c8f9c69027d92ce84d943c60fa9f8f30e8c1ad5b20bd6122563b583
+EBUILD s6-overlay-2.1.0.2-r1.ebuild 1702 BLAKE2B b278f77d98e9d9def1e848f01e520666de69f7d54ca7bd06153e68eb775ce8a05613a77bcfe563a16918d266ecca447b4b0376a71dcc50ca362dd60cceb26a4f SHA512 b66ee91c0ca917271f34e66defe36d6c52bfce1804e6e1bb42f082798d5c10a7a7a846e0657d3baeb35afe4b3396bc1100a28f47d6e19c75d0c6e03068427826
+MISC metadata.xml 340 BLAKE2B e3ffe29edbc507d16d845774c4be95c8506b07a4dff827411a4c5f5f219a0217680c75b21cc5a61dc959f3e6b9cd3065eccb8fd89e4c5a4d7a276feb658ea249 SHA512 40a876b2b0dad9492eb5f00c0c89564b158b9efc22342f55e70092087329e3c32015729cc806a03855ae528c3963ee2d7b972d0ca4ac296f43466e7ae74671a6
diff --git a/app-containers/s6-overlay/metadata.xml b/app-containers/s6-overlay/metadata.xml
new file mode 100644
index 000000000000..1ac1fdb7dff3
--- /dev/null
+++ b/app-containers/s6-overlay/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">just-containers/s6-overlay</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-containers/s6-overlay/s6-overlay-1.18.1.3.ebuild b/app-containers/s6-overlay/s6-overlay-1.18.1.3.ebuild
new file mode 100644
index 000000000000..c9dd1445da21
--- /dev/null
+++ b/app-containers/s6-overlay/s6-overlay-1.18.1.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/just-containers/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/just-containers/${PN}/archive/v${PV}.tar.gz ->
+	${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit vcs-snapshot
+fi
+
+DESCRIPTION="an s6-based init system for containers"
+HOMEPAGE="https://github.com/just-containers/s6-overlay"
+
+LICENSE="ISC"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-apps/s6
+	sys-apps/s6-portable-utils"
+
+src_install() {
+	dodoc *.md
+	cd builder/overlay-rootfs
+	dobin usr/bin/{fix-attrs,logutil*,print*,with*}
+
+	insinto /
+	doins -r etc init
+
+	# create must exist directories
+	dodir /etc/{cont-init.d,cont-finish.d,fix-attrs.d,services.d}
+	dodir /etc/s6/init/env-stage2
+
+	# create "supervise" directory in fdholder, its needed for no-catchall
+	# stage2 wake up
+	dodir /etc/s6/services/s6-fdholderd/supervise
+	fperms 0700 /etc/s6/services/s6-fdholderd/supervise
+
+	# fix misc permissions
+	fperms 0755 /init
+	fperms 0755 /etc/s6/init/init-stage1 \
+		/etc/s6/init/init-stage2 \
+		/etc/s6/init/init-stage2-redirfd \
+		/etc/s6/init/init-stage3
+	fperms 0755 /etc/s6/init-catchall/init-stage1 \
+		/etc/s6/init-catchall/init-stage2
+	fperms 0755 /etc/s6/init-no-catchall/init-stage1 \
+		/etc/s6/init-no-catchall/init-stage2
+	fperms 0755 /etc/s6/services/.s6-svscan/crash
+	fperms 0755 /etc/s6/services/.s6-svscan/finish
+	fperms 0755 /etc/s6/services/s6-fdholderd/run
+	fperms 0755 /etc/s6/services/s6-svscan-log/run
+}
diff --git a/app-containers/s6-overlay/s6-overlay-2.1.0.2-r1.ebuild b/app-containers/s6-overlay/s6-overlay-2.1.0.2-r1.ebuild
new file mode 100644
index 000000000000..17960297fa00
--- /dev/null
+++ b/app-containers/s6-overlay/s6-overlay-2.1.0.2-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/just-containers/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/just-containers/${PN}/archive/v${PV}.tar.gz ->
+	${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="an s6-based init system for containers"
+HOMEPAGE="https://github.com/just-containers/s6-overlay"
+
+LICENSE="ISC"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-apps/s6
+	sys-apps/s6-portable-utils"
+
+src_install() {
+	dodoc *.md
+	cd builder/overlay-rootfs
+	dobin usr/bin/{fix-attrs,logutil*,print*,with*}
+
+	insinto /
+	doins -r etc init
+
+	# create must exist directories
+	dodir /etc/{cont-init.d,cont-finish.d,fix-attrs.d,services.d}
+	dodir /etc/s6/init/env-stage2
+
+	# create "supervise" directory in fdholder, its needed for no-catchall
+	# stage2 wake up
+	dodir /etc/s6/services/s6-fdholderd/supervise
+	fperms 0700 /etc/s6/services/s6-fdholderd/supervise
+
+	# fix misc permissions
+	fperms 0755 /init
+	fperms 0755 /etc/s6/init/init-stage1 \
+		/etc/s6/init/init-stage2 \
+		/etc/s6/init/init-stage2-redirfd \
+		/etc/s6/init/init-stage3
+	fperms 0755 /etc/s6/init-catchall/init-stage1 \
+		/etc/s6/init-catchall/init-stage2
+	fperms 0755 /etc/s6/init-no-catchall/init-stage1 \
+		/etc/s6/init-no-catchall/init-stage2
+	fperms 0755 /etc/s6/services/.s6-svscan/crash
+	fperms 0755 /etc/s6/services/.s6-svscan/finish
+	fperms 0755 /etc/s6/services/s6-fdholderd/run
+	fperms 0755 /etc/s6/services/s6-svscan-log/run
+
+	# create a stub for the s6-overlay-preinit setuid program, since
+	# it's really not needed when permissions are already correct
+	dosym true /bin/s6-overlay-preinit
+}