From 6ebb8c09c46e5767fb48cb35ef11a973211b9c09 Mon Sep 17 00:00:00 2001 From: HuaxinLuGitee <1539327763@qq.com> Date: Tue, 24 Nov 2020 18:48:50 +0800 Subject: [PATCH 1/3] move autorelabel creating to postun --- selinux-policy.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/selinux-policy.spec b/selinux-policy.spec index 51ae559..976cdff 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -12,7 +12,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.14.2 -Release: 59 +Release: 60 License: GPLv2+ URL: https://github.com/fedora-selinux/selinux-policy/ @@ -388,8 +388,6 @@ SELINUXTYPE=targeted else . %{_sysconfdir}/selinux/config fi - -touch /.autorelabel exit 0 %postun @@ -400,6 +398,8 @@ if [ $1 = 0 ]; then else sed -i 's/^SELINUX=.*/SELINUX=disabled/g' %{_sysconfdir}/selinux/config fi +else + touch /.autorelabel fi exit 0 @@ -731,6 +731,9 @@ exit 0 %endif %changelog +* Tue Nov 24 2020 openEuler Buildteam - 3.14.2-60 +- move autorelabel creating to postun + * Fri Nov 6 2020 openEuler Buildteam - 3.14.2-59 - create autorelabel file after install From e151de4fd15fd82d15ad6034205f5e2c4c2ef901 Mon Sep 17 00:00:00 2001 From: HuaxinLuGitee <1539327763@qq.com> Date: Tue, 1 Dec 2020 20:44:32 +0800 Subject: [PATCH 2/3] fix spec --- selinux-policy.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/selinux-policy.spec b/selinux-policy.spec index 976cdff..8f90acd 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -6,13 +6,13 @@ %define BUILD_MINIMUM 1 %define BUILD_MLS 1 %define POLICYVER 32 -%define POLICYCOREUTILSVER 3.0 +%define POLICYCOREUTILSVER 3.1-5 %define CHECKPOLICYVER 3.0 Summary: SELinux policy configuration Name: selinux-policy Version: 3.14.2 -Release: 60 +Release: 61 License: GPLv2+ URL: https://github.com/fedora-selinux/selinux-policy/ @@ -398,8 +398,6 @@ if [ $1 = 0 ]; then else sed -i 's/^SELINUX=.*/SELINUX=disabled/g' %{_sysconfdir}/selinux/config fi -else - touch /.autorelabel fi exit 0 @@ -731,6 +729,10 @@ exit 0 %endif %changelog +* Tue Dec 1 2020 openEuler Buildteam - 3.14.2-61 +- remove autorelabel creating action +- rebuild with policycoreutils-3.1-5 + * Tue Nov 24 2020 openEuler Buildteam - 3.14.2-60 - move autorelabel creating to postun From d7758a739678aa39100ec390c91ac3fc2bbeaffa Mon Sep 17 00:00:00 2001 From: HuaxinLuGitee <1539327763@qq.com> Date: Wed, 2 Dec 2020 20:17:18 +0800 Subject: [PATCH 3/3] fix spec --- selinux-policy.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/selinux-policy.spec b/selinux-policy.spec index 8f90acd..16019bb 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -12,7 +12,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.14.2 -Release: 61 +Release: 62 License: GPLv2+ URL: https://github.com/fedora-selinux/selinux-policy/ @@ -388,6 +388,7 @@ SELINUXTYPE=targeted else . %{_sysconfdir}/selinux/config fi + rm -f /.autorelabel exit 0 %postun @@ -729,6 +730,9 @@ exit 0 %endif %changelog +* Wed Dec 2 2020 openEuler Buildteam - 3.14.2-62 +- remove .autorelabel file after install + * Tue Dec 1 2020 openEuler Buildteam - 3.14.2-61 - remove autorelabel creating action - rebuild with policycoreutils-3.1-5