gentoo auto-resync : 31:10:2023 - 03:47:04

4 files changed, 136 insertions, 54 deletions

diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index 3ea8a3fcc0a8..2bf0c625337e 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -1,10 +1,10 @@
-DIST buildah-1.29.1.tar.gz 15594930 BLAKE2B 71b87352062b3a5df67389897fd0d82c2491c48cffbda808b30e2767a1e290eccfd726be26dbd57fd8d08cfacb74f313058179c40600225d863a9340b772df1e SHA512 ea78aacee9b5cc10e299789d739e7086579e67719ab72b84f6ea5acbaf31d443284387ac92e7c5c1c3da9bd6523f43e2d9c7e2ea5698c251cb5458a384f41b04
 DIST buildah-1.30.0.tar.gz 15623786 BLAKE2B e0b2f6d26827cfe40f88a9915f12b6acb385fbd576fa227d4fee02c162077e9c6fe0591c7171405f5645cd06e4068f26e17c2cb963898e38cfbdd61abe68dae2 SHA512 185fd98a59fa8d86fe9f1eadc9b7591e5053674464be10538a7581d8e1f6a25e5032a354c821c32a167e2864acea010243efbbe4f5a4205d8eaa2894f062a25b
 DIST buildah-1.32.0.tar.gz 18445843 BLAKE2B d7471e3f0733bc626f665c592701666ba41732eb53bf4679da7e9e28dad388532ab8c88e86db553790ced7822168fd6388dc08121e1456404f18a5d96017da60 SHA512 7c61141e43ea2f968a50b4c5ae6b69c2b9734a19774c7ca48bc942b900ca55ec381ac93fdf04f08061640a457551a9e03a45a37d22cb94b34cecded192dced8f
 DIST buildah-1.32.1.tar.gz 18452695 BLAKE2B b4f3644a046d0dd96555b810e488ea78dc396692e539978856fbc2b22010bce3ed9f578949e8de02579325fa59e00fba59908724952b8c323889c816ae4f1af6 SHA512 e5c59f158b786809c89465361a662211bbef6bb4c27c79490604923d924c2030398a0878b122b246b02ae246bd977b7ccffdc6de4f06e80f096c2921c34bf04a
-EBUILD buildah-1.29.1.ebuild 1194 BLAKE2B 585ad9104367142c5e3ade8d9418c23cafd752be0c000ca4079ac912d2f42b462e2ffba14c422362fee09146b73eacb409ad942cdba54751a21a31ed3e54ab89 SHA512 1ee657db211bfe245dd94fdb297d2f09bc03a70a35a460b3dabe77f0aa098bf9e5597387d2ff7125515e4610979f7587b7634c8d0f776c9ec25d676c4332e6a8
+DIST buildah-1.32.2.tar.gz 18451694 BLAKE2B 885b940e804394d18451e5dce3e3af4097a8adf01e59d7a288dda7063a888759abd9a5c18d8f4522709c7d296fc9a2b5d61229143f3545a786dc59ac837214e2 SHA512 3a50e53e047aa0e23643d8751af1fb51a83fd51e5440111432eb34bdb07e95f24676a917b54409c223df444fe123c8df4aa9af435737cfdd02d0eda0d3f5bba1
 EBUILD buildah-1.30.0.ebuild 1196 BLAKE2B eefce023ce7e2662b1598fb3f6d5b885816d54a6397a788e10851b7ccc174ae6d9e4fa4ec387d3a21a7fdff4670ee68bfb59e9171e76032c3c28882d164cc446 SHA512 3c139484015e3e85c8f891babb375c560c3fc3e1827a44862eb262f95b8654a2c8d2a3c4102d3081c3a3677f20c0c5371a6579e9c0e1adfa339e5198475c357b
 EBUILD buildah-1.32.0.ebuild 1958 BLAKE2B 20b9c0182b44e0a96891dc95f3ecb36a1a0bfc217c41eac2d8e613e35d54533ee3aa3bfc6314998350d5460f3a924282fab0b537dcc1fa3c9bef43be3a687819 SHA512 26cb4c1a9545c53a4c29021f672d844dd4ca6861aa0fc25b57b128798b2d19b72739ba77c6cc13c89a63f9089a7e56833dfb407e28de44b4cd0b19b9e70f4bdf
 EBUILD buildah-1.32.1.ebuild 2734 BLAKE2B 4b6d0c38e38efeb505f56e3e4b59a770d1d068d01021aa27b4b968d857ae18e8f052dd28e8369cd2d44f5e1e1c5f7256f554aec723ae322152b46bac9a950169 SHA512 0480b51867415728f852e3f3714f037361f54d1a98ebd5be60d2d69b0ba652aee63538ec648f833679394f96c3e02cdcf914b77e094e2773e7cd18f3eed1658a
