From e409b5d8f216f12619dc30de1449e0eecd823775 Mon Sep 17 00:00:00 2001
From: plsph <plsph@hell>
Date: Wed, 29 Dec 2021 20:53:34 +0100
Subject: [PATCH 1/3] remove obsolete selinux modules

Signed-off-by: Grzegorz Filo <gf578@wp.pl>
---
 .../selinux-base-policy-2.20210203-r1.ebuild     | 16 ++++++++++++++++
 .../selinux-base-policy-2.20210908-r1.ebuild     | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild
index 56db7e92b5d06..fe318c0d0d4ab 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild
@@ -27,6 +27,7 @@ BDEPEND="
 	sys-apps/checkpolicy
 	sys-devel/m4"
 
+OLD_MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
 MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
 LICENSE="GPL-2"
 SLOT="0"
@@ -97,6 +98,7 @@ pkg_postinst() {
 
 	# Override the command from the eclass, we need to load in base as well here
 	local COMMAND="-i base.pp"
+	local DEL_MODS=""
 	if has_version "<sys-apps/policycoreutils-2.5"; then
 		COMMAND="-b base.pp"
 	fi
@@ -105,12 +107,26 @@ pkg_postinst() {
 		COMMAND="${COMMAND} -i ${i}.pp"
 	done
 
+	for i in ${OLD_MODS}; do
+		if [ -n "${MODS##*$i*}" ]; then
+			DEL_MODS="${DEL_MODS} ${i}"
+		fi
+	done
+
 	for i in ${POLICY_TYPES}; do
 		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
 
 		cd "${ROOT}/usr/share/selinux/${i}"
 
 		semodule ${root_opts} -s ${i} ${COMMAND}
+
+		if [ -n "${DEL_MODS}" ];then
+			for mod in ${DEL_MODS}; do
+				if semodule ${root_opts} -s ${i} -l | grep -q "\b${mod}\b"; then
+					semodule ${root_opts} -s ${i} -r ${mod}
+				fi
+			done
+		fi
 	done
 
 	# Don't relabel when cross compiling
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild
index 56db7e92b5d06..fe318c0d0d4ab 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild
@@ -27,6 +27,7 @@ BDEPEND="
 	sys-apps/checkpolicy
 	sys-devel/m4"
 
+OLD_MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
 MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
 LICENSE="GPL-2"
 SLOT="0"
@@ -97,6 +98,7 @@ pkg_postinst() {
 
 	# Override the command from the eclass, we need to load in base as well here
 	local COMMAND="-i base.pp"
+	local DEL_MODS=""
 	if has_version "<sys-apps/policycoreutils-2.5"; then
 		COMMAND="-b base.pp"
 	fi
@@ -105,12 +107,26 @@ pkg_postinst() {
 		COMMAND="${COMMAND} -i ${i}.pp"
 	done
 
+	for i in ${OLD_MODS}; do
+		if [ -n "${MODS##*$i*}" ]; then
+			DEL_MODS="${DEL_MODS} ${i}"
+		fi
+	done
+
 	for i in ${POLICY_TYPES}; do
 		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
 
 		cd "${ROOT}/usr/share/selinux/${i}"
 
 		semodule ${root_opts} -s ${i} ${COMMAND}
+
+		if [ -n "${DEL_MODS}" ];then
+			for mod in ${DEL_MODS}; do
+				if semodule ${root_opts} -s ${i} -l | grep -q "\b${mod}\b"; then
+					semodule ${root_opts} -s ${i} -r ${mod}
+				fi
+			done
+		fi
 	done
 
 	# Don't relabel when cross compiling

From 922deb3e719185523d2517f0f06ba9e532636a29 Mon Sep 17 00:00:00 2001
From: plsph <plsph@hell>
Date: Sat, 1 Jan 2022 18:11:22 +0100
Subject: [PATCH 2/3] del list instead of old list

Signed-off-by: Grzegorz Filo <gf578@wp.pl>
---
 .../selinux-base-policy-2.20210203-r1.ebuild             | 9 +++------
 .../selinux-base-policy-2.20210908-r1.ebuild             | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild
index fe318c0d0d4ab..ff689eeceb56b 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
 	sys-apps/checkpolicy
 	sys-devel/m4"
 
-OLD_MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
+DEL_MODS="hotplug"
 MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
 LICENSE="GPL-2"
 SLOT="0"
@@ -98,7 +98,6 @@ pkg_postinst() {
 
 	# Override the command from the eclass, we need to load in base as well here
 	local COMMAND="-i base.pp"
-	local DEL_MODS=""
 	if has_version "<sys-apps/policycoreutils-2.5"; then
 		COMMAND="-b base.pp"
 	fi
@@ -107,10 +106,8 @@ pkg_postinst() {
 		COMMAND="${COMMAND} -i ${i}.pp"
 	done
 
-	for i in ${OLD_MODS}; do
-		if [ -n "${MODS##*$i*}" ]; then
-			DEL_MODS="${DEL_MODS} ${i}"
-		fi
+	for i in ${DEL_MODS}; do
+		[[ "${MODS}" != "*${i}*" ]] || die "Duplicate module in MODS and DEL_MODS: ${i}"
 	done
 
 	for i in ${POLICY_TYPES}; do
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild
index fe318c0d0d4ab..ff689eeceb56b 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
 	sys-apps/checkpolicy
 	sys-devel/m4"
 
-OLD_MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
+DEL_MODS="hotplug"
 MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
 LICENSE="GPL-2"
 SLOT="0"
@@ -98,7 +98,6 @@ pkg_postinst() {
 
 	# Override the command from the eclass, we need to load in base as well here
 	local COMMAND="-i base.pp"
-	local DEL_MODS=""
 	if has_version "<sys-apps/policycoreutils-2.5"; then
 		COMMAND="-b base.pp"
 	fi
@@ -107,10 +106,8 @@ pkg_postinst() {
 		COMMAND="${COMMAND} -i ${i}.pp"
 	done
 
-	for i in ${OLD_MODS}; do
-		if [ -n "${MODS##*$i*}" ]; then
-			DEL_MODS="${DEL_MODS} ${i}"
-		fi
+	for i in ${DEL_MODS}; do
+		[[ "${MODS}" != "*${i}*" ]] || die "Duplicate module in MODS and DEL_MODS: ${i}"
 	done
 
 	for i in ${POLICY_TYPES}; do

From 33e48c210983b666a858c0cccd69c6a7fda6efbc Mon Sep 17 00:00:00 2001
From: plsph <plsph@hell>
Date: Sat, 1 Jan 2022 22:32:56 +0100
Subject: [PATCH 3/3] move lines around

Signed-off-by: Grzegorz Filo <gf578@wp.pl>
---
 .../selinux-base-policy-2.20210203-r1.ebuild                    | 2 +-
 .../selinux-base-policy-2.20210908-r1.ebuild                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild
index ff689eeceb56b..2a8e2f2df82f1 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210203-r1.ebuild
@@ -27,8 +27,8 @@ BDEPEND="
 	sys-apps/checkpolicy
 	sys-devel/m4"
 
-DEL_MODS="hotplug"
 MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
+DEL_MODS="hotplug"
 LICENSE="GPL-2"
 SLOT="0"
 S="${WORKDIR}/"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild
index ff689eeceb56b..2a8e2f2df82f1 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20210908-r1.ebuild
@@ -27,8 +27,8 @@ BDEPEND="
 	sys-apps/checkpolicy
 	sys-devel/m4"
 
-DEL_MODS="hotplug"
 MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg"
+DEL_MODS="hotplug"
 LICENSE="GPL-2"
 SLOT="0"
 S="${WORKDIR}/"