Merge branch 'master' of ssh://pkgs.fedoraproject.org/selinux-policy

Conflicts:
	selinux-policy.spec
This commit is contained in:
Dan Walsh 2013-01-15 11:54:07 -05:00
commit afbf138ed9
8 changed files with 44275 additions and 32493 deletions

View File

@ -290,7 +290,7 @@ comsat = module
# #
# ConsoleKit is a system daemon for tracking what users are logged # ConsoleKit is a system daemon for tracking what users are logged
# #
consolekit = module #consolekit = module
# Layer: services # Layer: services
# Module: corosync # Module: corosync

View File

@ -395,7 +395,7 @@ condor = module
# #
# ConsoleKit is a system daemon for tracking what users are logged # ConsoleKit is a system daemon for tracking what users are logged
# #
consolekit = module #consolekit = module
# Layer: services # Layer: services
# Module: corosync # Module: corosync
@ -440,11 +440,10 @@ cpufreqselector = module
cron = module cron = module
# Layer: services # Layer: services
# Module: ctdb # Module: ctdbd
# #
# Cluster Daemon # Cluster Daemon
# #
ctdb = module ctdb = module
# Layer: services # Layer: services
@ -732,7 +731,7 @@ glance = module
# #
# policy for glusterd service # policy for glusterd service
# #
glusterfs = module glusterd = module
# Layer: services # Layer: services
# Module: gnomeclock # Module: gnomeclock
@ -942,7 +941,7 @@ ktalk = module
# #
# Layer 2 Tunnelling Protocol Daemon # Layer 2 Tunnelling Protocol Daemon
# #
l2tpd = module l2tp = module
# Layer: services # Layer: services
# Module: ldap # Module: ldap
@ -1140,6 +1139,13 @@ munin = module
# #
mysql = module mysql = module
# Layer: contrib
# Module: mythtv
#
# Policy for Mythtv (Web Server)
#
mythtv = module
# Layer: services # Layer: services
# Module: nagios # Module: nagios
# #

View File

@ -390,7 +390,7 @@ clock = module
# #
# ConsoleKit is a system daemon for tracking what users are logged # ConsoleKit is a system daemon for tracking what users are logged
# #
consolekit = module #consolekit = module
# Layer: admin # Layer: admin
# Module: consoletype # Module: consoletype

View File

@ -1 +1,17 @@
policy_module(permissivedomains,19) policy_module(permissivedomains,19)
optional_policy(`
gen_require(`
type systemd_localed_t;
')
permissive systemd_localed_t;
')
optional_policy(`
gen_require(`
type httpd_mythtv_script_t;
')
permissive httpd_mythtv_script_t;
')

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -13,13 +13,21 @@
%if %{?BUILD_MLS:0}%{!?BUILD_MLS:1} %if %{?BUILD_MLS:0}%{!?BUILD_MLS:1}
%define BUILD_MLS 1 %define BUILD_MLS 1
%endif %endif
<<<<<<< HEAD
%define POLICYVER 29 %define POLICYVER 29
%define POLICYCOREUTILSVER 2.1.13-34 %define POLICYCOREUTILSVER 2.1.13-34
||||||| merged common ancestors
%define POLICYVER 28
%define POLICYCOREUTILSVER 2.1.13-34
=======
%define POLICYVER 29
%define POLICYCOREUTILSVER 2.1.13-53
>>>>>>> fa970c32f1409d9b0322c292f1e89b2028368e3b
%define CHECKPOLICYVER 2.1.11-3 %define CHECKPOLICYVER 2.1.11-3
Summary: SELinux policy configuration Summary: SELinux policy configuration
Name: selinux-policy Name: selinux-policy
Version: 3.11.1 Version: 3.12.1
Release: 69.1%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
Source: serefpolicy-%{version}.tgz Source: serefpolicy-%{version}.tgz
@ -252,9 +260,9 @@ fi;
. %{_sysconfdir}/selinux/config; \ . %{_sysconfdir}/selinux/config; \
if [ -e /etc/selinux/%2/.rebuild ]; then \ if [ -e /etc/selinux/%2/.rebuild ]; then \
rm /etc/selinux/%2/.rebuild; \ rm /etc/selinux/%2/.rebuild; \
(cd /etc/selinux/%2/modules/active/modules; rm -f ctdbd.pp fcoemon.pp glusterd.pp isnsd.pp qemu.pp nsplugin.pp razor.pp pyzord.pp phpfpm.pp hotplug.pp consoletype.pp kudzu.pp howl.pp) \ (cd /etc/selinux/%2/modules/active/modules; rm -f consolekit.pp ctdbd.pp fcoemon.pp isnsd.pp l2tpd.pp qemu.pp nsplugin.pp razor.pp pyzord.pp phpfpm.pp hotplug.pp consoletype.pp kudzu.pp howl.pp) \
if [ %1 -ne 1 ]; then \ if [ %1 -ne 1 ]; then \
/usr/sbin/semodule -n -s %2 -r matahari xfs kudzu kerneloops execmem openoffice ada tzdata hal hotplug howl java mono moilscanner gamin audio_entropy audioentropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal passanger qpidd pyzor razor pki-selinux phpfpm consoletype ctdbd fcoemon glusterd isnsd 2>/dev/null; \ /usr/sbin/semodule -n -s %2 -r matahari xfs kudzu kerneloops execmem openoffice ada tzdata hal hotplug howl java mono moilscanner gamin audio_entropy audioentropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal passanger qpidd pyzor razor pki-selinux phpfpm consoletype ctdbd fcoemon isnsd l2tp consolekit 2>/dev/null; \
fi \ fi \
/usr/sbin/semodule -B -n -s %2; \ /usr/sbin/semodule -B -n -s %2; \
else \ else \
@ -524,6 +532,9 @@ SELinux Reference policy mls base module.
%endif %endif
%changelog %changelog
* Wed Jan 9 2013 Miroslav Grepl <mgrepl@redhat.com> 3.12.1-1
- Mass merge with upstream
* Sat Jan 5 2013 Dan Walsh <dwalsh@redhat.com> 3.11.1-69.1 * Sat Jan 5 2013 Dan Walsh <dwalsh@redhat.com> 3.11.1-69.1
- Bump the policy version to 28 to match selinux userspace - Bump the policy version to 28 to match selinux userspace
- Rebuild versus latest libsepol - Rebuild versus latest libsepol

View File

@ -1,3 +1,3 @@
ee1c09715a7b04a16aa2e7004703b72a serefpolicy-3.11.1.tgz 6acb2ca4d59b3883eaee9cac5b5d57d9 serefpolicy-3.12.1.tgz
8637c3e6add4e83a882c5cea26625257 serefpolicy-contrib-3.11.1.tgz 59575158d23f6eb99eedcd50cc01439a serefpolicy-contrib-3.12.1.tgz
c107c73fcdf6cd137d2e79ce07d15601 config.tgz c107c73fcdf6cd137d2e79ce07d15601 config.tgz