* Wed Jan 9 2013 Miroslav Grepl <mgrepl@redhat.com> 3.12.1-1

- Mass merge with upstream
This commit is contained in:
Miroslav Grepl 2013-01-09 13:16:35 +01:00
parent e5e41801b0
commit 23a9442e40
6 changed files with 44231 additions and 32499 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
@ -444,14 +444,7 @@ cron = module
# #
# Cluster Daemon # Cluster Daemon
# #
ctdbd = module ctdb = module
# Layer: services
# Module: ctdbd
#
# ctdbd - The CTDB cluster daemon
#
ctdbd = module
# Layer: services # Layer: services
# Module: cups # Module: cups
@ -643,11 +636,11 @@ exim = module
fail2ban = module fail2ban = module
# Layer: services # Layer: services
# Module: fcoemon # Module: fcoe
# #
# fcoemon # fcoe
# #
fcoemon = module fcoe = module
# Layer: services # Layer: services
# Module: fetchmail # Module: fetchmail
@ -864,7 +857,7 @@ iscsi = module
# #
# #
# #
isnsd = module isns = module
# Layer: services # Layer: services
# Module: jabber # Module: jabber
@ -948,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

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

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -252,9 +252,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 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 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 +524,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