- Eliminate vbetool duplicate entry

This commit is contained in:
Daniel J Walsh 2008-07-25 04:24:01 +00:00
parent 599e9756ef
commit f12d5b90db
2 changed files with 9 additions and 4 deletions

View File

@ -7904,7 +7904,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storag
## SELinux protections for filesystem objects, and ## SELinux protections for filesystem objects, and
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-3.5.1/policy/modules/kernel/terminal.if diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-3.5.1/policy/modules/kernel/terminal.if
--- nsaserefpolicy/policy/modules/kernel/terminal.if 2008-06-12 23:25:03.000000000 -0400 --- nsaserefpolicy/policy/modules/kernel/terminal.if 2008-06-12 23:25:03.000000000 -0400
+++ serefpolicy-3.5.1/policy/modules/kernel/terminal.if 2008-07-24 06:54:04.000000000 -0400 +++ serefpolicy-3.5.1/policy/modules/kernel/terminal.if 2008-07-25 00:21:45.000000000 -0400
@@ -525,11 +525,13 @@ @@ -525,11 +525,13 @@
interface(`term_use_generic_ptys',` interface(`term_use_generic_ptys',`
gen_require(` gen_require(`
@ -32052,7 +32052,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
+') +')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.1/policy/modules/system/selinuxutil.te diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-3.5.1/policy/modules/system/selinuxutil.te
--- nsaserefpolicy/policy/modules/system/selinuxutil.te 2008-07-10 11:38:46.000000000 -0400 --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2008-07-10 11:38:46.000000000 -0400
+++ serefpolicy-3.5.1/policy/modules/system/selinuxutil.te 2008-07-24 06:54:05.000000000 -0400 +++ serefpolicy-3.5.1/policy/modules/system/selinuxutil.te 2008-07-25 00:23:26.000000000 -0400
@@ -23,6 +23,9 @@ @@ -23,6 +23,9 @@
type selinux_config_t; type selinux_config_t;
files_type(selinux_config_t) files_type(selinux_config_t)
@ -32256,7 +32256,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
# cjp: need a more general way to handle this: # cjp: need a more general way to handle this:
ifdef(`enable_mls',` ifdef(`enable_mls',`
# read secadm tmp files # read secadm tmp files
@@ -514,121 +486,40 @@ @@ -514,121 +486,42 @@
# Handle pp files created in homedir and /tmp # Handle pp files created in homedir and /tmp
sysadm_read_home_content_files(semanage_t) sysadm_read_home_content_files(semanage_t)
sysadm_read_tmp_files(semanage_t) sysadm_read_tmp_files(semanage_t)
@ -32383,6 +32383,8 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinu
- udev_dontaudit_rw_dgram_sockets(setfiles_t) - udev_dontaudit_rw_dgram_sockets(setfiles_t)
- ') - ')
+seutil_setfiles(setfiles_t) +seutil_setfiles(setfiles_t)
+# During boot in Rawhide
+term_use_generic_ptys(setfiles_t)
- # cjp: cover up stray file descriptors. - # cjp: cover up stray file descriptors.
- optional_policy(` - optional_policy(`

View File

@ -17,7 +17,7 @@
Summary: SELinux policy configuration Summary: SELinux policy configuration
Name: selinux-policy Name: selinux-policy
Version: 3.5.1 Version: 3.5.1
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
Source: serefpolicy-%{version}.tgz Source: serefpolicy-%{version}.tgz
@ -375,6 +375,9 @@ exit 0
%endif %endif
%changelog %changelog
* Thu Jul 25 2008 Dan Walsh <dwalsh@redhat.com> 3.5.1-2
- Eliminate vbetool duplicate entry
* Wed Jul 16 2008 Dan Walsh <dwalsh@redhat.com> 3.5.1-1 * Wed Jul 16 2008 Dan Walsh <dwalsh@redhat.com> 3.5.1-1
- Fix xguest -> xguest_mozilla_t -> xguest_openiffice_t - Fix xguest -> xguest_mozilla_t -> xguest_openiffice_t
- Change dhclient to be able to red networkmanager_var_run - Change dhclient to be able to red networkmanager_var_run