diff --git a/Makefile.devel b/Makefile.devel index f9dfdef..31be7ba 100644 --- a/Makefile.devel +++ b/Makefile.devel @@ -2,7 +2,7 @@ SHAREDIR := /usr/share/selinux AWK ?= gawk -NAME ?= $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config) +NAME ?= $(strip $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config)) MLSENABLED := $(shell cat /selinux/mls) ifeq ($(MLSENABLED),) @@ -10,7 +10,12 @@ ifeq ($(MLSENABLED),) endif ifeq ($(MLSENABLED),1) -MCSFLAG=-mcs + MCSFLAG=-mcs +endif + +ifeq ($(NAME), mls) + NAME = strict + MCSFLAG = -mls endif TYPE ?= $(NAME)${MCSFLAG} diff --git a/selinux-policy.spec b/selinux-policy.spec index 8b7b16c..6514f2f 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.3.17 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -349,6 +349,9 @@ semodule -b base.pp -r bootloader -r clock -r dpkg -r fstools -r hotplug -r init %endif %changelog +* Mon Oct 2 2006 Dan Walsh 2.3.17-2 +- Fix crond handling for mls + * Fri Sep 28 2006 Dan Walsh 2.3.17-1 - Update to upstream