gentoo auto-resync : 06:10:2023 - 05:56:26

3 files changed, 131 insertions, 3 deletions

diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index 415f25dc9419..b7dba291b6c5 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -4,8 +4,10 @@ AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690ca
 AUX seccomp-toggle-4.7.0.patch 400 BLAKE2B 9f02e58c06b507a294207c66bd5ea218f87803a9b9f0ddafc86a8b21df912589357adf054302e5a69d300155bdf8dcd8b77c18c1ddf8a4042ae1f05de5faf46d SHA512 e507e3a52d2f5f48b65fdb77ceaa095f13fda3e834dafc976bcd291cb35755da879c9c99b7950b2905399dedf4ac3370bd70462343648613a7c6aedc141d7ef7
 DIST podman-4.5.0.tar.gz 17423692 BLAKE2B ba28e77626bb4bcdb85b20031e12cf93f2eb3174b678cb8e99557df13e2cdf377ea402eb373a51ea44302f878f8e1cdedda14a2f3ad8c9e88895754fc50c272e SHA512 8a699dc01fc3d7c4a9e5ef4f166170303fc30e0f6695c61f763944e1cb755e75896108e0c4166d184fe49e3a6859f045aa3883047ebba9290e851fc128d77cac
 DIST podman-4.7.0.tar.gz 20554573 BLAKE2B a98e52ec9fe48d5b70489ed6bd6961877cf67735048425ad30fe9de3e163f8266d6510c37b0c43effa90cc8ce1b39bdc46c5add90dabd8f78c79602824f132a6 SHA512 4cab8698a819cd42de4cb588978c94c91b0c85693db2476aa6d20d7f4e4a7674d417703f70bdbb5a0e94b678fd585ae03a95ff0e5b7eb2682d9f400b92915742
+DIST podman-4.7.1.tar.gz 20557503 BLAKE2B f34cc0e2c9bd46d8f538c51b7353b36aea3380233f998467f26aeee6c35850bc26ca25234d39426ae7e4951fb40bc9cf1b8218b1db92fc95bb4ce0f221827dbf SHA512 cb89a687900bdc8ab9aec01d11c4e3062d8735122aa03639fa6eeecde10ea4bc3633381bce1e65955bf112d4fda330182f81d81054916b1eca8b7354c0f55c14
 EBUILD podman-4.5.0-r1.ebuild 4166 BLAKE2B 94f8f30f755c9fff8975bb3abb883e285587fde977c1f37917d3e6cefd0be27b8d1c88b595fd803ec19c70744aa532c2919b23b7b28700a0c8d4e071f514af63 SHA512 b85d481ba927771f769d93bce9928cb97031c14ba1a1a9e95f1eec07284291cd500d51b5f174bb6a03405909e06ce0491172e863e15420bea5fc39cfa05c871b
 EBUILD podman-4.5.0.ebuild 4939 BLAKE2B bf6c2708e30d5d505f7010befbbce321ee78fd525cbd16523b95dcabf744b2c0f9bc0d15dcd2547660b2791bc3ec6b5bbff188463a74e3df330961129985a133 SHA512 0980613932f7a549ccb324b8597250ca004d9ffc768e79a6a2d0f6fa28048e777b98efa91332d48ebd57c9c83e0c4a8c5d06fa988c3e64393e052c94af256dba
 EBUILD podman-4.7.0.ebuild 3285 BLAKE2B 0e1b423e0da222dd179256cb572cd470c28d9ae979993cef05bbb71e93dafc23a26634d3d58c8efe283590785ff92a062a2b6266668eac225ec31ab392cef7cd SHA512 f79dfa57bb252a34d178d10e66456364989b67ce16d24503143c3858483c0ea85b16d5f7dc30131e4d9fdd557cb14a841d158e3c9dc783df0e015bcd46001323
-EBUILD podman-9999.ebuild 3285 BLAKE2B 0e1b423e0da222dd179256cb572cd470c28d9ae979993cef05bbb71e93dafc23a26634d3d58c8efe283590785ff92a062a2b6266668eac225ec31ab392cef7cd SHA512 f79dfa57bb252a34d178d10e66456364989b67ce16d24503143c3858483c0ea85b16d5f7dc30131e4d9fdd557cb14a841d158e3c9dc783df0e015bcd46001323
+EBUILD podman-4.7.1.ebuild 3267 BLAKE2B fa4df1776c79e2b791b090384a5a8972a39f6e68f06ca8679b0cb1fcdf1b043f32b8135b24ae8e9eb5f03c830398a406a02225ed016e4e130c00d72285d6823d SHA512 22a56db38ff489eb9ec91515d4bf8d0da4c90f4e25f0f806dfac3c5b008cf913d0f7355f6d95e76bb628250f0c246363b22b8c716982584161291a56474e1698
+EBUILD podman-9999.ebuild 3267 BLAKE2B fa4df1776c79e2b791b090384a5a8972a39f6e68f06ca8679b0cb1fcdf1b043f32b8135b24ae8e9eb5f03c830398a406a02225ed016e4e130c00d72285d6823d SHA512 22a56db38ff489eb9ec91515d4bf8d0da4c90f4e25f0f806dfac3c5b008cf913d0f7355f6d95e76bb628250f0c246363b22b8c716982584161291a56474e1698
 MISC metadata.xml 1755 BLAKE2B fa4c8562a0a7de9352b555c1c268686cd2862a20dc6b34fbca9ab8c1e825c412a65728de731ad0e4eb848e0402fe7796b977c10b16ecc1ed3764f712c2103b97 SHA512 c068f54fa0c88fb46c7696921770abd3ea07c385d85eb3b78cd218e86b672da28d3a4afe76a707847adbcfc10cb08cb98de392cb2e2a62c2c020c0ae469eee71
diff --git a/app-containers/podman/podman-4.7.1.ebuild b/app-containers/podman/podman-4.7.1.ebuild
new file mode 100644
index 000000000000..f10c9b0ec10a
--- /dev/null
+++ b/app-containers/podman/podman-4.7.1.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 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}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="apparmor btrfs cgroup-hybrid 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 )
+	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
+	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"
+	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.confd podman
+	newinitd "${FILESDIR}"/podman.initd podman
+
+	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
+}
diff --git a/app-containers/podman/podman-9999.ebuild b/app-containers/podman/podman-9999.ebuild
index 2c7ededf36fd..f10c9b0ec10a 100644
--- a/app-containers/podman/podman-9999.ebuild
+++ b/app-containers/podman/podman-9999.ebuild
@@ -7,6 +7,7 @@ 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"
@@ -14,6 +15,7 @@ else
 	SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 fi
+
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 IUSE="apparmor btrfs cgroup-hybrid wrapper +fuse +init +rootless +seccomp selinux systemd"
@@ -60,12 +62,12 @@ pkg_setup() {
 src_prepare() {
 	default
 	local file
-	for file in apparmor_tag btrfs_installed_tag btrfs_tag selinux_tag systemd_tag; do
+	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 selinux systemd; do
+	for feature in apparmor systemd; do
 		cat <<-EOF > hack/"${feature}"_tag.sh || die
 		#!/usr/bin/env bash
 		$(usex ${feature} "echo ${feature}" echo)