From 110bce3a29ba1cabb7762e589340d06734d8ea83 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Mar 11 2008 22:46:00 +0000
Subject: fixes for init, rhgb. also, fix the build


---

diff --git a/policy-20071130.patch b/policy-20071130.patch
index 4775808..e9c02a4 100644
--- a/policy-20071130.patch
+++ b/policy-20071130.patch
@@ -23847,7 +23847,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
  
  	# for when /tmp/.X11-unix is created by the system
  	allow $2 xdm_t:fd use;
-@@ -542,25 +540,541 @@
+@@ -542,25 +540,542 @@
  	allow $2 xdm_tmp_t:sock_file { read write };
  	dontaudit $2 xdm_t:tcp_socket { read write };
  
@@ -23974,6 +23974,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xser
 +		type  screensaver_xext_t, unknown_xext_t, x_rootscreen_t;
 +		type disallowed_xext_t;
 +		type output_xext_t;
++		type accelgraphics_xext_t, xdm_xserver_t;
 +
 +		attribute x_server_domain, x_domain;
 +		attribute xproperty_type;
@@ -25943,7 +25944,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.i
  	')
  ')
  
-@@ -463,11 +470,12 @@
+@@ -463,11 +470,13 @@
  interface(`init_telinit',`
  	gen_require(`
  		type initctl_t;
@@ -25954,6 +25955,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.i
  	allow $1 initctl_t:fifo_file rw_fifo_file_perms;
 -
 +	allow $1 init_t:unix_dgram_socket sendto;
++	allow init_t $1:unix_dgram_socket sendto;
  	init_exec($1)
  ')
  
diff --git a/policy-init.patch b/policy-init.patch
new file mode 100644
index 0000000..c78ab07
--- /dev/null
+++ b/policy-init.patch
@@ -0,0 +1,11 @@
+diff -up serefpolicy-3.3.1/policy/modules/services/rhgb.te.foo serefpolicy-3.3.1/policy/modules/services/rhgb.te
+--- serefpolicy-3.3.1/policy/modules/services/rhgb.te.foo	2008-03-11 17:50:18.000000000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/rhgb.te	2008-03-11 17:50:18.000000000 -0400
+@@ -92,6 +92,7 @@ term_use_ptmx(rhgb_t)
+ term_getattr_pty_fs(rhgb_t)
+ 
+ init_write_initctl(rhgb_t)
++init_chat(rhgb_t)
+ 
+ libs_use_ld_so(rhgb_t)
+ libs_use_shared_libs(rhgb_t)
diff --git a/selinux-policy.spec b/selinux-policy.spec
index e9df41b..673ae00 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -17,11 +17,12 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.3.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
 patch: policy-20071130.patch
+Patch2: policy-init.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -179,6 +180,7 @@ Based off of reference policy: Checked out revision 2624.
 %prep 
 %setup -n serefpolicy-%{version} -q
 %patch -p1
+%patch2 -p1
 
 %install
 # Build targeted policy
@@ -388,6 +390,10 @@ exit 0
 %endif
 
 %changelog
+* Tue Mar 11 2008 Bill Nottingham <notting@redhat.com> 3.3.1-14
+- fixes for init policy (#436988)
+- fix build
+
 * Mon Mar 10 2008 Dan Walsh <dwalsh@redhat.com> 3.3.1-13
 - Additional changes for MLS policy