rpms/selinux-policy/FC-6 .cvsignore, 1.91, 1.92 modules-mls.conf, 1.18, 1.19 selinux-policy.spec, 1.313, 1.314 sources, 1.95, 1.96

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Oct 19 15:55:59 UTC 2006 

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv10388

Modified Files:
	.cvsignore modules-mls.conf selinux-policy.spec sources 
Log Message:
* Thu Oct 19 2006 Dan Walsh <dwalsh at redhat.com> 2.4-1
- Refupdate from upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- .cvsignore	3 Oct 2006 18:47:06 -0000	1.91
+++ .cvsignore	19 Oct 2006 15:55:57 -0000	1.92
@@ -93,3 +93,4 @@
 serefpolicy-2.3.16.tgz
 serefpolicy-2.3.17.tgz
 serefpolicy-2.3.18.tgz
+serefpolicy-2.4.tgz


Index: modules-mls.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/modules-mls.conf,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- modules-mls.conf	21 Sep 2006 23:05:49 -0000	1.18
+++ modules-mls.conf	19 Oct 2006 15:55:57 -0000	1.19
@@ -1001,3 +1001,11 @@
 # 
 smartmon = base
 
+# Layer: system
+# Module: netlabel
+# Required in base
+#
+# Basic netlabel types and interfaces.
+# 
+netlabel = base
+


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- selinux-policy.spec	12 Oct 2006 15:43:58 -0000	1.313
+++ selinux-policy.spec	19 Oct 2006 15:55:57 -0000	1.314
@@ -16,13 +16,12 @@
 %define CHECKPOLICYVER 1.30.11-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.3.18
-Release: 10
+Version: 2.4
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
-patch: policy-20060915.patch
-patch2: serefpolicy-2.3.18-iscsi.patch
+patch: policy-20061016.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -75,8 +74,8 @@
 %dir %{_usr}/share/selinux/mls
 
 %define setupCmds() \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 bare \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4  conf \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 MLS_CATS=1024 MCS_CATS=1024 bare \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 MLS_CATS=1024 MCS_CATS=1024  conf \
 cp -f ${RPM_SOURCE_DIR}/modules-%1.conf  ./policy/modules.conf \
 cp -f ${RPM_SOURCE_DIR}/booleans-%1.conf ./policy/booleans.conf \
 
@@ -84,18 +83,18 @@
 awk '$1 !~ "/^#/" && $2 == "=" && $3 == "module" { printf "-i %%s.pp ", $1 }' %{_sourcedir}/modules-%{1}.conf )
 
 %define installCmds() \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 base.pp \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 modules \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} POLY=%4 install \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} POLY=%4 install-appconfig \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 MLS_CATS=1024 MCS_CATS=1024 base.pp \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 MLS_CATS=1024 MCS_CATS=1024 modules \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} POLY=%4 MLS_CATS=1024 MCS_CATS=1024 install \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} POLY=%4 MLS_CATS=1024 MCS_CATS=1024 install-appconfig \
 #%{__cp} *.pp %{buildroot}/%{_usr}/share/selinux/%1/ \
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/selinux/%1/policy \
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/selinux/%1/modules/active \
 %{__mkdir} -p %{buildroot}/%{_sysconfdir}/selinux/%1/contexts/files \
 touch %{buildroot}/%{_sysconfdir}/selinux/%1/modules/semanage.read.LOCK \
 touch %{buildroot}/%{_sysconfdir}/selinux/%1/modules/semanage.trans.LOCK \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4  enableaudit \
-make -W base.conf NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 base.pp \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4  MLS_CATS=1024 MCS_CATS=1024 enableaudit \
+make -W base.conf NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 MLS_CATS=1024 MCS_CATS=1024 base.pp \
 install -m0644 base.pp %{buildroot}%{_usr}/share/selinux/%1/enableaudit.pp \
 rm -rf %{buildroot}%{_sysconfdir}/selinux/%1/booleans \
 touch %{buildroot}%{_sysconfdir}/selinux/%1/seusers \
@@ -134,6 +133,8 @@
 %ghost %{_sysconfdir}/selinux/%1/contexts/files/homedir_template \
 %ghost %{_sysconfdir}/selinux/%1/contexts/files/file_contexts.homedirs \
 %config %{_sysconfdir}/selinux/%1/contexts/files/media \
+%dir %{_sysconfdir}/selinux/%1/contexts/users \
+%{_sysconfdir}/selinux/%1/contexts/users/root \
 %{_usr}/share/selinux/%1/include
 
 %define saveFileContext() \
@@ -165,7 +166,6 @@
 %prep 
 %setup -q -n serefpolicy-%{version}
 %patch -p1
-%patch2 -p1
 
 %install
 # Build targeted policy
@@ -182,7 +182,7 @@
 
 # Install devel
 make clean
-make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=%4 install-headers install-docs
+make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} POLY=%4 MLS_CATS=1024 MCS_CATS=1024 install-headers install-docs
 mkdir %{buildroot}%{_usr}/share/selinux/devel/
 mv %{buildroot}%{_usr}/share/selinux/targeted/include %{buildroot}%{_usr}/share/selinux/devel/include
 install -m 755 ${RPM_SOURCE_DIR}/policygentool %{buildroot}%{_usr}/share/selinux/devel/
@@ -196,14 +196,14 @@
 # Commented out because only targeted ref policy currently builds
 %setupCmds targeted targeted-mcs y y
 %installCmds targeted targeted-mcs y y
-make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=y validatefc 
+make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=y MLS_CATS=1024 MCS_CATS=1024 validatefc 
 %endif
 
 %if %{BUILD_STRICT}
 # Build strict policy
 # Commented out because only targeted ref policy currently builds
-make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=n bare 
-make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=n conf
+make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=n MLS_CATS=1024 MCS_CATS=1024 bare 
+make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=n MLS_CATS=1024 MCS_CATS=1024 conf
 cp -f ${RPM_SOURCE_DIR}/modules-strict.conf  ./policy/modules.conf 
 %installCmds strict strict-mcs y n
 ln -sf ../devel/include %{buildroot}%{_usr}/share/selinux/strict 
@@ -351,6 +351,22 @@
 %endif
 
 %changelog
+* Thu Oct 19 2006 Dan Walsh <dwalsh at redhat.com> 2.4-1
+- Refupdate from upstream
+
+* Thu Oct 19 2006 Dan Walsh <dwalsh at redhat.com> 2.3.19-4
+- Add lots of fixes for mls cups
+
+* Wed Oct 18 2006 Dan Walsh <dwalsh at redhat.com> 2.3.19-3
+- Lots of fixes for ricci
+
+
+* Mon Oct 16 2006 Dan Walsh <dwalsh at redhat.com> 2.3.19-2
+- Fix number of cats
+
+* Mon Oct 16 2006 Dan Walsh <dwalsh at redhat.com> 2.3.19-1
+- Update to upstream
+
 * Thu Oct 12 2006 James Antill <jantill at redhat.com> 2.3.18-10
 - More iSCSI changes for #209854
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/FC-6/sources,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- sources	3 Oct 2006 18:47:06 -0000	1.95
+++ sources	19 Oct 2006 15:55:57 -0000	1.96
@@ -1 +1 @@
-ea5c004237cca044f601bbf06c0f55e4  serefpolicy-2.3.18.tgz
+b5caacac40c7148f13acfff4169cd167  serefpolicy-2.4.tgz

More information about the fedora-cvs-commits mailing list