commit: d550925be8ae0c33c3aeacd447c94a9174573543 Author: Rahil Bhimjiani <rahil3108 <AT> gmail <DOT> com> AuthorDate: Wed Oct 4 20:58:04 2023 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Fri Oct 6 03:58:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d550925b
app-containers/podman: update live & 4.7.1 Cleanup SELinux tag related file as it is always enabled (https://github.com/containers/podman/commit/229734c10a3d07d18137f1e46ccdb02331c13fd2) Closes: https://github.com/gentoo/gentoo/pull/33196 Signed-off-by: Rahil Bhimjiani <rahil3108 <AT> gmail.com> Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> app-containers/podman/Manifest | 1 + app-containers/podman/{podman-9999.ebuild => podman-4.7.1.ebuild} | 6 ++++-- app-containers/podman/podman-9999.ebuild | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest index 027ecbfb28a0..2be1c3640e72 100644 --- a/app-containers/podman/Manifest +++ b/app-containers/podman/Manifest @@ -1,2 +1,3 @@ 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 diff --git a/app-containers/podman/podman-9999.ebuild b/app-containers/podman/podman-4.7.1.ebuild similarity index 96% copy from app-containers/podman/podman-9999.ebuild copy to app-containers/podman/podman-4.7.1.ebuild index 2c7ededf36fd..f10c9b0ec10a 100644 --- a/app-containers/podman/podman-9999.ebuild +++ b/app-containers/podman/podman-4.7.1.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) 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)
