diff --git a/modules-mls-contrib.conf b/modules-mls-contrib.conf index 09758d1..733628e 100644 --- a/modules-mls-contrib.conf +++ b/modules-mls-contrib.conf @@ -1256,13 +1256,6 @@ sambagui = module # samba = module -# Layer: apps -# Module: sandbox -# -# Experimental policy for running apps within a sandbox -# -sandbox = module - # Layer: services # Module: sasl # diff --git a/selinux-policy.spec b/selinux-policy.spec index 427995a..3a9a3de 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -19,7 +19,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.12.1 -Release: 82%{?dist} +Release: 83%{?dist} License: GPLv2+ Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -185,7 +185,6 @@ rm -f %{buildroot}/%{_usr}/share/selinux/%1/base.pp \ for i in %{buildroot}/%{_usr}/share/selinux/%1/*.pp; do bzip2 -c $i > %{buildroot}/%{_sysconfdir}/selinux/%1/modules/active/modules/`basename $i`; done \ rm -f %{buildroot}/%{_usr}/share/selinux/%1/*pp* \ mkdir -p %{buildroot}%{_usr}/share/selinux/packages \ -mv %{buildroot}/%{_sysconfdir}/selinux/%1/modules/active/modules/sandbox.pp %{buildroot}/usr/share/selinux/packages \ /usr/sbin/semodule -s %1 -n -B -p %{buildroot}; \ /usr/bin/sha512sum %{buildroot}%{_sysconfdir}/selinux/%1/policy/policy.%{POLICYVER} | cut -d' ' -f 1 > %{buildroot}%{_sysconfdir}/selinux/%1/.policy.sha512; \ rm -rf %{buildroot}%{_sysconfdir}/selinux/%1/contexts/netfilter_contexts \ @@ -348,6 +347,7 @@ cp %{SOURCE28} %{buildroot}/%{_usr}/share/selinux/targeted %makeCmds targeted mcs n allow %makeModulesConf targeted base contrib %installCmds targeted mcs n allow +mv %{buildroot}/%{_sysconfdir}/selinux/targeted/modules/active/modules/sandbox.pp %{buildroot}/usr/share/selinux/packages %modulesList targeted %endif @@ -359,6 +359,7 @@ cp %{SOURCE28} %{buildroot}/%{_usr}/share/selinux/minimum %makeCmds minimum mcs n allow %makeModulesConf targeted base contrib %installCmds minimum mcs n allow +rm -f %{buildroot}/%{_sysconfdir}/selinux/minimum/modules/active/modules/sandbox.pp %modulesList minimum %endif @@ -570,6 +571,9 @@ SELinux Reference policy mls base module. %endif %changelog +* Wed Sep 25 2013 Miroslav Grepl 3.12.1-83 +- Do not build sanbox pkg on MLS + * Wed Sep 25 2013 Miroslav Grepl 3.12.1-82 - wine_tmp is no longer needed - Allow setroubleshoot to look at /proc