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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 539B4158094 for ; Mon, 19 Sep 2022 17:21:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8232E0827; Mon, 19 Sep 2022 17:21:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 BBCA4E0827 for ; Mon, 19 Sep 2022 17:21:50 +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 CC5A4340D35 for ; Mon, 19 Sep 2022 17:21:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 207115C0 for ; Mon, 19 Sep 2022 17:21:48 +0000 (UTC) From: "Kenton Groombridge" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kenton Groombridge" Message-ID: <1663608059.942fc9d97da6e465797296154b66e86687f30f51.concord@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/policycoreutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/policycoreutils/policycoreutils-3.3.ebuild sys-apps/policycoreutils/policycoreutils-3.4.ebuild sys-apps/policycoreutils/policycoreutils-9999.ebuild X-VCS-Directories: sys-apps/policycoreutils/ X-VCS-Committer: concord X-VCS-Committer-Name: Kenton Groombridge X-VCS-Revision: 942fc9d97da6e465797296154b66e86687f30f51 X-VCS-Branch: master Date: Mon, 19 Sep 2022 17:21:48 +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: c7a943e2-c886-4d46-a737-4e8a5084e26d X-Archives-Hash: 28fef1fb9cd5ac4b11743de62c19074f commit: 942fc9d97da6e465797296154b66e86687f30f51 Author: Kenton Groombridge gentoo org> AuthorDate: Mon Sep 19 17:14:48 2022 +0000 Commit: Kenton Groombridge gentoo org> CommitDate: Mon Sep 19 17:20:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=942fc9d9 sys-apps/policycoreutils: fix install on merged-usr Upstream sestatus Makefile installs a compatibility symlink for the sestatus binary. Remove this symlink when USE=merged-usr to fix an internal file collision. Closes: https://bugs.gentoo.org/871501 Signed-off-by: Kenton Groombridge gentoo.org> sys-apps/policycoreutils/policycoreutils-3.3.ebuild | 7 ++++++- sys-apps/policycoreutils/policycoreutils-3.4.ebuild | 7 ++++++- sys-apps/policycoreutils/policycoreutils-9999.ebuild | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/sys-apps/policycoreutils/policycoreutils-3.3.ebuild b/sys-apps/policycoreutils/policycoreutils-3.3.ebuild index fb97df7db201..2bcf57dff96c 100644 --- a/sys-apps/policycoreutils/policycoreutils-3.3.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-3.3.ebuild @@ -138,7 +138,12 @@ src_install() { rm -fR "${D}/etc/rc.d" || die # compatibility symlinks - use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles + if use split-usr; then + dosym ../../sbin/setfiles /usr/sbin/setfiles + else + # remove sestatus symlink + rm -f "${D}"/usr/sbin/sestatus || die + fi bashcomp_alias setsebool getsebool diff --git a/sys-apps/policycoreutils/policycoreutils-3.4.ebuild b/sys-apps/policycoreutils/policycoreutils-3.4.ebuild index eb49d7350f93..780a80e7b5c5 100644 --- a/sys-apps/policycoreutils/policycoreutils-3.4.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-3.4.ebuild @@ -139,7 +139,12 @@ src_install() { rm -fR "${D}/etc/rc.d" || die # compatibility symlinks - use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles + if use split-usr; then + dosym ../../sbin/setfiles /usr/sbin/setfiles + else + # remove sestatus symlink + rm -f "${D}"/usr/sbin/sestatus || die + fi bashcomp_alias setsebool getsebool diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild index 1ac0b78acdaf..add6d6f2b267 100644 --- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild @@ -139,7 +139,12 @@ src_install() { rm -fR "${D}/etc/rc.d" || die # compatibility symlinks - use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles + if use split-usr; then + dosym ../../sbin/setfiles /usr/sbin/setfiles + else + # remove sestatus symlink + rm -f "${D}"/usr/sbin/sestatus || die + fi bashcomp_alias setsebool getsebool