mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-13 16:06:59 +02:00
sys-apps/policycoreutils: apply flatcar changes
* remove python dependencies * move selinux policy directory from /etc/selinux/policy to /usr/lib/selinux/policy * add tmpfiles to recreate /var/lib/selinux on rootfs * remove setools dependency Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
This commit is contained in:
parent
d78e4b3b20
commit
a38d44bd1c
@ -0,0 +1,2 @@
|
||||
#Type Path Mode UID GID Age Argument
|
||||
L /var/lib/selinux/ - - - - ../../usr/lib/selinux/policy
|
@ -5,7 +5,8 @@ EAPI="7"
|
||||
PYTHON_COMPAT=( python3_{9..11} )
|
||||
PYTHON_REQ_USE="xml(+)"
|
||||
|
||||
inherit multilib python-r1 toolchain-funcs bash-completion-r1
|
||||
TMPFILES_OPTIONAL=1
|
||||
inherit multilib python-r1 toolchain-funcs bash-completion-r1 tmpfiles
|
||||
|
||||
MY_PV="${PV//_/-}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
@ -35,14 +36,12 @@ SLOT="0"
|
||||
IUSE="audit pam split-usr"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
DEPEND=">=sys-libs/libselinux-${PV}:=[python,${PYTHON_USEDEP}]
|
||||
>=sys-libs/libsemanage-${PV}:=[python(+),${PYTHON_USEDEP}]
|
||||
DEPEND=">=sys-libs/libselinux-${PV}:=
|
||||
>=sys-libs/libsemanage-${PV}:=
|
||||
>=sys-libs/libsepol-${PV}:=
|
||||
sys-libs/libcap-ng:=
|
||||
>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
|
||||
audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
|
||||
pam? ( sys-libs/pam:= )
|
||||
${PYTHON_DEPS}"
|
||||
pam? ( sys-libs/pam:= )"
|
||||
|
||||
# Avoid dependency loop in the cross-compile case, bug #755173
|
||||
# (Still exists in native)
|
||||
@ -52,8 +51,7 @@ BDEPEND="sys-devel/gettext"
|
||||
RDEPEND="${DEPEND}
|
||||
app-misc/pax-utils"
|
||||
|
||||
PDEPEND="sys-apps/semodule-utils
|
||||
sys-apps/selinux-python"
|
||||
PDEPEND="sys-apps/semodule-utils"
|
||||
|
||||
src_unpack() {
|
||||
# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
|
||||
@ -80,14 +78,6 @@ src_prepare() {
|
||||
eapply_user
|
||||
|
||||
sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
|
||||
|
||||
python_copy_sources
|
||||
# Our extra code is outside the regular directory, so set it to the extra
|
||||
# directory. We really should optimize this as it is ugly, but the extra
|
||||
# code is needed for Gentoo at the same time that policycoreutils is present
|
||||
# (so we cannot use an additional package for now).
|
||||
S="${S2}"
|
||||
python_copy_sources
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
@ -100,10 +90,8 @@ src_compile() {
|
||||
CC="$(tc-getCC)" \
|
||||
LIBDIR="\$(PREFIX)/$(get_libdir)"
|
||||
}
|
||||
S="${S1}" # Regular policycoreutils
|
||||
python_foreach_impl building
|
||||
S="${S2}" # Extra set
|
||||
python_foreach_impl building
|
||||
BUILD_DIR="${S1}"
|
||||
building
|
||||
}
|
||||
|
||||
src_install() {
|
||||
@ -118,7 +106,6 @@ src_install() {
|
||||
CC="$(tc-getCC)" \
|
||||
LIBDIR="\$(PREFIX)/$(get_libdir)" \
|
||||
install
|
||||
python_optimize
|
||||
}
|
||||
|
||||
installation-extras() {
|
||||
@ -126,14 +113,11 @@ src_install() {
|
||||
emake -C "${BUILD_DIR}" \
|
||||
DESTDIR="${D}" \
|
||||
install
|
||||
python_optimize
|
||||
}
|
||||
|
||||
S="${S1}" # policycoreutils
|
||||
python_foreach_impl installation-policycoreutils
|
||||
S="${S2}" # extras
|
||||
python_foreach_impl installation-extras
|
||||
S="${S1}" # back for later
|
||||
BUILD_DIR="${S1}"
|
||||
installation-policycoreutils
|
||||
|
||||
|
||||
# remove redhat-style init script
|
||||
rm -fR "${D}/etc/rc.d" || die
|
||||
@ -148,14 +132,12 @@ src_install() {
|
||||
|
||||
bashcomp_alias setsebool getsebool
|
||||
|
||||
# location for policy definitions
|
||||
dodir /var/lib/selinux
|
||||
keepdir /var/lib/selinux
|
||||
dodir /usr/lib/selinux/policy
|
||||
dosym ../../usr/lib/selinux/policy /var/lib/selinux
|
||||
keepdir /usr/lib/selinux/policy
|
||||
|
||||
# Set version-specific scripts
|
||||
for pyscript in rlpkg; do
|
||||
python_replicate_script "${ED}/usr/sbin/${pyscript}"
|
||||
done
|
||||
# Recreate the symlink in /var in case of wiping the root filesystem.
|
||||
dotmpfiles "${FILESDIR}/tmpfiles.d/10-var-lib-selinux.conf"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
|
@ -1,168 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
PYTHON_COMPAT=( python3_{9..11} )
|
||||
PYTHON_REQ_USE="xml(+)"
|
||||
|
||||
inherit multilib python-r1 toolchain-funcs bash-completion-r1
|
||||
|
||||
MY_PV="${PV//_/-}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
EXTRAS_VER="1.37"
|
||||
|
||||
DESCRIPTION="SELinux core utilities"
|
||||
HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
|
||||
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
|
||||
SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
|
||||
S1="${WORKDIR}/${P}/${PN}"
|
||||
S2="${WORKDIR}/policycoreutils-extra"
|
||||
S="${S1}"
|
||||
else
|
||||
SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz
|
||||
https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
|
||||
S1="${WORKDIR}/${MY_P}"
|
||||
S2="${WORKDIR}/policycoreutils-extra"
|
||||
S="${S1}"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="audit pam split-usr"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
DEPEND=">=sys-libs/libselinux-${PV}:=[python,${PYTHON_USEDEP}]
|
||||
>=sys-libs/libsemanage-${PV}:=[python(+),${PYTHON_USEDEP}]
|
||||
>=sys-libs/libsepol-${PV}:=
|
||||
sys-libs/libcap-ng:=
|
||||
>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
|
||||
audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
|
||||
pam? ( sys-libs/pam:= )
|
||||
${PYTHON_DEPS}"
|
||||
|
||||
# Avoid dependency loop in the cross-compile case, bug #755173
|
||||
# (Still exists in native)
|
||||
BDEPEND="sys-devel/gettext"
|
||||
|
||||
# pax-utils for scanelf used by rlpkg
|
||||
RDEPEND="${DEPEND}
|
||||
app-misc/pax-utils"
|
||||
|
||||
PDEPEND="sys-apps/semodule-utils
|
||||
sys-apps/selinux-python"
|
||||
|
||||
src_unpack() {
|
||||
# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
|
||||
default
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
git-r3_src_unpack
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
S="${S1}"
|
||||
cd "${S}" || die "Failed to switch to ${S}"
|
||||
if [[ ${PV} != 9999 ]] ; then
|
||||
# If needed for live ebuilds please use /etc/portage/patches
|
||||
eapply "${FILESDIR}/policycoreutils-3.1-0001-newrole-not-suid.patch"
|
||||
fi
|
||||
|
||||
# rlpkg is more useful than fixfiles
|
||||
sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
|
||||
|| die "fixfiles sed 1 failed"
|
||||
sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
|
||||
|| die "fixfiles sed 2 failed"
|
||||
|
||||
eapply_user
|
||||
|
||||
sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
|
||||
|
||||
python_copy_sources
|
||||
# Our extra code is outside the regular directory, so set it to the extra
|
||||
# directory. We really should optimize this as it is ugly, but the extra
|
||||
# code is needed for Gentoo at the same time that policycoreutils is present
|
||||
# (so we cannot use an additional package for now).
|
||||
S="${S2}"
|
||||
python_copy_sources
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
building() {
|
||||
emake -C "${BUILD_DIR}" \
|
||||
AUDIT_LOG_PRIVS="y" \
|
||||
AUDITH="$(usex audit y n)" \
|
||||
PAMH="$(usex pam y n)" \
|
||||
SESANDBOX="n" \
|
||||
CC="$(tc-getCC)" \
|
||||
LIBDIR="\$(PREFIX)/$(get_libdir)"
|
||||
}
|
||||
S="${S1}" # Regular policycoreutils
|
||||
python_foreach_impl building
|
||||
S="${S2}" # Extra set
|
||||
python_foreach_impl building
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Python scripts are present in many places. There are no extension modules.
|
||||
installation-policycoreutils() {
|
||||
einfo "Installing policycoreutils"
|
||||
emake -C "${BUILD_DIR}" DESTDIR="${D}" \
|
||||
AUDIT_LOG_PRIVS="y" \
|
||||
AUDITH="$(usex audit y n)" \
|
||||
PAMH="$(usex pam y n)" \
|
||||
SESANDBOX="n" \
|
||||
CC="$(tc-getCC)" \
|
||||
LIBDIR="\$(PREFIX)/$(get_libdir)" \
|
||||
install
|
||||
python_optimize
|
||||
}
|
||||
|
||||
installation-extras() {
|
||||
einfo "Installing policycoreutils-extra"
|
||||
emake -C "${BUILD_DIR}" \
|
||||
DESTDIR="${D}" \
|
||||
install
|
||||
python_optimize
|
||||
}
|
||||
|
||||
S="${S1}" # policycoreutils
|
||||
python_foreach_impl installation-policycoreutils
|
||||
S="${S2}" # extras
|
||||
python_foreach_impl installation-extras
|
||||
S="${S1}" # back for later
|
||||
|
||||
# remove redhat-style init script
|
||||
rm -fR "${D}/etc/rc.d" || die
|
||||
|
||||
# compatibility symlinks
|
||||
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
|
||||
|
||||
# location for policy definitions
|
||||
dodir /var/lib/selinux
|
||||
keepdir /var/lib/selinux
|
||||
|
||||
# Set version-specific scripts
|
||||
for pyscript in rlpkg; do
|
||||
python_replicate_script "${ED}/usr/sbin/${pyscript}"
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
for POLICY_TYPE in ${POLICY_TYPES} ; do
|
||||
# There have been some changes to the policy store, rebuilding now.
|
||||
# https://marc.info/?l=selinux&m=143757277819717&w=2
|
||||
einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)."
|
||||
semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
|
||||
done
|
||||
}
|
Loading…
Reference in New Issue
Block a user