From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0E922158042 for ; Thu, 24 Oct 2024 19:53:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5375E088F; Thu, 24 Oct 2024 19:53:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B861BE088F for ; Thu, 24 Oct 2024 19:53:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B778E343085 for ; Thu, 24 Oct 2024 19:53:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E1609AE7 for ; Thu, 24 Oct 2024 19:53:03 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1729799488.932b12cd4319a206933e1f548d0913ecbc1e8b91.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/podman/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/podman/podman-4.9.4.ebuild app-containers/podman/podman-5.0.2.ebuild app-containers/podman/podman-5.0.3.ebuild app-containers/podman/podman-5.1.1.ebuild app-containers/podman/podman-5.2.4.ebuild app-containers/podman/podman-9999.ebuild X-VCS-Directories: app-containers/podman/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 932b12cd4319a206933e1f548d0913ecbc1e8b91 X-VCS-Branch: master Date: Thu, 24 Oct 2024 19:53:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 147ba123-bde3-48ab-803f-44e29f292efc X-Archives-Hash: 287fc6b3c32c351b908113d6b5f366d9 commit: 932b12cd4319a206933e1f548d0913ecbc1e8b91 Author: Kenton Groombridge gentoo org> AuthorDate: Thu Oct 24 15:11:00 2024 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Oct 24 19:51:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=932b12cd app-containers/podman: fix SELinux relabeling The Makefile relabels the podman executable during installation and defaults to using container_runtime_exec_t which does not exist in Gentoo's SELinux policies. Disable the automatic relabeling during install and let portage take care of it to avoid this error. Closes: https://bugs.gentoo.org/927966 Signed-off-by: Kenton Groombridge gentoo.org> From: https://github.com/gentoo/gentoo/pull/39098 Signed-off-by: Zac Medico gentoo.org> app-containers/podman/podman-4.9.4.ebuild | 2 +- app-containers/podman/podman-5.0.2.ebuild | 4 ++-- app-containers/podman/podman-5.0.3.ebuild | 4 ++-- app-containers/podman/podman-5.1.1.ebuild | 4 ++-- app-containers/podman/podman-5.2.4.ebuild | 4 ++-- app-containers/podman/podman-9999.ebuild | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app-containers/podman/podman-4.9.4.ebuild b/app-containers/podman/podman-4.9.4.ebuild index ea2bd34e2507..f47814bad560 100644 --- a/app-containers/podman/podman-4.9.4.ebuild +++ b/app-containers/podman/podman-4.9.4.ebuild @@ -114,7 +114,7 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full) + emake DESTDIR="${D}" SELINUXOPT= install install.completions $(usev wrapper install.docker-full) insinto /etc/cni/net.d doins cni/87-podman-bridge.conflist diff --git a/app-containers/podman/podman-5.0.2.ebuild b/app-containers/podman/podman-5.0.2.ebuild index 738613b007dc..4ac692ff576c 100644 --- a/app-containers/podman/podman-5.0.2.ebuild +++ b/app-containers/podman/podman-5.0.2.ebuild @@ -102,12 +102,12 @@ src_compile() { fi # BUILD_SECCOMP is used in the patch to toggle seccomp - emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" \ + emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" SELINUXOPT= \ all $(usev wrapper docker-docs) } src_install() { - emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full) + emake DESTDIR="${D}" SELINUXOPT= install install.completions $(usev wrapper install.docker-full) if use !systemd; then newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman diff --git a/app-containers/podman/podman-5.0.3.ebuild b/app-containers/podman/podman-5.0.3.ebuild index 738613b007dc..4ac692ff576c 100644 --- a/app-containers/podman/podman-5.0.3.ebuild +++ b/app-containers/podman/podman-5.0.3.ebuild @@ -102,12 +102,12 @@ src_compile() { fi # BUILD_SECCOMP is used in the patch to toggle seccomp - emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" \ + emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" SELINUXOPT= \ all $(usev wrapper docker-docs) } src_install() { - emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full) + emake DESTDIR="${D}" SELINUXOPT= install install.completions $(usev wrapper install.docker-full) if use !systemd; then newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman diff --git a/app-containers/podman/podman-5.1.1.ebuild b/app-containers/podman/podman-5.1.1.ebuild index fd1d527b4b94..1deb45b19629 100644 --- a/app-containers/podman/podman-5.1.1.ebuild +++ b/app-containers/podman/podman-5.1.1.ebuild @@ -114,12 +114,12 @@ src_compile() { tc-export PKG_CONFIG fi - emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" EXTRA_BUILDTAGS="$(usev seccomp)" \ + emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" EXTRA_BUILDTAGS="$(usev seccomp)" SELINUXOPT= \ all $(usev wrapper docker-docs) } src_install() { - emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full) + emake DESTDIR="${D}" SELINUXOPT= install install.completions $(usev wrapper install.docker-full) if use !systemd; then newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman diff --git a/app-containers/podman/podman-5.2.4.ebuild b/app-containers/podman/podman-5.2.4.ebuild index d467fd8b499a..91caafc19598 100644 --- a/app-containers/podman/podman-5.2.4.ebuild +++ b/app-containers/podman/podman-5.2.4.ebuild @@ -114,12 +114,12 @@ src_compile() { tc-export PKG_CONFIG fi - emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" EXTRA_BUILDTAGS="$(usev seccomp)" \ + emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" EXTRA_BUILDTAGS="$(usev seccomp)" SELINUXOPT= \ all $(usev wrapper docker-docs) } src_install() { - emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full) + emake DESTDIR="${D}" SELINUXOPT= install install.completions $(usev wrapper install.docker-full) if use !systemd; then newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman diff --git a/app-containers/podman/podman-9999.ebuild b/app-containers/podman/podman-9999.ebuild index fd1d527b4b94..1deb45b19629 100644 --- a/app-containers/podman/podman-9999.ebuild +++ b/app-containers/podman/podman-9999.ebuild @@ -114,12 +114,12 @@ src_compile() { tc-export PKG_CONFIG fi - emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" EXTRA_BUILDTAGS="$(usev seccomp)" \ + emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" EXTRA_BUILDTAGS="$(usev seccomp)" SELINUXOPT= \ all $(usev wrapper docker-docs) } src_install() { - emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full) + emake DESTDIR="${D}" SELINUXOPT= install install.completions $(usev wrapper install.docker-full) if use !systemd; then newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman