]> git.ipfire.org Git - people/stevee/selinux-policy.git/commit - Makefile
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy
authorMiroslav Grepl <mgrepl@redhat.com>
Sun, 10 Apr 2011 23:30:28 +0000 (23:30 +0000)
committerMiroslav Grepl <mgrepl@redhat.com>
Sun, 10 Apr 2011 23:30:28 +0000 (23:30 +0000)
commite43da3a589bb50dcf6980f5dc9c9ff20d281efe9
treecfa4e136fe4de242143c317242bc69b1917ecc76
parent8931a51f93642da8876983da8adacc8a788694ec
parent07e96fe6ec4ff65db0f5fc8e87494fe8d1f29bc6
Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy
Add Dan's patch to remove 64 bit variants.

Conflicts:
policy/modules/system/lvm.te
policy/modules/system/systemd.te
57 files changed:
Makefile
Rules.modular
policy/modules/admin/amanda.fc
policy/modules/admin/portage.fc
policy/modules/admin/tmpreaper.te
policy/modules/admin/usermanage.fc
policy/modules/admin/usermanage.te
policy/modules/apps/authbind.fc
policy/modules/apps/chrome.fc
policy/modules/apps/execmem.fc
policy/modules/apps/gnome.te
policy/modules/apps/gpg.fc
policy/modules/apps/java.fc
policy/modules/apps/mediawiki.fc
policy/modules/apps/mozilla.fc
policy/modules/apps/nsplugin.fc
policy/modules/apps/openoffice.fc
policy/modules/apps/sandbox.te
policy/modules/apps/vmware.fc
policy/modules/kernel/corecommands.fc
policy/modules/kernel/files.fc
policy/modules/services/amavis.fc
policy/modules/services/apache.fc
policy/modules/services/apm.te
policy/modules/services/colord.te
policy/modules/services/courier.fc
policy/modules/services/cups.fc
policy/modules/services/cyrus.fc
policy/modules/services/dbus.fc
policy/modules/services/dirsrv-admin.fc
policy/modules/services/inn.fc
policy/modules/services/mailman.fc
policy/modules/services/matahari.te
policy/modules/services/mta.fc
policy/modules/services/nagios.fc
policy/modules/services/nessus.fc
policy/modules/services/nis.fc
policy/modules/services/oddjob.fc
policy/modules/services/passenger.fc
policy/modules/services/postgresql.fc
policy/modules/services/rlogin.fc
policy/modules/services/squid.fc
policy/modules/services/ssh.te
policy/modules/services/sysstat.fc
policy/modules/services/ulogd.fc
policy/modules/services/xserver.fc
policy/modules/system/init.fc
policy/modules/system/init.te
policy/modules/system/ipsec.fc
policy/modules/system/libraries.fc
policy/modules/system/lvm.te
policy/modules/system/miscfiles.fc
policy/modules/system/modutils.fc
policy/modules/system/selinuxutil.fc
policy/modules/system/systemd.te
policy/modules/system/userdomain.if
policy/modules/system/xen.fc