rpms/selinux-policy-targeted/devel policy-20051021.patch, 1.4, 1.5 selinux-policy-targeted.spec, 1.397, 1.398
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Oct 27 02:46:40 UTC 2005
Author: dwalsh
Update of /cvs/dist/rpms/selinux-policy-targeted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5168
Modified Files:
policy-20051021.patch selinux-policy-targeted.spec
Log Message:
* Wed Oct 26 2005 Dan Walsh <dwalsh at redhat.com> 1.27.2-4
- Fix reload policy in sources
policy-20051021.patch:
Makefile | 14 -
attrib.te | 18 +
domains/admin.te | 2
domains/misc/kernel.te | 2
domains/program/fsadm.te | 2
domains/program/ifconfig.te | 2
domains/program/init.te | 2
domains/program/initrc.te | 13 +
domains/program/logrotate.te | 2
domains/program/modutil.te | 8
domains/program/newrole.te | 4
domains/program/restorecon.te | 1
domains/program/setfiles.te | 2
domains/program/ssh.te | 2
domains/program/su.te | 4
domains/program/syslogd.te | 4
domains/program/tmpreaper.te | 2
domains/program/unused/NetworkManager.te | 10 +
domains/program/unused/amanda.te | 21 +-
domains/program/unused/apache.te | 15 +
domains/program/unused/apmd.te | 13 +
domains/program/unused/auditd.te | 6
domains/program/unused/bluetooth.te | 57 +++++
domains/program/unused/cups.te | 11 -
domains/program/unused/dbusd.te | 2
domains/program/unused/dhcpc.te | 3
domains/program/unused/dhcpd.te | 3
domains/program/unused/exim.te | 309 +++++++++++++++++++++++++++++++
domains/program/unused/ftpd.te | 6
domains/program/unused/hald.te | 5
domains/program/unused/hotplug.te | 5
domains/program/unused/ipsec.te | 2
domains/program/unused/kudzu.te | 3
domains/program/unused/mysqld.te | 6
domains/program/unused/named.te | 17 +
domains/program/unused/nscd.te | 1
domains/program/unused/ntpd.te | 5
domains/program/unused/pamconsole.te | 2
domains/program/unused/pegasus.te | 16 +
domains/program/unused/ping.te | 2
domains/program/unused/postfix.te | 50 +++--
domains/program/unused/postgresql.te | 11 -
domains/program/unused/pppd.te | 22 +-
domains/program/unused/rpcd.te | 16 +
domains/program/unused/rpm.te | 4
domains/program/unused/rsync.te | 3
domains/program/unused/samba.te | 3
domains/program/unused/sendmail.te | 3
domains/program/unused/snmpd.te | 1
domains/program/unused/spamd.te | 18 -
domains/program/unused/udev.te | 8
domains/program/unused/webalizer.te | 3
domains/program/unused/xdm.te | 2
domains/program/unused/yppasswdd.te | 40 ++++
file_contexts/distros.fc | 1
file_contexts/program/apache.fc | 2
file_contexts/program/backup.fc | 2
file_contexts/program/bluetooth.fc | 2
file_contexts/program/dhcpc.fc | 1
file_contexts/program/dhcpd.fc | 5
file_contexts/program/exim.fc | 18 +
file_contexts/program/ftpd.fc | 5
file_contexts/program/games.fc | 3
file_contexts/program/kudzu.fc | 2
file_contexts/program/pegasus.fc | 6
file_contexts/program/rshd.fc | 1
file_contexts/program/rsync.fc | 2
file_contexts/program/squid.fc | 3
file_contexts/program/yppasswdd.fc | 2
file_contexts/types.fc | 4
genfs_contexts | 1
macros/base_user_macros.te | 7
macros/global_macros.te | 25 --
macros/home_macros.te | 9
macros/program/chkpwd_macros.te | 7
macros/program/dbusd_macros.te | 1
macros/program/exim_macros.te | 75 +++++++
macros/program/su_macros.te | 2
macros/program/ypbind_macros.te | 1
macros/user_macros.te | 1
man/man8/ftpd_selinux.8 | 19 +
man/man8/httpd_selinux.8 | 9
man/man8/rsync_selinux.8 | 12 -
man/man8/samba_selinux.8 | 9
mcs | 194 ++++++-------------
mls | 227 ++++++++--------------
targeted/assert.te | 2
targeted/domains/program/sendmail.te | 1
targeted/domains/program/ssh.te | 2
targeted/domains/program/xdm.te | 4
targeted/domains/unconfined.te | 7
tunables/distro.tun | 2
tunables/tunable.tun | 4
types/devpts.te | 4
types/file.te | 43 +---
types/network.te | 10 -
types/nfs.te | 1
types/security.te | 2
98 files changed, 1023 insertions(+), 505 deletions(-)
Index: policy-20051021.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-targeted/devel/policy-20051021.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- policy-20051021.patch 26 Oct 2005 21:07:24 -0000 1.4
+++ policy-20051021.patch 27 Oct 2005 02:46:37 -0000 1.5
@@ -2154,7 +2154,7 @@
ifdef(`lockdev.te', `lockdev_domain($1)')
diff --exclude-from=exclude -N -u -r nsapolicy/Makefile policy-1.27.2/Makefile
--- nsapolicy/Makefile 2005-10-21 11:36:15.000000000 -0400
-+++ policy-1.27.2/Makefile 2005-10-24 14:18:52.000000000 -0400
++++ policy-1.27.2/Makefile 2005-10-26 22:42:44.000000000 -0400
@@ -27,7 +27,7 @@
GENHOMEDIRCON = $(SBINDIR)/genhomedircon
SETFILES = $(SBINDIR)/setfiles
@@ -2164,7 +2164,20 @@
KERNVERS := $(shell cat /selinux/policyvers)
MLSENABLED := $(shell cat /selinux/mls)
POLICYVER := policy.$(VERS)
-@@ -340,10 +340,10 @@
+@@ -178,11 +178,7 @@
+
+ reload tmp/load: $(LOADPATH)
+ @echo "Loading Policy ..."
+-ifeq ($(VERS), $(KERNVERS))
+- $(LOADPOLICY) $(LOADPATH)
+-else
+- $(LOADPOLICY) $(POLICYPATH)/policy.$(PREVERS)
+-endif
++ $(LOADPOLICY)
+ touch tmp/load
+
+ load: tmp/load $(FCPATH)
+@@ -340,10 +336,10 @@
done
@for file in $(USER_FILES); do \
echo "Converting $$file"; \
@@ -2177,7 +2190,7 @@
@echo "Enabling MLS in the Makefile"
@sed "s/MLS=n/MLS=y/" Makefile > Makefile.new
@mv Makefile.new Makefile
-@@ -358,7 +358,7 @@
+@@ -358,7 +354,7 @@
@for file in $(USER_FILES); do \
echo "Converting $$file"; \
sed -r -e 's/\;/ level s0 range s0;/' $$file | \
Index: selinux-policy-targeted.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-targeted/devel/selinux-policy-targeted.spec,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- selinux-policy-targeted.spec 26 Oct 2005 21:11:18 -0000 1.397
+++ selinux-policy-targeted.spec 27 Oct 2005 02:46:37 -0000 1.398
@@ -9,7 +9,7 @@
Summary: SELinux %{type} policy configuration
Name: selinux-policy-%{type}
Version: 1.27.2
-Release: 3
+Release: 4
License: GPL
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz
@@ -240,15 +240,18 @@
if [ -x /usr/sbin/selinuxenabled -a -f /etc/selinux/config ] && /usr/sbin/selinuxenabled; then
. /etc/selinux/config
MLS=`cat /selinux/mls`
- make -C %{POLICYDIR}/src/policy -W %{POLICYDIR}/src/policy/users > /dev/null 2>&1
+ make -C %{POLICYDIR}/src/policy -W users > /dev/null 2>&1
if [ "${SELINUXTYPE}" = "%{type}" -a ${MLS} -eq 1 ]; then
- make -C %{POLICYDIR}/src/policy load > /dev/null 2>&1
+ make -C %{POLICYDIR}/src/policy load > /dev/null
[ -f %{PRE_FILE_CONTEXT} ] && fixfiles -l /dev/null -C %{PRE_FILE_CONTEXT} restore && rm -f %{PRE_FILE_CONTEXT}
fi
fi
exit 0
%changelog
+* Wed Oct 26 2005 Dan Walsh <dwalsh at redhat.com> 1.27.2-4
+- Fix reload policy in sources
+
* Tue Oct 25 2005 Dan Walsh <dwalsh at redhat.com> 1.27.2-3
- Add setrans.conf
More information about the fedora-cvs-commits
mailing list