[selinux-policy/master_contrib: 26/47] Merge branch 'master_contrib' of ssh://git.fedorahosted.org/git/selinux-policy into master_contrib

[Miroslav Grepl]

commit b2142a72a8602522e4f3001015879a8f0f442a97
Merge: bf87f6f effa730
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Mon Jan 14 09:40:02 2013 -0500

    Merge branch 'master_contrib' of ssh://git.fedorahosted.org/git/selinux-policy into master_contrib

 abrt.fc            |    1 +
 abrt.te            |    4 ++++
 accountsd.te       |    4 ----
 acct.te            |    6 ------
 afs.te             |    5 ++---
 aide.te            |    2 --
 alsa.te            |    2 --
 amanda.te          |    4 ----
 amavis.te          |    1 -
 apache.te          |   30 ++++++++++--------------------
 apcupsd.te         |    5 -----
 apm.te             |   44 ++------------------------------------------
 asterisk.te        |    2 --
 automount.te       |    2 --
 avahi.te           |    4 ----
 bind.te            |    2 --
 bitlbee.te         |    9 ---------
 blueman.te         |    3 ---
 bluetooth.te       |    4 ----
 cdrecord.te        |    3 +--
 certmonger.te      |    6 +++---
 certwatch.te       |    2 ++
 cgroup.te          |    1 -
 chronyd.te         |    4 ----
 clamav.te          |   10 ----------
 colord.te          |    2 --
 consolekit.fc      |   12 ++++++------
 consolekit.te      |    7 -------
 corosync.te        |   24 ------------------------
 cpufreqselector.te |    1 -
 cron.te            |    1 -
 cups.te            |   11 -----------
 cyrus.te           |    1 -
 dbus.te            |    2 --
 ddclient.te        |    1 -
 denyhosts.te       |    2 --
 devicekit.te       |    7 -------
 dhcp.te            |    4 ----
 djbdns.te          |    1 -
 dnsmasq.te         |    8 --------
 fail2ban.te        |    8 --------
 fetchmail.te       |    7 -------
 fprintd.te         |    5 -----
 ftp.te             |    2 +-
 glance.te          |    4 +---
 gnome.if           |    1 +
 gpg.te             |    6 ++----
 gpsd.te            |   11 -----------
 icecast.te         |    4 ----
 inetd.te           |    2 --
 inn.te             |    2 --
 jabber.te          |   12 +++---------
 kdumpgui.te        |    8 --------
 kismet.te          |    2 --
 ksmtuned.te        |    4 ----
 ldap.te            |    4 ----
 logwatch.te        |    6 ------
 mailman.te         |   12 ------------
 mandb.fc           |    2 ++
 mandb.te           |    6 ++++++
 mcelog.te          |    9 ---------
 mozilla.te         |    3 ++-
 mpd.te             |    2 --
 mrtg.te            |    2 --
 munin.fc           |    5 +++--
 munin.te           |    5 -----
 mysql.te           |    1 -
 nagios.te          |   28 ++++++++--------------------
 networkmanager.te  |    7 ++++---
 nscd.if            |    4 +++-
 nsplugin.te        |    4 ----
 numad.te           |    2 +-
 openct.te          |    2 --
 openshift.te       |    5 +----
 pegasus.te         |    6 ------
 pki.te             |    6 ------
 postfix.te         |    1 -
 ppp.te             |    1 -
 puppet.te          |   15 ++++-----------
 qpid.te            |    5 -----
 quantum.te         |    1 -
 quota.te           |   17 +++++++----------
 raid.te            |    4 ----
 rhcs.te            |   20 --------------------
 rhsmcertd.te       |    2 --
 rlogin.te          |    6 ------
 rpcbind.te         |    2 --
 rpm.te             |    6 ++----
 rtkit.te           |    3 ---
 samba.te           |    4 ----
 sambagui.te        |    4 ----
 shorewall.te       |    2 --
 smartmon.te        |    4 ----
 smoltclient.te     |    8 --------
 snmp.te            |   10 ----------
 squid.te           |   10 ----------
 sysstat.te         |    2 --
 telnet.te          |    2 --
 thumb.te           |    2 --
 tmpreaper.te       |    5 -----
 tor.te             |    3 ---
 uml.te             |    4 ----
 uucp.te            |    6 ------
 vdagent.te         |    2 --
 virt.if            |    2 +-
 virt.te            |    2 --
 vmware.te          |   12 ------------
 vnstatd.te         |    4 ----
 webadm.te          |    1 -
 webalizer.te       |    6 +-----
 wine.te            |    4 ----
 wireshark.te       |    2 --
 xen.te             |    1 -
 zabbix.te          |   12 ------------
 114 files changed, 84 insertions(+), 556 deletions(-)
---