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 D5BCF15800A for ; Thu, 27 Jul 2023 11:20:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27276E0974; Thu, 27 Jul 2023 11:20:32 +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 B27C5E0974 for ; Thu, 27 Jul 2023 11:20:31 +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 A126134146D for ; Thu, 27 Jul 2023 11:20:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 094C5DC7 for ; Thu, 27 Jul 2023 11:20:29 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1690456796.bc998119149241591a70151a55785a8a3a12f893.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libselinux/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libselinux/libselinux-3.5-r1.ebuild sys-libs/libselinux/libselinux-3.5.ebuild X-VCS-Directories: sys-libs/libselinux/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bc998119149241591a70151a55785a8a3a12f893 X-VCS-Branch: master Date: Thu, 27 Jul 2023 11:20:29 +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: fc7eb9e0-4b75-4c09-9c45-1582aa4f53a2 X-Archives-Hash: b32b09e2226936fe846c9f33345f5201 commit: bc998119149241591a70151a55785a8a3a12f893 Author: Mathieu Tortuyaux microsoft com> AuthorDate: Wed Jul 26 09:01:10 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jul 27 11:19:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc998119 sys-libs/libselinux: use ROOT variable in pkg_postinst Signed-off-by: Mathieu Tortuyaux microsoft.com> Closes: https://github.com/gentoo/gentoo/pull/32046 Signed-off-by: Sam James gentoo.org> .../{libselinux-3.5.ebuild => libselinux-3.5-r1.ebuild} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-libs/libselinux/libselinux-3.5.ebuild b/sys-libs/libselinux/libselinux-3.5-r1.ebuild similarity index 92% rename from sys-libs/libselinux/libselinux-3.5.ebuild rename to sys-libs/libselinux/libselinux-3.5-r1.ebuild index 67b2797a221c..1ed1db1ec9f2 100644 --- a/sys-libs/libselinux/libselinux-3.5.ebuild +++ b/sys-libs/libselinux/libselinux-3.5-r1.ebuild @@ -145,12 +145,12 @@ pkg_postinst() { # Fix bug 473502 for POLTYPE in ${POLICY_TYPES}; do - mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die - touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die + mkdir -p "${ROOT}/etc/selinux/${POLTYPE}/contexts/files" || die + touch "${ROOT}/etc/selinux/${POLTYPE}/contexts/files/file_contexts.local" || die # Fix bug 516608 for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do - if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then - sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \ + if [[ -f "${ROOT}/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then + sefcontext_compile "${ROOT}/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" \ || die "Failed to recompile contexts" fi done