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 888D51581C1 for ; Mon, 8 Jul 2024 14:22:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5B49E2B37; Mon, 8 Jul 2024 14:22:15 +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 87A3FE2B37 for ; Mon, 8 Jul 2024 14:22:15 +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 8E992342F9C for ; Mon, 8 Jul 2024 14:22:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ED6251D23 for ; Mon, 8 Jul 2024 14:22:12 +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: <1720448466.15c3a11ddcf78c4d9c17518378f5a4cced8ea16a.concord@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/selinux-python/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/selinux-python/selinux-python-3.5.ebuild sys-apps/selinux-python/selinux-python-3.6.ebuild sys-apps/selinux-python/selinux-python-3.7.ebuild sys-apps/selinux-python/selinux-python-9999.ebuild X-VCS-Directories: sys-apps/selinux-python/ X-VCS-Committer: concord X-VCS-Committer-Name: Kenton Groombridge X-VCS-Revision: 15c3a11ddcf78c4d9c17518378f5a4cced8ea16a X-VCS-Branch: master Date: Mon, 8 Jul 2024 14:22:12 +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: 49e9d452-4301-464d-a8c7-3734d03219da X-Archives-Hash: 393b9320210765d63362c178e7470fb0 commit: 15c3a11ddcf78c4d9c17518378f5a4cced8ea16a Author: Kenton Groombridge gentoo org> AuthorDate: Mon Jul 8 14:18:13 2024 +0000 Commit: Kenton Groombridge gentoo org> CommitDate: Mon Jul 8 14:21:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c3a11d sys-apps/selinux-python: fix sepolgen.conf install sepolgen.conf will fail to install if /etc/selinux/config has not been created yet. Reorder the creation of the /etc/selinux directory during the install phase so that if this happens, sepolgen.conf can be installed correctly. Closes: https://bugs.gentoo.org/935158 Signed-off-by: Kenton Groombridge gentoo.org> sys-apps/selinux-python/selinux-python-3.5.ebuild | 4 ++-- sys-apps/selinux-python/selinux-python-3.6.ebuild | 2 +- sys-apps/selinux-python/selinux-python-3.7.ebuild | 2 +- sys-apps/selinux-python/selinux-python-9999.ebuild | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys-apps/selinux-python/selinux-python-3.5.ebuild b/sys-apps/selinux-python/selinux-python-3.5.ebuild index 6a2211786b3f..5f77597217cc 100644 --- a/sys-apps/selinux-python/selinux-python-3.5.ebuild +++ b/sys-apps/selinux-python/selinux-python-3.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -97,10 +97,10 @@ src_install() { done # Create sepolgen.conf with different devel location definition + mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; if [[ -f /etc/selinux/config ]]; then local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; else local selinuxtype="${POLICY_TYPES%% *}"; diff --git a/sys-apps/selinux-python/selinux-python-3.6.ebuild b/sys-apps/selinux-python/selinux-python-3.6.ebuild index 778fb2919d09..402e855158f6 100644 --- a/sys-apps/selinux-python/selinux-python-3.6.ebuild +++ b/sys-apps/selinux-python/selinux-python-3.6.ebuild @@ -97,10 +97,10 @@ src_install() { done # Create sepolgen.conf with different devel location definition + mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; if [[ -f /etc/selinux/config ]]; then local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf; else local selinuxtype="${POLICY_TYPES%% *}"; diff --git a/sys-apps/selinux-python/selinux-python-3.7.ebuild b/sys-apps/selinux-python/selinux-python-3.7.ebuild index f772119ca1ee..25b1f079539b 100644 --- a/sys-apps/selinux-python/selinux-python-3.7.ebuild +++ b/sys-apps/selinux-python/selinux-python-3.7.ebuild @@ -97,10 +97,10 @@ src_install() { done # Create sepolgen.conf with different devel location definition + mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; if [[ -f /etc/selinux/config ]]; then local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" \ > "${D}"/etc/selinux/sepolgen.conf || die "Failed to generate sepolgen" else diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild index f772119ca1ee..25b1f079539b 100644 --- a/sys-apps/selinux-python/selinux-python-9999.ebuild +++ b/sys-apps/selinux-python/selinux-python-9999.ebuild @@ -97,10 +97,10 @@ src_install() { done # Create sepolgen.conf with different devel location definition + mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; if [[ -f /etc/selinux/config ]]; then local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config); - mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory"; echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" \ > "${D}"/etc/selinux/sepolgen.conf || die "Failed to generate sepolgen" else