- Merge with upstream

This commit is contained in:
Daniel J Walsh 2010-02-16 22:10:14 +00:00
parent 3c551b85fe
commit add957370e
8 changed files with 2176 additions and 3922 deletions

View File

@ -200,3 +200,4 @@ serefpolicy-3.7.6.tgz
serefpolicy-3.7.7.tgz
serefpolicy-3.7.8.tgz
setroubleshoot-2.2.58.tar.gz
serefpolicy-3.7.9.tgz

View File

@ -1878,11 +1878,11 @@ aide = module
w3c = module
# Layer: services
# Module: plymouth
# Module: plymouthd
#
# Plymouth
#
plymouth = module
plymouthd = module
# Layer: services
# Module: portreserve

View File

@ -557,11 +557,11 @@ gnomeclock = module
hal = module
# Layer: services
# Module: plymouth
# Module: plymouthd
#
# Plymouth
#
plymouth = module
plymouthd = module
# Layer: services
# Module: policykit

View File

@ -1878,11 +1878,11 @@ aide = module
w3c = module
# Layer: services
# Module: plymouth
# Module: plymouthd
#
# Plymouth
#
plymouth = module
plymouthd = module
# Layer: services
# Module: portreserve

View File

@ -1 +1 @@
diff --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.7.8 > /tmp/diff
diff --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.7.9 > /tmp/diff

File diff suppressed because it is too large Load Diff

View File

@ -19,8 +19,8 @@
%define CHECKPOLICYVER 2.0.21-1
Summary: SELinux policy configuration
Name: selinux-policy
Version: 3.7.8
Release: 11%{?dist}
Version: 3.7.9
Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: serefpolicy-%{version}.tgz
@ -200,13 +200,13 @@ Based off of reference policy: Checked out revision 2.20091117
%prep
%setup -n serefpolicy-%{version} -q
%patch -p1
%install
mkdir selinux_config
for i in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE25};do
cp $i selinux_config
done
tar zxvf selinux_config/config.tgz
%install
# Build targeted policy
%{__rm} -fR %{buildroot}
mkdir -p %{buildroot}%{_mandir}
@ -466,6 +466,9 @@ exit 0
%endif
%changelog
* Fri Feb 12 2010 Dan Walsh <dwalsh@redhat.com> 3.7.9-1
- Merge with upstream
* Thu Feb 11 2010 Dan Walsh <dwalsh@redhat.com> 3.7.8-11
- Allow sandbox to work with MLS

View File

@ -1,2 +1,2 @@
6ed233bfd5c6a20877d98e74f967ce0f serefpolicy-3.7.8.tgz
4c7d323036f1662a06a7a4f2a7da57a5 config.tgz
87a01bd56d6fca0ae9bef4d35dad49ef serefpolicy-3.7.9.tgz