- Move to upstream version which accepted my patches

This commit is contained in:
Daniel J Walsh 2006-11-17 19:21:40 +00:00
parent b28d0a788f
commit 9e4aeac9dd
4 changed files with 20 additions and 17 deletions

View File

@ -99,3 +99,4 @@ serefpolicy-2.4.1.tgz
serefpolicy-2.4.2.tgz serefpolicy-2.4.2.tgz
serefpolicy-2.4.3.tgz serefpolicy-2.4.3.tgz
serefpolicy-2.4.4.tgz serefpolicy-2.4.4.tgz
serefpolicy-2.4.5.tgz

View File

@ -44,7 +44,6 @@ interface(`TEMPLATETYPE_domtrans',`
domain_auto_trans($1,TEMPLATETYPE_exec_t,TEMPLATETYPE_t) 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:fd use;
allow TEMPLATETYPE_t $1:fifo_file rw_file_perms; allow TEMPLATETYPE_t $1:fifo_file rw_file_perms;
allow TEMPLATETYPE_t $1:process sigchld; allow TEMPLATETYPE_t $1:process sigchld;
@ -65,16 +64,16 @@ type TEMPLATETYPE_exec_t;
domain_type(TEMPLATETYPE_t) domain_type(TEMPLATETYPE_t)
init_daemon_domain(TEMPLATETYPE_t, TEMPLATETYPE_exec_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=""" te_logfile="""
# log files # log files
type TEMPLATETYPE_var_log_t; type TEMPLATETYPE_var_log_t;
logging_log_file(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=""" te_libfile="""
# var/lib files # var/lib files
type TEMPLATETYPE_var_lib_t; type TEMPLATETYPE_var_lib_t;
@ -166,19 +165,19 @@ def errorExit(error):
def write_te_file(module, pidfile, logfile, libfile, network, initsc): def write_te_file(module, pidfile, logfile, libfile, network, initsc):
file="%s.te" % module file="%s.te" % module
newte=re.sub("TEMPLATETYPE", module, te) 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: if libfile:
newte= newte + re.sub("TEMPLATETYPE", module, te_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: 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: if libfile:
newte= newte + re.sub("TEMPLATETYPE", module, te_libfile2) 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: if network:
newte= newte + re.sub("TEMPLATETYPE", module, te_network2) newte= newte + re.sub("TEMPLATETYPE", module, te_network2)
if initsc: if initsc:

View File

@ -16,8 +16,8 @@
%define CHECKPOLICYVER 1.30.11-1 %define CHECKPOLICYVER 1.30.11-1
Summary: SELinux policy configuration Summary: SELinux policy configuration
Name: selinux-policy Name: selinux-policy
Version: 2.4.4 Version: 2.4.5
Release: 3%{?dist} Release: 1%{?dist}
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Source: serefpolicy-%{version}.tgz 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 %endif
%changelog %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 * Wed Nov 15 2006 Dan Walsh <dwalsh@redhat.com> 2.4.4-2
- Fixes for nvidia driver - Fixes for nvidia driver

View File

@ -1 +1 @@
7111eb6e36de7a23ec8acf290c8fc29e serefpolicy-2.4.4.tgz c6d88e7a588fb11c9844027801bbb0f0 serefpolicy-2.4.5.tgz