-EBUILD buildah-9999.ebuild 2644 BLAKE2B 01da3ffcabeb85bb21ed6289010f9f71a26f6210baf95e6b6e6798fb1e73dd0b44e09ba0114ee2d067c93625ed0a5758914e41ec0c044583a0939e98a7bd9f9e SHA512 e3dacf5eb4f657401dd1f33b11373cfa8e9c45569b54b355ee696418d48588b725eff17af9915677289f4a528ae74134b1a9c6439bffb53115ab3309adcb233e
+EBUILD buildah-1.32.2.ebuild 2918 BLAKE2B 89f20f481c3f35b29175f7544214be1259d36ddeb4096a7e89418d5d0d40d48435c26caa146cd07ce1e47d9da3c86b5e9ddc52fec2e0bab7936f222e065f4cc1 SHA512 099c0c6bee12574558f630f98a94e482cdea04310d6bd6bfea82e470efcb9e000146d57620965b1ae580d4766e1f34b8f9946edbd1903e28b82a6d0f748c3f80
+EBUILD buildah-9999.ebuild 2918 BLAKE2B 89f20f481c3f35b29175f7544214be1259d36ddeb4096a7e89418d5d0d40d48435c26caa146cd07ce1e47d9da3c86b5e9ddc52fec2e0bab7936f222e065f4cc1 SHA512 099c0c6bee12574558f630f98a94e482cdea04310d6bd6bfea82e470efcb9e000146d57620965b1ae580d4766e1f34b8f9946edbd1903e28b82a6d0f748c3f80
 MISC metadata.xml 721 BLAKE2B 3ad3d8a1726282f73f0fdae72e1f970dfbfbc9fcbde5f589fb7285273312682af51ea04e49c70ccf83434640e9acd68ca8d1352ea28a41ce67134d4d8c5de304 SHA512 0a88ddaee2b20b157e2ab5a584a2f265f45aab2807e10dfc46a79cf1573cf7e2db56611dad8de425650d042606dc7ddfa52e758b08b710199c72986aa93e9dbd
diff --git a/app-containers/buildah/buildah-1.29.1.ebuild b/app-containers/buildah/buildah-1.29.1.ebuild
deleted file mode 100644
index ce017d99dc04..000000000000
--- a/app-containers/buildah/buildah-1.29.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-GIT_COMMIT=faf0d4fc
-
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-IUSE="selinux"
-
-RDEPEND="app-crypt/gpgme:=
-	app-containers/skopeo
-	dev-libs/libgpg-error:=
-	dev-libs/libassuan:=
-	sys-apps/shadow:=
-	sys-fs/lvm2:=
-	sys-libs/libseccomp:=
-	selinux? ( sys-libs/libselinux:= )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	[[ -f selinux_tag.sh ]] || die
-	use selinux || { echo -e "#!/bin/sh\ntrue" > \
-		selinux_tag.sh || die; }
-	sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed'
-}
-
-src_compile() {
-	emake GIT_COMMIT=${GIT_COMMIT} all
-}
-
-src_install() {
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
-	doman docs/*.1
-	dodoc -r docs/tutorials
-	dobin bin/{${PN},imgtype}
-	dobashcomp contrib/completions/bash/buildah
-}
-
-src_test() {
-	emake test-unit
-}
diff --git a/app-containers/buildah/buildah-1.32.2.ebuild b/app-containers/buildah/buildah-1.32.2.ebuild
new file mode 100644
index 000000000000..819e3535fea9
--- /dev/null
+++ b/app-containers/buildah/buildah-1.32.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2023 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 doc test"
+RESTRICT="test"
+EXTRA_DOCS=(
+	"CHANGELOG.md"
+	"CONTRIBUTING.md"
+	"install.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|${EPREFIX}/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="${D}" install install.completions
+	einstalldocs
+	use doc && dodoc -r "${EXTRA_DOCS[@]}"
+}
diff --git a/app-containers/buildah/buildah-9999.ebuild b/app-containers/buildah/buildah-9999.ebuild
index 4c03a24b3508..819e3535fea9 100644
--- a/app-containers/buildah/buildah-9999.ebuild
+++ b/app-containers/buildah/buildah-9999.ebuild
@@ -36,6 +36,7 @@ RDEPEND="
 	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:=
@@ -104,6 +105,14 @@ src_prepare() {
 
 }
 
+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
 }