- Update from upstream
- Allow unconfined_t to transition to rpm_script_t
This commit is contained in:
parent
e24a8b160d
commit
504da9fea1
@ -18,3 +18,4 @@ serefpolicy-2.1.0.tgz
|
|||||||
serefpolicy-2.1.1.tgz
|
serefpolicy-2.1.1.tgz
|
||||||
serefpolicy-2.1.2.tgz
|
serefpolicy-2.1.2.tgz
|
||||||
serefpolicy-2.1.4.tgz
|
serefpolicy-2.1.4.tgz
|
||||||
|
serefpolicy-2.1.5.tgz
|
||||||
|
@ -1,28 +1,25 @@
|
|||||||
%define distro redhat
|
%define distro redhat
|
||||||
%define direct_initrc y
|
%define direct_initrc y
|
||||||
%define monolithic n
|
%define monolithic n
|
||||||
%define polname1 targeted
|
|
||||||
%define polname2 mls
|
|
||||||
%define polname3 strict
|
|
||||||
%define POLICYVER 20
|
%define POLICYVER 20
|
||||||
%define POLICYCOREUTILSVER 1.29.1-1
|
%define POLICYCOREUTILSVER 1.29.1-1
|
||||||
%define CHECKPOLICYVER 1.28-1
|
%define CHECKPOLICYVER 1.28-1
|
||||||
Summary: SELinux policy configuration
|
Summary: SELinux policy configuration
|
||||||
Name: selinux-policy
|
Name: selinux-policy
|
||||||
Version: 2.1.4
|
Version: 2.1.5
|
||||||
Release: 1
|
Release: 1
|
||||||
License: GPL
|
License: GPL
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Source: serefpolicy-%{version}.tgz
|
Source: serefpolicy-%{version}.tgz
|
||||||
patch: policy-20051208.patch
|
patch: policy-20051208.patch
|
||||||
Source1: modules-%{polname1}.conf
|
Source1: modules-targeted.conf
|
||||||
Source2: booleans-%{polname1}.conf
|
Source2: booleans-targeted.conf
|
||||||
Source3: seusers-%{polname1}
|
Source3: seusers-targeted
|
||||||
Source4: setrans-%{polname1}.conf
|
Source4: setrans-targeted.conf
|
||||||
Source5: modules-%{polname2}.conf
|
Source5: modules-mls.conf
|
||||||
Source6: booleans-%{polname2}.conf
|
Source6: booleans-mls.conf
|
||||||
Source7: seusers-%{polname2}
|
Source7: seusers-mls
|
||||||
Source8: setrans-%{polname2}.conf
|
Source8: setrans-mls.conf
|
||||||
|
|
||||||
Url: http://serefpolicy.sourceforge.net
|
Url: http://serefpolicy.sourceforge.net
|
||||||
BuildRoot: %{_tmppath}/serefpolicy-buildroot
|
BuildRoot: %{_tmppath}/serefpolicy-buildroot
|
||||||
@ -31,15 +28,15 @@ BuildRequires: checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCO
|
|||||||
PreReq: policycoreutils >= %{POLICYCOREUTILSVER}
|
PreReq: policycoreutils >= %{POLICYCOREUTILSVER}
|
||||||
Obsoletes: policy
|
Obsoletes: policy
|
||||||
|
|
||||||
%package %{polname1}
|
%package targeted
|
||||||
Summary: SELinux %{polname1} base policy
|
Summary: SELinux targeted base policy
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Provides: selinux-policy-base
|
Provides: selinux-policy-base
|
||||||
Obsoletes: selinux-policy-%{polname1}-sources
|
Obsoletes: selinux-policy-targeted-sources
|
||||||
Prereq: policycoreutils >= %{POLICYCOREUTILSVER}
|
Prereq: policycoreutils >= %{POLICYCOREUTILSVER}
|
||||||
Prereq: coreutils
|
Prereq: coreutils
|
||||||
|
|
||||||
%description %{polname1}
|
%description targeted
|
||||||
SELinux Reference policy targeted base module.
|
SELinux Reference policy targeted base module.
|
||||||
|
|
||||||
%define installCmds() \
|
%define installCmds() \
|
||||||
@ -127,34 +124,33 @@ SELinux Reference Policy - modular.
|
|||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
|
||||||
# Build targeted policy
|
# Build targeted policy
|
||||||
make conf
|
make conf
|
||||||
%{__rm} -fR $RPM_BUILD_ROOT
|
%{__rm} -fR $RPM_BUILD_ROOT
|
||||||
%installCmds %{polname1} targeted-mcs %{direct_initrc}
|
%installCmds targeted targeted-mcs %{direct_initrc}
|
||||||
|
|
||||||
# Build mls policy
|
# Build mls policy
|
||||||
make clean
|
make clean
|
||||||
make conf
|
make conf
|
||||||
%installCmds %{polname2} strict-mls n
|
%installCmds mls strict-mls n
|
||||||
|
|
||||||
|
|
||||||
# Build strict policy
|
# Build strict policy
|
||||||
# Commented out because only targeted ref policy currently builds
|
# Commented out because only targeted ref policy currently builds
|
||||||
# make clean
|
# make clean
|
||||||
# make conf
|
# make conf
|
||||||
#%#installCmds %{polname3} strict-mcs %{direct_initrc}
|
#%#installCmds strict strict-mcs %{direct_initrc}
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
%{__rm} -fR $RPM_BUILD_ROOT
|
%{__rm} -fR $RPM_BUILD_ROOT
|
||||||
|
|
||||||
%files %{polname1}
|
%files targeted
|
||||||
%fileList %{polname1}
|
%fileList targeted
|
||||||
|
|
||||||
%pre %{polname1}
|
%pre targeted
|
||||||
%saveFileContext %{polname1}
|
%saveFileContext targeted
|
||||||
|
|
||||||
%post %{polname1}
|
%post targeted
|
||||||
if [ ! -s /etc/selinux/config ]; then
|
if [ ! -s /etc/selinux/config ]; then
|
||||||
#
|
#
|
||||||
# New install so we will default to targeted policy
|
# New install so we will default to targeted policy
|
||||||
@ -180,72 +176,80 @@ SETLOCALDEFS=0
|
|||||||
restorecon /etc/selinux/config 2> /dev/null
|
restorecon /etc/selinux/config 2> /dev/null
|
||||||
else
|
else
|
||||||
# if first time update booleans.local needs to be copied to sandbox
|
# if first time update booleans.local needs to be copied to sandbox
|
||||||
[ -f /etc/selinux/%{polname1}/booleans.local ] && mv /etc/selinux/%{polname1}/booleans.local /etc/selinux/%{polname1}/modules/active/
|
[ -f /etc/selinux/targeted/booleans.local ] && mv /etc/selinux/targeted/booleans.local /etc/selinux/targeted/modules/active/
|
||||||
[ -f /etc/selinux/%{polname1}/seusers ] && cp -f /etc/selinux/%{polname1}/seusers /etc/selinux/%{polname1}/modules/active/seusers
|
[ -f /etc/selinux/targeted/seusers ] && cp -f /etc/selinux/targeted/seusers /etc/selinux/targeted/modules/active/seusers
|
||||||
grep -q "^SETLOCALDEFS" /etc/selinux/config || echo -n "
|
grep -q "^SETLOCALDEFS" /etc/selinux/config || echo -n "
|
||||||
# SETLOCALDEFS= Check local definition changes
|
# SETLOCALDEFS= Check local definition changes
|
||||||
SETLOCALDEFS=0
|
SETLOCALDEFS=0
|
||||||
">> /etc/selinux/config
|
">> /etc/selinux/config
|
||||||
fi
|
fi
|
||||||
%rebuildpolicy %{polname1}
|
%rebuildpolicy targeted
|
||||||
%relabel %{polname1}
|
%relabel targeted
|
||||||
|
|
||||||
%triggerpostun %{polname1} -- selinux-policy-%{polname1} <= 2.0.7
|
%triggerpostun targeted -- selinux-policy-targeted <= 2.0.7
|
||||||
%rebuildpolicy %{polname1}
|
%rebuildpolicy targeted
|
||||||
|
|
||||||
%package %{polname2}
|
%package mls
|
||||||
Summary: SELinux %{polname2} base policy
|
Summary: SELinux mls base policy
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Provides: selinux-policy-base
|
Provides: selinux-policy-base
|
||||||
Obsoletes: selinux-policy-%{polname2}-sources
|
Obsoletes: selinux-policy-mls-sources
|
||||||
Prereq: policycoreutils >= %{POLICYCOREUTILSVER}
|
Prereq: policycoreutils >= %{POLICYCOREUTILSVER}
|
||||||
Prereq: coreutils
|
Prereq: coreutils
|
||||||
|
|
||||||
%description %{polname2}
|
%description mls
|
||||||
SELinux Reference policy %{polname2} base module.
|
SELinux Reference policy mls base module.
|
||||||
|
|
||||||
%pre %{polname2}
|
%pre mls
|
||||||
%saveFileContext %{polname2}
|
%saveFileContext mls
|
||||||
|
|
||||||
%post %{polname2}
|
%post mls
|
||||||
%rebuildpolicy %{polname2}
|
%rebuildpolicy mls
|
||||||
%relabel %{polname2}
|
%relabel mls
|
||||||
|
|
||||||
%triggerpostun %{polname2} -- %{polname2} <= 2.0.7
|
%triggerpostun mls -- mls <= 2.0.7
|
||||||
%{rebuildpolicy} %{polname2}
|
%{rebuildpolicy} mls
|
||||||
|
|
||||||
%files %{polname2}
|
%files mls
|
||||||
%fileList %{polname2}
|
%fileList mls
|
||||||
|
|
||||||
%if 0
|
%if 0
|
||||||
%package %{polname3}
|
%package strict
|
||||||
Summary: SELinux %{polname3} base policy
|
Summary: SELinux strict base policy
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Provides: selinux-policy-base
|
Provides: selinux-policy-base
|
||||||
Obsoletes: selinux-policy-%{polname3}-sources
|
Obsoletes: selinux-policy-strict-sources
|
||||||
Prereq: policycoreutils >= %{POLICYCOREUTILSVER}
|
Prereq: policycoreutils >= %{POLICYCOREUTILSVER}
|
||||||
Prereq: coreutils
|
Prereq: coreutils
|
||||||
|
|
||||||
%description %{polname3}
|
%description strict
|
||||||
SELinux Reference policy %{polname3} base module.
|
SELinux Reference policy strict base module.
|
||||||
|
|
||||||
%pre %{polname3}
|
%pre strict
|
||||||
%saveFileContext %{polname3}
|
%saveFileContext strict
|
||||||
|
|
||||||
%post %{polname3}
|
%post strict
|
||||||
%rebuildpolicy %{polname3}
|
%rebuildpolicy strict
|
||||||
%relabel %{polname3}
|
%relabel strict
|
||||||
|
|
||||||
%triggerpostun %{polname3} -- %{polname3} <= 2.0.7
|
%triggerpostun strict -- strict <= 2.0.7
|
||||||
%{rebuildpolicy} %{polname3}
|
%{rebuildpolicy} strict
|
||||||
|
|
||||||
%files %{polname3}
|
%files strict
|
||||||
%fileList %{polname3}
|
%fileList strict
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 13 2005 Dan Walsh <dwalsh@redhat.com> 2.1.5-1
|
||||||
|
- Update from upstream
|
||||||
|
- Allow unconfined_t to transition to rpm_script_t
|
||||||
|
|
||||||
|
* Tue Dec 13 2005 Dan Walsh <dwalsh@redhat.com> 2.1.4-2
|
||||||
|
- Clean up spec
|
||||||
|
- range_transition crond to SystemHigh
|
||||||
|
|
||||||
* Mon Dec 12 2005 Dan Walsh <dwalsh@redhat.com> 2.1.4-1
|
* Mon Dec 12 2005 Dan Walsh <dwalsh@redhat.com> 2.1.4-1
|
||||||
- Fixes for hal
|
- Fixes for hal
|
||||||
- Update to upstream
|
- Update to upstream
|
||||||
|
Loading…
Reference in New Issue
Block a user