rpms/selinux-policy-targeted/devel policy-20050404.patch, 1.1, 1.2 selinux-policy-targeted.spec, 1.264, 1.265

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/selinux-policy-targeted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5765

Modified Files:
	policy-20050404.patch selinux-policy-targeted.spec 
Log Message:
* Mon Apr 4 2005 Dan Walsh <dwalsh at redhat.com> 1.23.6-3
- Allow httpd to read content without builtin scripting turned on
- Remove policy.18


policy-20050404.patch:
 domains/program/ifconfig.te              |    1 
 domains/program/logrotate.te             |    5 
 domains/program/unused/NetworkManager.te |   76 +++++++++++
 domains/program/unused/apache.te         |  200 +++++++++++++++++--------------
 domains/program/unused/dhcpc.te          |    2 
 domains/program/unused/hald.te           |   20 +++
 domains/program/unused/kudzu.te          |    5 
 domains/program/unused/ntpd.te           |    2 
 domains/program/unused/pam.te            |    2 
 domains/program/unused/postgresql.te     |    8 -
 domains/program/unused/publicfile.te     |    5 
 domains/program/unused/snmpd.te          |    4 
 file_contexts/distros.fc                 |    4 
 file_contexts/program/NetworkManager.fc  |    2 
 macros/program/apache_macros.te          |   86 +++++--------
 macros/program/gift_macros.te            |    7 +
 macros/program/java_macros.te            |   10 +
 macros/program/mozilla_macros.te         |    6 
 macros/program/ssh_agent_macros.te       |    1 
 macros/user_macros.te                    |    4 
 tunables/distro.tun                      |    2 
 tunables/tunable.tun                     |   12 -
 types/network.te                         |    2 
 23 files changed, 307 insertions(+), 159 deletions(-)

Index: policy-20050404.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-targeted/devel/policy-20050404.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- policy-20050404.patch	4 Apr 2005 15:43:56 -0000	1.1
+++ policy-20050404.patch	4 Apr 2005 21:02:29 -0000	1.2
@@ -572,7 +572,7 @@
 +/usr/bin/NetworkManager	--	system_u:object_r:NetworkManager_exec_t
 diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/apache_macros.te policy-1.23.6/macros/program/apache_macros.te
 --- nsapolicy/macros/program/apache_macros.te	2005-04-04 10:21:11.000000000 -0400
-+++ policy-1.23.6/macros/program/apache_macros.te	2005-04-04 10:44:54.000000000 -0400
++++ policy-1.23.6/macros/program/apache_macros.te	2005-04-04 16:52:31.000000000 -0400
 @@ -4,14 +4,11 @@
  #This type is for webpages
  #
@@ -649,8 +649,8 @@
 +r_dir_file(httpd_t, httpd_$1_script_ro_t)
 +create_dir_file(httpd_t, httpd_$1_script_rw_t)
 +ra_dir_file(httpd_t, httpd_$1_script_ra_t)
-+r_dir_file(httpd_t, httpd_$1_content_t)
 +}
++r_dir_file(httpd_t, httpd_$1_content_t)
 +
 +')
 +define(`apache_user_domain', `


Index: selinux-policy-targeted.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-targeted/devel/selinux-policy-targeted.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- selinux-policy-targeted.spec	4 Apr 2005 18:35:38 -0000	1.264
+++ selinux-policy-targeted.spec	4 Apr 2005 21:02:29 -0000	1.265
@@ -9,7 +9,7 @@
 Summary: SELinux %{type} policy configuration
 Name: selinux-policy-%{type}
 Version: 1.23.6
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz
@@ -229,7 +229,8 @@
 exit 0
 
 %changelog
-* Mon Apr 4 2005 Dan Walsh <dwalsh at redhat.com> 1.23.6-2
+* Mon Apr 4 2005 Dan Walsh <dwalsh at redhat.com> 1.23.6-3
+- Allow httpd to read content without builtin scripting turned on
 - Remove policy.18
 
 * Mon Apr 4 2005 Dan Walsh <dwalsh at redhat.com> 1.23.6-1