diff options
| -rw-r--r-- | eclass/selinux-policy-2.eclass | 13 | ||||
| -rw-r--r-- | profiles/features/selinux/package.mask | 25 | ||||
| -rw-r--r-- | profiles/features/selinux/package.use.mask | 5 |
3 files changed, 9 insertions, 34 deletions
diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass index 5def86fbef9d..1af7ba3a80be 100644 --- a/eclass/selinux-policy-2.eclass +++ b/eclass/selinux-policy-2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Eclass for installing SELinux policy, and optionally @@ -263,10 +263,15 @@ selinux-policy-2_pkg_postinst() { local COMMAND for i in ${POLICY_TYPES}; do - if [[ "${i}" == "strict" ]] && [[ "${MODS}" = "unconfined" ]]; then - einfo "Ignoring loading of unconfined module in strict module store."; - continue; + if [[ "${MODS}" = "unconfined" ]]; then + case ${i} in + strict|mcs|mls) + einfo "Ignoring loading of unconfined module in ${i} module store."; + continue + ;; + esac fi + einfo "Inserting the following modules into the $i module store: ${MODS}" cd "${ROOT%/}/usr/share/selinux/${i}" || die "Could not enter /usr/share/selinux/${i}" diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask index d92f83aeac0e..f7024673bd87 100644 --- a/profiles/features/selinux/package.mask +++ b/profiles/features/selinux/package.mask @@ -24,35 +24,10 @@ www-misc/profile-sync-daemon # systemd has no support in the SELinux policy at the moment. # Please see: https://wiki.gentoo.org/wiki/SELinux/FAQ#Can_I_use_SELinux_with_systemd.3F app-admin/systemdgenie -app-eselect/eselect-gnome-shell-extensions app-office/wps-office sys-apps/systemd app-admin/calamares dev-python/python-systemd -gnome-base/gdm -gnome-base/gnome -gnome-base/gnome-applets -gnome-base/gnome-extra-apps -gnome-base/gnome-flashback -gnome-base/gnome-light -gnome-base/gnome-panel -gnome-base/gnome-shell -gnome-extra/chrome-gnome-shell -gnome-extra/gnome-logs -gnome-extra/gnome-shell-extensions -gnome-extra/gnome-shell-frippery -gnome-extra/gnome-shell-extensions-topicons-plus -gnome-extra/gnome-shell-extension-appindicator -gnome-extra/gnome-shell-extension-applications-overview-tooltip -gnome-extra/gnome-shell-extension-bing-wallpaper -gnome-extra/gnome-shell-extension-bluetooth-quick-connect -gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen -gnome-extra/gnome-shell-extension-dash-to-panel -gnome-extra/gnome-shell-extension-desktop-icons -gnome-extra/gnome-shell-extension-desktop-icons-ng -gnome-extra/gnome-shell-extension-gsconnect -gnome-extra/gnome-shell-extension-pop-shell -gnome-extra/gnome-tweaks x11-themes/zukitwo-shell gnome-extra/office-runner gnome-extra/pch-session diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask index fa0016533bcc..2957344b7c3e 100644 --- a/profiles/features/selinux/package.use.mask +++ b/profiles/features/selinux/package.use.mask @@ -17,11 +17,6 @@ gnome-base/gdm wayland net-firewall/fwknop firewalld www-servers/uwsgi uwsgi_plugins_systemd_logger >=x11-wm/mutter-3.22 wayland -x11-misc/xscreensaver gdm -x11-misc/gpaste gnome -x11-terms/gnome-terminal gnome-shell -x11-themes/arc-theme gnome-shell -x11-themes/zukitwo gnome-shell net-wireless/bluez user-session # Brian Dolbec <dolsen@gentoo.org> (2014-09-17) |