summaryrefslogtreecommitdiff
path: root/app-containers
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-03-08 07:07:16 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-03-08 07:07:16 +0000
commitdc22a05dc2db2827053483e8cab136b33b339307 (patch)
tree3fd58204853fdb5a69c22ecfb0ce87e19aa91624 /app-containers
parent443cfbefc0bbd1e252d323db7597b33ace434817 (diff)
gentoo auto-resync : 08:03:2024 - 07:07:16
Diffstat (limited to 'app-containers')
-rw-r--r--app-containers/Manifest.gzbin8726 -> 8733 bytes
-rw-r--r--app-containers/buildah/Manifest4
-rw-r--r--app-containers/buildah/buildah-1.35.0.ebuild122
-rw-r--r--app-containers/buildah/buildah-9999.ebuild7
-rw-r--r--app-containers/podman/Manifest2
-rw-r--r--app-containers/podman/podman-5.0.0_rc5.ebuild148
6 files changed, 277 insertions, 6 deletions
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 163e34d12fbf..ede879a869a4 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
Binary files differ
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index bd94cc2abc95..1bfde8bac0b4 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -2,9 +2,11 @@ DIST buildah-1.33.5.tar.gz 18579521 BLAKE2B a59bfda3dea1f588a2f77a26b942da6ae02a
DIST buildah-1.33.6.tar.gz 18585405 BLAKE2B 4a6f6ebfce7799a45b0984b6f9a319becfed87d5acf5f1f784249ff6e5397495ac72c00a22ff0bcc68fd94f1d0a591fa4ac5f0f88bcc9c0a6cdefe117166b4ec SHA512 86eab18af459b0b92361d6e9f56ebe9dab65527d829e7771c13b6c574ef45746a7f53520783ff52978b14aac0d6ee8de32cdabf807666a96dcf46e07e36157e2
DIST buildah-1.34.0.tar.gz 18751419 BLAKE2B 6584c5234e849f9b8cde5e4188791024c8ac5c0ba85859e289f3eb2ec32f97f722ebf25f1291f29e14edf4adc14e19d6a6a76630c820085e9f345736aeb3d4eb SHA512 a3836ce540058f418131969e157d548864727398535e4e99a693d883419b8d764da7166f9b9376c2b9686d8beac101687843c2e93198b16328ef333ad96d55db
DIST buildah-1.34.1.tar.gz 18838539 BLAKE2B de11f64a54fa24c8aa543dd44e6a3fca9df62eecf39541fa37c22a2dc64560d056f638a6b1f8aa564a09f0594a5e7150ef14fd9ab8cc61390dc6d7d8afa5545b SHA512 2d229ead1149b66d1b7d91f596809e97e5316356ab0997ea335eb3e246ed8bc6879e0e260bb478b4d7ec7c42c7dbf33d0e91086a34e89a3b79eb27322da06c1e
+DIST buildah-1.35.0.tar.gz 19353483 BLAKE2B 806c098d557480b6d6e92e6da61c32e48dfd6c1bfa4926a2871a8f41a3ef5f35d91381e51d33636a892bce930eabfda509e97e9efa60ba5c4feab75781d027ee SHA512 b4dd30b4d8087bbd0bbfd9a7b9791afc015a0c489041b38d6b6241df27a97286083dcf7b25102ce1fa1080265378442be73313e301c22660f21d8e4f39bb3aa4
EBUILD buildah-1.33.5.ebuild 2909 BLAKE2B 661fe0713bc3359843c53397d1b5b0cf4fb90e953699c302d3dd00aa0fc3ea4e6885e31d076f91924d47f99fad87e5b309f450be1e04f9c37a2b5b22bc562ea7 SHA512 2728c95830caea275f18063fd2ff3b41b958a8b3b6b94bc7db6a488ae9c0e0a5f57d65c332740efb29afd31e91c934250e8c8b9953a95891ffb6ce34e3cafdba
EBUILD buildah-1.33.6.ebuild 2910 BLAKE2B 77283c1f12db741d30099b6f9a500a2fb2c5669b8d2241c044962b5caf278ff66a4d9f74531dcb656caa164af5b61d010e12237950f49c5fa4d74ee105a4c418 SHA512 ed979f1b6c25cc5a6b050586ef34127544e491ece492d94cf9311c68846bba4b9520201841f4009a48b31e60e62694d37036d052048e1bec17eaedc28272dec0
EBUILD buildah-1.34.0.ebuild 2902 BLAKE2B e1378ac470bc01624ad505725ecd58a6a8ffbb9513e94f9079f2638b272e067a1dd271c7c7494d0288769772afa63be01747530849cfc39dfaf7ca0b8192cc78 SHA512 cfabb584f69dcc7660d864e5e0c61ca045fa58cbe822e8172fdc38c181543d196bd7e02c61e1396f593ed79ffdc84398fcca60de632163e7f992dc1b03aa2366
EBUILD buildah-1.34.1.ebuild 2910 BLAKE2B 77283c1f12db741d30099b6f9a500a2fb2c5669b8d2241c044962b5caf278ff66a4d9f74531dcb656caa164af5b61d010e12237950f49c5fa4d74ee105a4c418 SHA512 ed979f1b6c25cc5a6b050586ef34127544e491ece492d94cf9311c68846bba4b9520201841f4009a48b31e60e62694d37036d052048e1bec17eaedc28272dec0
-EBUILD buildah-9999.ebuild 2910 BLAKE2B 77283c1f12db741d30099b6f9a500a2fb2c5669b8d2241c044962b5caf278ff66a4d9f74531dcb656caa164af5b61d010e12237950f49c5fa4d74ee105a4c418 SHA512 ed979f1b6c25cc5a6b050586ef34127544e491ece492d94cf9311c68846bba4b9520201841f4009a48b31e60e62694d37036d052048e1bec17eaedc28272dec0
+EBUILD buildah-1.35.0.ebuild 2827 BLAKE2B b810fee44fea3dd57934f408c78166e6976ba0c340599799d523341f9b60654a5e5c114a3ad412f840d87aafb95f0a15d3fef0218503493966d56405d4d51594 SHA512 b79b8bec1a0330a89b2f9975003f550fa085ffbee1b022c10f8c009ffbdda8e6d555802ab06de2126c5c864c1e0a80e92efd9c000a92b475a07ff5b0c8e8eb49
+EBUILD buildah-9999.ebuild 2827 BLAKE2B b810fee44fea3dd57934f408c78166e6976ba0c340599799d523341f9b60654a5e5c114a3ad412f840d87aafb95f0a15d3fef0218503493966d56405d4d51594 SHA512 b79b8bec1a0330a89b2f9975003f550fa085ffbee1b022c10f8c009ffbdda8e6d555802ab06de2126c5c864c1e0a80e92efd9c000a92b475a07ff5b0c8e8eb49
MISC metadata.xml 716 BLAKE2B 8d1868e48306b5ded8700bcfde93d2a0d1a4afedc5440781355f0645b5f71e5a80569be4b14ab459033c5ec7cf5f02eb49e3948154274ad09b088e09d8ac5069 SHA512 b8a7e951a5342ad1a32f650ab21d373c3afa86d482463d87dad5db0e6e715e3d4bde7642b75f68da7f5b4a7e935953ce2ac41affb66724e7882f75f97dfde023
diff --git a/app-containers/buildah/buildah-1.35.0.ebuild b/app-containers/buildah/buildah-1.35.0.ebuild
new file mode 100644
index 000000000000..8d0698568fd3
--- /dev/null
+++ b/app-containers/buildah/buildah-1.35.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module linux-info
+
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+
+SLOT="0"
+IUSE="apparmor btrfs +seccomp systemd test"
+RESTRICT="test"
+DOCS=(
+ "CHANGELOG.md"
+ "troubleshooting.md"
+ "docs/tutorials"
+)
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/containers/buildah.git"
+else
+ SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64"
+fi
+
+RDEPEND="
+ systemd? ( sys-apps/systemd )
+ btrfs? ( sys-fs/btrfs-progs )
+ seccomp? ( sys-libs/libseccomp:= )
+ apparmor? ( sys-libs/libapparmor:= )
+ app-containers/containers-common
+ app-crypt/gpgme:=
+ dev-libs/libgpg-error:=
+ dev-libs/libassuan:=
+ sys-apps/shadow:=
+"
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+ local CONFIG_CHECK=""
+ use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
+ check_extra_config
+
+ linux_config_exists || ewarn "Cannot determine configuration of your kernel."
+}
+
+src_prepare() {
+ default
+
+ # ensure all necessary files are there
+ local file
+ for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \
+ hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do
+ [[ -f "${file}" ]] || die
+ done
+
+ sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die
+ echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die
+
+ cat <<-EOF > hack/apparmor_tag.sh || die
+ #!/usr/bin/env bash
+ $(usex apparmor 'echo apparmor' echo)
+ EOF
+
+ use seccomp || {
+ cat <<-'EOF' > "${T}/disable_seccomp.patch"
+ --- a/Makefile
+ +++ b/Makefile
+ @@ -5 +5 @@
+ -SECURITYTAGS ?= seccomp $(APPARMORTAG)
+ +SECURITYTAGS ?= $(APPARMORTAG)
+ EOF
+ eapply "${T}/disable_seccomp.patch" || die
+ }
+
+ cat <<-EOF > hack/systemd_tag.sh || die
+ #!/usr/bin/env bash
+ $(usex systemd 'echo systemd' echo)
+ EOF
+
+ echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die
+ cat <<-EOF > btrfs_tag.sh || die
+ #!/usr/bin/env bash
+ $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
+ EOF
+
+ use test || {
+ cat <<-'EOF' > "${T}/disable_tests.patch"
+ --- a/Makefile
+ +++ b/Makefile
+ @@ -54 +54 @@
+ -all: bin/buildah bin/imgtype bin/copy bin/tutorial docs
+ +all: bin/buildah docs
+ EOF
+ eapply "${T}/disable_tests.patch" || die
+ }
+
+}
+
+src_compile() {
+ # For non-live versions, prevent git operations which causes sandbox violations
+ # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
+ [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
+
+ default
+}
+
+src_test() {
+ emake test-unit
+}
+
+src_install() {
+ emake DESTDIR="${ED}" install install.completions
+ einstalldocs
+}
diff --git a/app-containers/buildah/buildah-9999.ebuild b/app-containers/buildah/buildah-9999.ebuild
index d5fd4e7a796e..8d0698568fd3 100644
--- a/app-containers/buildah/buildah-9999.ebuild
+++ b/app-containers/buildah/buildah-9999.ebuild
@@ -14,12 +14,10 @@ LICENSE="Apache-2.0"
LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
SLOT="0"
-IUSE="apparmor btrfs +seccomp systemd doc test"
+IUSE="apparmor btrfs +seccomp systemd test"
RESTRICT="test"
-EXTRA_DOCS=(
+DOCS=(
"CHANGELOG.md"
- "CONTRIBUTING.md"
- "install.md"
"troubleshooting.md"
"docs/tutorials"
)
@@ -121,5 +119,4 @@ src_test() {
src_install() {
emake DESTDIR="${ED}" install install.completions
einstalldocs
- use doc && dodoc -r "${EXTRA_DOCS[@]}"
}
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index ad65c6a09cc9..ffaf289c2477 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -10,8 +10,10 @@ AUX seccomp-toggle-4.7.0.patch 400 BLAKE2B 9f02e58c06b507a294207c66bd5ea218f8780
DIST podman-4.8.3.tar.gz 21565162 BLAKE2B 13d2e5800dce96ba8c1671f251c2809dc0166198b807978d44b6f10b4dd2095e909678a12518fed84a0a1b5eee5a71e944170eb55350c3af945a63910f9c8082 SHA512 13ade866b888d32ada3b38130d7cc4677591136e25234e040b478c5d002d1b7907ed46731996d25cc41b992b98b75f109c6e6eea44251f4ad89162b20266976d
DIST podman-4.9.3.tar.gz 21727849 BLAKE2B 9a67ba4266a8a0e20d165ba2bae00dcf146724ee976838d5e3310b094155ffa89bff526e8ae72864dc100d1e6878d5519d53581dc7e034982a4f2b364e4c8feb SHA512 395014bbe70923f1444d2f33440013a16e9c339b70be5e6a9c7026617a40795a1c0e410c08a52fba46b9f5e853d853ce4133db36167a3c5ace7d325f8b3a3327
DIST podman-5.0.0_rc4.tar.gz 21846225 BLAKE2B c0e5a032af624401e1a61309194417a47144ccc5fa10ae827b80ff06b5034c78c4a01c5b44de587c357ef1aa1bbe848ee517edde1f90396bc675a35f4c9cf8e7 SHA512 034b411dfde2e3219b9bbdf5c966f474c9ed1a48a83793494abd0f74d164617f1321c2723384eb43827813faaf5737b378893c1555816badcbd1c81904349944
+DIST podman-5.0.0_rc5.tar.gz 21856941 BLAKE2B 7800ad4d928bcc19c223a4dc6a84c32b32f8655753a8a77cca57d78b351bac911c7cf72d5425242ad93d165b620b7060e852a9b8816196136767bc500b5881f9 SHA512 a3ccd6eb53d66297be30ec66efa0a5fa5f5050a647c6bc5cdb2fd4cd9dd5638c42328bf1429a2fa3f8dcc84bb7d1ffbdd9c6bf06862993277f5b60d740d91c1b
EBUILD podman-4.8.3.ebuild 3718 BLAKE2B 690714bcd5e6aa7be22d459dafdf20ae68dd6311fe0b012575a80eb325d4c4192f113b188d1e4830c3729f922a5fac88095f5062f41157e4bb089d8f8d7782bf SHA512 abcaf64a18f3ecac66b97a231d4a8da42b6e394a65a08635956d72cb56433b201d2d0981f216d5c1b9a7136657087db6a637ed39648338766ba6a33a01a10ae5
EBUILD podman-4.9.3.ebuild 3756 BLAKE2B f2c229912414392e1953a4108c91fc5d784e9c5e8bde4d467e087fc6170bba019c7e0a0f6cbdb3b783e73ec1a905ba6a9fdc010d2eef5554f487926eb044e392 SHA512 2a59e5d889bed3d75a694bd506bbf1e71d435372b462eb86bd2bcca0aa7639db24413612367dde22477b00bd18be436b8a0b7a80f7fd674ad63dee0c493f9c89
EBUILD podman-5.0.0_rc4.ebuild 4070 BLAKE2B d5cc059572da8c81210a080a354ed6062c1f18f7d56cb801e5e36f31619255ddb98ca60d1bc339f8f5dec812f8e8cc62b16814cedbbf03175a980dd559018d2f SHA512 15297bc7cf0eac927edf0360a0a9f6ba8f5122e37f77529bacbcb3a756085c9473e3e1b3706000322e8d1a722ac417fcedd9e2028940105e543e6e5d640e7a19
+EBUILD podman-5.0.0_rc5.ebuild 4070 BLAKE2B d5cc059572da8c81210a080a354ed6062c1f18f7d56cb801e5e36f31619255ddb98ca60d1bc339f8f5dec812f8e8cc62b16814cedbbf03175a980dd559018d2f SHA512 15297bc7cf0eac927edf0360a0a9f6ba8f5122e37f77529bacbcb3a756085c9473e3e1b3706000322e8d1a722ac417fcedd9e2028940105e543e6e5d640e7a19
EBUILD podman-9999.ebuild 4070 BLAKE2B d5cc059572da8c81210a080a354ed6062c1f18f7d56cb801e5e36f31619255ddb98ca60d1bc339f8f5dec812f8e8cc62b16814cedbbf03175a980dd559018d2f SHA512 15297bc7cf0eac927edf0360a0a9f6ba8f5122e37f77529bacbcb3a756085c9473e3e1b3706000322e8d1a722ac417fcedd9e2028940105e543e6e5d640e7a19
MISC metadata.xml 1843 BLAKE2B dae8b9b2065a2f777d2f32d7c8fd0761f31bb214f93bc6a74f6140fee067d9d7719d596c6295f83c875784fd10704571afa7ff5e1e129a8f2bfedd28fc6199ba SHA512 9dbb4d82150997521fc8d1793a6db8080cb0a924c3390bc58347e52accd4dc8c5e07283aad037cbc1b22d8009971edfd8816d09cf47404bae15b45bd518cb0ca
diff --git a/app-containers/podman/podman-5.0.0_rc5.ebuild b/app-containers/podman/podman-5.0.0_rc5.ebuild
new file mode 100644
index 000000000000..031861e35e9e
--- /dev/null
+++ b/app-containers/podman/podman-5.0.0_rc5.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module tmpfiles linux-info
+
+DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
+HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/containers/podman.git"
+else
+ SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${P/_rc/-rc}"
+ if [[ ${PV} != *rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~riscv"
+ fi
+fi
+
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="apparmor btrfs cgroup-hybrid cron wrapper +fuse +init +rootless +seccomp selinux systemd"
+RESTRICT="test"
+
+RDEPEND="
+ app-crypt/gpgme:=
+ >=app-containers/conmon-2.0.0
+ >=app-containers/containers-common-0.56.0
+ dev-libs/libassuan:=
+ dev-libs/libgpg-error:=
+ sys-apps/shadow:=
+
+ apparmor? ( sys-libs/libapparmor )
+ btrfs? ( sys-fs/btrfs-progs )
+ cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 )
+ !cgroup-hybrid? ( app-containers/crun )
+ cron? ( virtual/cron )
+ wrapper? ( !app-containers/docker-cli )
+ fuse? ( sys-fs/fuse-overlayfs )
+ init? ( app-containers/catatonit )
+ rootless? ( app-containers/slirp4netns )
+ seccomp? ( sys-libs/libseccomp:= )
+ selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
+ systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-go/go-md2man
+"
+
+PATCHES=(
+ "${FILESDIR}/seccomp-toggle-4.7.0.patch"
+)
+
+CONFIG_CHECK="
+ ~USER_NS
+"
+
+pkg_setup() {
+ use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # assure necessary files are present
+ local file
+ for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
+ [[ -f hack/"${file}".sh ]] || die
+ done
+
+ local feature
+ for feature in apparmor systemd; do
+ cat <<-EOF > hack/"${feature}"_tag.sh || die
+ #!/usr/bin/env bash
+ $(usex ${feature} "echo ${feature}" echo)
+ EOF
+ done
+
+ echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || die
+ cat <<-EOF > hack/btrfs_tag.sh || die
+ #!/usr/bin/env bash
+ $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
+ EOF
+}
+
+src_compile() {
+ export PREFIX="${EPREFIX}/usr"
+
+ # bug 906073
+ use elibc_musl && export CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
+
+ # For non-live versions, prevent git operations which causes sandbox violations
+ # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
+ [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
+
+ # BUILD_SECCOMP is used in the patch to toggle seccomp
+ emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" all $(usev wrapper docker-docs)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full)
+
+ insinto /etc/cni/net.d
+ doins cni/87-podman-bridge.conflist
+
+ newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
+ newinitd "${FILESDIR}"/podman-5.0.0_rc4.initd podman
+
+ newinitd "${FILESDIR}"/podman-restart-5.0.0_rc4.initd podman-restart
+ newconfd "${FILESDIR}"/podman-restart-5.0.0_rc4.confd podman-restart
+
+ use cron && \
+ { exeinto /etc/cron.daily && newexe "${FILESDIR}"/podman-auto-update-5.0.0_rc4.cron podman-auto-update; }
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/podman.logrotated" podman
+
+ keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+ PODMAN_ROOTLESS_UPGRADE=false
+ if use rootless; then
+ has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
+ fi
+}
+
+pkg_postinst() {
+ tmpfiles_process podman.conf $(usev wrapper podman-docker.conf)
+
+ local want_newline=false
+ if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
+ ${want_newline} && elog ""
+ elog "For rootless operation, you need to configure subuid/subgid"
+ elog "for user running podman. In case subuid/subgid has only been"
+ elog "configured for root, run:"
+ elog "usermod --add-subuids 1065536-1131071 <user>"
+ elog "usermod --add-subgids 1065536-1131071 <user>"
+ want_newline=true
+ fi
+}