- Merge with upstream
This commit is contained in:
parent
0dae3b6d89
commit
d7e0f9fa0d
@ -97,3 +97,4 @@ serefpolicy-2.3.19.tgz
|
|||||||
serefpolicy-2.4.tgz
|
serefpolicy-2.4.tgz
|
||||||
serefpolicy-2.4.1.tgz
|
serefpolicy-2.4.1.tgz
|
||||||
serefpolicy-2.4.2.tgz
|
serefpolicy-2.4.2.tgz
|
||||||
|
serefpolicy-2.4.3.tgz
|
||||||
|
@ -16,12 +16,12 @@
|
|||||||
%define CHECKPOLICYVER 1.30.11-1
|
%define CHECKPOLICYVER 1.30.11-1
|
||||||
Summary: SELinux policy configuration
|
Summary: SELinux policy configuration
|
||||||
Name: selinux-policy
|
Name: selinux-policy
|
||||||
Version: 2.4.2
|
Version: 2.4.3
|
||||||
Release: 8
|
Release: 1
|
||||||
License: GPL
|
License: GPL
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Source: serefpolicy-%{version}.tgz
|
Source: serefpolicy-%{version}.tgz
|
||||||
patch: policy-20061016.patch
|
patch: policy-20061106.patch
|
||||||
Source1: modules-targeted.conf
|
Source1: modules-targeted.conf
|
||||||
Source2: booleans-targeted.conf
|
Source2: booleans-targeted.conf
|
||||||
Source3: Makefile.devel
|
Source3: Makefile.devel
|
||||||
@ -69,9 +69,6 @@ SELinux Policy development package
|
|||||||
%{_usr}/share/selinux/devel/policygentool
|
%{_usr}/share/selinux/devel/policygentool
|
||||||
%{_usr}/share/selinux/devel/example.*
|
%{_usr}/share/selinux/devel/example.*
|
||||||
%attr(755,root,root) %{_usr}/share/selinux/devel/policyhelp
|
%attr(755,root,root) %{_usr}/share/selinux/devel/policyhelp
|
||||||
%dir %{_usr}/share/selinux/targeted
|
|
||||||
%dir %{_usr}/share/selinux/strict
|
|
||||||
%dir %{_usr}/share/selinux/mls
|
|
||||||
|
|
||||||
%define setupCmds() \
|
%define setupCmds() \
|
||||||
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 bare \
|
||||||
@ -108,7 +105,9 @@ ln -sf ../devel/include %{buildroot}%{_usr}/share/selinux/%1 \
|
|||||||
|
|
||||||
%define fileList() \
|
%define fileList() \
|
||||||
%defattr(-,root,root) \
|
%defattr(-,root,root) \
|
||||||
|
%dir %{_usr}/share/selinux/%1 \
|
||||||
%{_usr}/share/selinux/%1/*.pp \
|
%{_usr}/share/selinux/%1/*.pp \
|
||||||
|
%{_usr}/share/selinux/%1/include \
|
||||||
%dir %{_sysconfdir}/selinux/%1 \
|
%dir %{_sysconfdir}/selinux/%1 \
|
||||||
%config(noreplace) %{_sysconfdir}/selinux/%1/setrans.conf \
|
%config(noreplace) %{_sysconfdir}/selinux/%1/setrans.conf \
|
||||||
%ghost %{_sysconfdir}/selinux/%1/seusers \
|
%ghost %{_sysconfdir}/selinux/%1/seusers \
|
||||||
@ -134,8 +133,7 @@ ln -sf ../devel/include %{buildroot}%{_usr}/share/selinux/%1 \
|
|||||||
%ghost %{_sysconfdir}/selinux/%1/contexts/files/file_contexts.homedirs \
|
%ghost %{_sysconfdir}/selinux/%1/contexts/files/file_contexts.homedirs \
|
||||||
%config %{_sysconfdir}/selinux/%1/contexts/files/media \
|
%config %{_sysconfdir}/selinux/%1/contexts/files/media \
|
||||||
%dir %{_sysconfdir}/selinux/%1/contexts/users \
|
%dir %{_sysconfdir}/selinux/%1/contexts/users \
|
||||||
%{_sysconfdir}/selinux/%1/contexts/users/root \
|
%{_sysconfdir}/selinux/%1/contexts/users/root
|
||||||
%{_usr}/share/selinux/%1/include
|
|
||||||
|
|
||||||
%define saveFileContext() \
|
%define saveFileContext() \
|
||||||
if [ -s /etc/selinux/config ]; then \
|
if [ -s /etc/selinux/config ]; then \
|
||||||
@ -353,6 +351,9 @@ semodule -b base.pp -r bootloader -r clock -r dpkg -r fstools -r hotplug -r init
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Nov 3 2006 Dan Walsh <dwalsh@redhat.com> 2.4.3-1
|
||||||
|
- Merge with upstream
|
||||||
|
|
||||||
* Fri Nov 3 2006 Dan Walsh <dwalsh@redhat.com> 2.4.2-8
|
* Fri Nov 3 2006 Dan Walsh <dwalsh@redhat.com> 2.4.2-8
|
||||||
- Lots of fixes for ricci
|
- Lots of fixes for ricci
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user