From 9e4aeac9ddc4021f9d9419257c700475cc0db242 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Nov 17 2006 19:21:40 +0000
Subject: - Move to upstream version which accepted my patches


---

diff --git a/.cvsignore b/.cvsignore
index 3841272..b1af98c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -99,3 +99,4 @@ serefpolicy-2.4.1.tgz
 serefpolicy-2.4.2.tgz
 serefpolicy-2.4.3.tgz
 serefpolicy-2.4.4.tgz
+serefpolicy-2.4.5.tgz
diff --git a/policygentool b/policygentool
index 1bc0991..1424cbb 100644
--- a/policygentool
+++ b/policygentool
@@ -44,7 +44,6 @@ interface(`TEMPLATETYPE_domtrans',`
 
 	domain_auto_trans($1,TEMPLATETYPE_exec_t,TEMPLATETYPE_t)
 
-	allow $1 TEMPLATETYPE_t:fd use;
 	allow TEMPLATETYPE_t $1:fd use;
 	allow TEMPLATETYPE_t $1:fifo_file rw_file_perms;
 	allow TEMPLATETYPE_t $1:process sigchld;
@@ -65,16 +64,16 @@ type TEMPLATETYPE_exec_t;
 domain_type(TEMPLATETYPE_t)
 init_daemon_domain(TEMPLATETYPE_t, TEMPLATETYPE_exec_t)
 """
-te_pidfile="""
-# pid files
-type TEMPLATETYPE_var_run_t;
-files_pid_file(TEMPLATETYPE_var_run_t)
-"""
 te_logfile="""
 # log files
 type TEMPLATETYPE_var_log_t;
 logging_log_file(TEMPLATETYPE_var_log_t)
 """
+te_pidfile="""
+# pid files
+type TEMPLATETYPE_var_run_t;
+files_pid_file(TEMPLATETYPE_var_run_t)
+"""
 te_libfile="""
 # var/lib files
 type TEMPLATETYPE_var_lib_t;
@@ -166,19 +165,19 @@ def errorExit(error):
 def write_te_file(module, pidfile, logfile, libfile, network, initsc):
 	file="%s.te" % module
 	newte=re.sub("TEMPLATETYPE", module, te)
-	if pidfile:
-		newte= newte + re.sub("TEMPLATETYPE", module, te_pidfile)
-	if logfile:
-		newte= newte + re.sub("TEMPLATETYPE", module, te_logfile)
 	if libfile:
 		newte= newte + re.sub("TEMPLATETYPE", module, te_libfile)
-	newte= newte + re.sub("TEMPLATETYPE", module, te_sep)
-	if pidfile:
-		newte= newte + re.sub("TEMPLATETYPE", module, te_pidfile2)
 	if logfile:
-		newte= newte + re.sub("TEMPLATETYPE", module, te_logfile2)
+		newte= newte + re.sub("TEMPLATETYPE", module, te_logfile)
+	if pidfile:
+		newte= newte + re.sub("TEMPLATETYPE", module, te_pidfile)
+	newte= newte + re.sub("TEMPLATETYPE", module, te_sep)
 	if libfile:
 		newte= newte + re.sub("TEMPLATETYPE", module, te_libfile2)
+	if logfile:
+		newte= newte + re.sub("TEMPLATETYPE", module, te_logfile2)
+	if pidfile:
+		newte= newte + re.sub("TEMPLATETYPE", module, te_pidfile2)
 	if network:
 		newte= newte + re.sub("TEMPLATETYPE", module, te_network2)
 	if initsc:
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 7158331..1f8f000 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -16,8 +16,8 @@
 %define CHECKPOLICYVER 1.30.11-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.4.4
-Release: 3%{?dist}
+Version: 2.4.5
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -351,6 +351,9 @@ semodule -b base.pp -r bootloader -r clock -r dpkg -r fstools -r hotplug -r init
 %endif
 
 %changelog
+* Wed Nov 15 2006 Dan Walsh <dwalsh@redhat.com> 2.4.5-1
+- Move to upstream version which accepted my patches
+
 * Wed Nov 15 2006 Dan Walsh <dwalsh@redhat.com> 2.4.4-2
 - Fixes for nvidia driver
 
diff --git a/sources b/sources
index 09590d4..a7edb0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7111eb6e36de7a23ec8acf290c8fc29e  serefpolicy-2.4.4.tgz
+c6d88e7a588fb11c9844027801bbb0f0  serefpolicy-2.4.5.tgz