rpms/selinux-policy/F-11 selinux-policy.spec,1.901,1.902

Daniel J Walsh dwalsh at fedoraproject.org
Thu Aug 27 13:40:50 UTC 2009


Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6154

Modified Files:
	selinux-policy.spec 
Log Message:
* Thu Aug 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-81
- Turn back on unconfineduser and unconfined domains



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/F-11/selinux-policy.spec,v
retrieving revision 1.901
retrieving revision 1.902
diff -u -p -r1.901 -r1.902
--- selinux-policy.spec	24 Aug 2009 13:58:24 -0000	1.901
+++ selinux-policy.spec	27 Aug 2009 13:40:50 -0000	1.902
@@ -96,7 +96,7 @@ cp -f $RPM_SOURCE_DIR/modules-%1.conf  .
 cp -f $RPM_SOURCE_DIR/booleans-%1.conf ./policy/booleans.conf \
 
 %define moduleList() %([ -f %{_sourcedir}/modules-%{1}.conf ] && \
-awk '$1 !~ "/^#/" && $1 != "unconfined" && $1 != "unconfineduser" && $2 == "=" && $3 == "module" { printf "%%s.pp.bz2 ", $1 }' %{_sourcedir}/modules-%{1}.conf )
+awk '$1 !~ "/^#/" && $2 == "=" && $3 == "module" { printf "%%s.pp.bz2 ", $1 }' %{_sourcedir}/modules-%{1}.conf )
 
 %define installCmds() \
 make UNK_PERMS=%5 NAME=%1 TYPE=%2 DISTRO=%{distro} UBAC=n DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 MLS_CATS=1024 MCS_CATS=1024 base.pp \
@@ -310,46 +310,13 @@ SELinux Reference policy targeted base m
 %saveFileContext targeted
 
 %post targeted
-function get_unconfined() {
-# We only want to upgrade unconfined.pp and unconfineduser if they are 
-# currently installed.  If you have a version 3.0.0 or less of unconfined 
-# installed, you will need to install both, since unconfineduser did not exist 
-# prior to this.
-eval `semodule -l | while read package version; do
-	case $package in
-	"unconfineduser")
-	        echo "unconfineduser=$version"
-		;;
-	"unconfined")
-	 	echo "unconfined=$version"
-		;;
-	esac
-done`
-
-if [ -z "$unconfineduser" -a -n "$unconfined" ]; then
-    f1=`echo $unconfined | cut -d. -f 1`
-    if [ $f1 -lt 3 ]; then
-	unconfineduser="1"
-    else
-        if [ $f1 -eq  3 ]; then
-	    f2=`echo $unconfined | cut -s -d. -f2`
-	    f3=`echo $unconfined | cut -s -d. -f3`
-	    if [ \( -z "$f2" \) -o \( \( "$f2" -eq 0 \)  -a \( -z "f3" -o "$f3" -eq 0 \) \) ]; then 
-	        unconfineduser="1"
-	    fi
-	fi
-    fi
-fi
-echo ${unconfined:+unconfined.pp.bz2} ${unconfineduser:+unconfineduser.pp.bz2}
-}
-
 if [ $1 -eq 1 ]; then
-   packages="%{expand:%%moduleList targeted} unconfined.pp.bz2 unconfineduser.pp.bz2"
+   packages="%{expand:%%moduleList targeted}"
    %loadpolicy targeted $packages
    restorecon -R /root /var/log /var/run 2> /dev/null
 else
    semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid 2>/dev/null
-   packages="%{expand:%%moduleList targeted} `get_unconfined`"
+   packages="%{expand:%%moduleList targeted}"
    %loadpolicy targeted $packages
    %relabel targeted
 fi
@@ -428,7 +395,7 @@ SELinux Reference policy olpc base modul
 %saveFileContext olpc
 
 %post olpc 
-packages="%{expand:%%moduleList olpc} unconfined.pp.bz2 unconfineduser.pp.bz2"
+packages="%{expand:%%moduleList olpc}"
 %loadpolicy olpc $packages
 
 if [ $1 -ne 1 ]; then
@@ -475,6 +442,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Aug 27 2009 Dan Walsh <dwalsh at redhat.com> 3.6.12-81
+- Turn back on unconfineduser and unconfined domains
+
 * Mon Aug 24 2009 Miroslav Grepl <mgrepl at redhat.com> 3.6.12-80
 - Allow pptp dac_override capability
 




More information about the fedora-extras-commits mailing list