* Thu May 27 2010 Dan Walsh <dwalsh@redhat.com> 2.0.82-24
- Man page fixes - sandbox fixes Resolves: #595796 - Move seunshare to base package
This commit is contained in:
Daniel J Walsh
parent
1097da1cdb
commit
1cd1e852d8
|
|
@ -1595,8 +1595,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
|
|||
+relabel:
|
||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.82/sandbox/sandbox
|
||||
--- nsapolicycoreutils/sandbox/sandbox 1969-12-31 19:00:00.000000000 -0500
|
||||
+++ policycoreutils-2.0.82/sandbox/sandbox 2010-05-19 15:44:55.000000000 -0400
|
||||
@@ -0,0 +1,430 @@
|
||||
+++ policycoreutils-2.0.82/sandbox/sandbox 2010-05-27 13:53:57.000000000 -0400
|
||||
@@ -0,0 +1,426 @@
|
||||
+#! /usr/bin/python -E
|
||||
+# Authors: Dan Walsh <dwalsh@redhat.com>
|
||||
+# Authors: Josh Cogliati
|
||||
|
|
@ -1772,10 +1772,6 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
|
|||
+ if not os.path.exists("/usr/sbin/seunshare"):
|
||||
+ raise ValueError(_("""
|
||||
+/usr/sbin/seunshare is required for the action you want to perform.
|
||||
+Install seunshare by executing:
|
||||
+
|
||||
+# yum install /usr/sbin/seunshare
|
||||
+
|
||||
+"""))
|
||||
+
|
||||
+ def __mount_callback(self, option, opt, value, parser):
|
||||
|
|
@ -1842,9 +1838,9 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
|
|||
+ def __parse_options(self):
|
||||
+ from optparse import OptionParser
|
||||
+ usage = _("""
|
||||
+sandbox [-h] [-[X|M] [-l level ] [-H homedir] [-T tempdir]] [-I includefile ] [-W windowmanager ] [[-i file ] ...] [ -t type ] command
|
||||
+sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [-W windowmanager ] [[-i file ] ...] [ -t type ] command
|
||||
+
|
||||
+sandbox [-h] [-[X|M] [-l level ] [-H homedir] [-T tempdir]] [-I includefile ] [-W windowmanager ] [[-i file ] ...] [ -t type ] -S
|
||||
+sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [-W windowmanager ] [[-i file ] ...] [ -t type ] -S
|
||||
+""")
|
||||
+
|
||||
+ parser = OptionParser(version=self.VERSION, usage=usage)
|
||||
|
|
@ -2029,8 +2025,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
|
|||
+ sys.exit(rc)
|
||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.82/sandbox/sandbox.8
|
||||
--- nsapolicycoreutils/sandbox/sandbox.8 1969-12-31 19:00:00.000000000 -0500
|
||||
+++ policycoreutils-2.0.82/sandbox/sandbox.8 2010-05-21 08:13:10.000000000 -0400
|
||||
@@ -0,0 +1,61 @@
|
||||
+++ policycoreutils-2.0.82/sandbox/sandbox.8 2010-05-27 13:42:03.000000000 -0400
|
||||
@@ -0,0 +1,64 @@
|
||||
+.TH SANDBOX "8" "May 2010" "sandbox" "User Commands"
|
||||
+.SH NAME
|
||||
+sandbox \- Run cmd under an SELinux sandbox
|
||||
|
|
@ -2075,6 +2071,9 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
|
|||
+\fB\-T\ tmpdir
|
||||
+Use alternate tempory directory to mount on /tmp. Defaults to tmpfs. Requires -X or -M.
|
||||
+.TP
|
||||
+\fB\-S
|
||||
+Run a full desktop session, Requires level, and home and tmpdir.
|
||||
+.TP
|
||||
+\fB\-W windowmanager\fR
|
||||
+Select alternative window manager to run within
|
||||
+.B sandbox -X.
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
Summary: SELinux policy core utilities
|
||||
Name: policycoreutils
|
||||
Version: 2.0.82
|
||||
Release: 23%{?dist}
|
||||
Release: 24%{?dist}
|
||||
License: GPLv2+
|
||||
Group: System Environment/Base
|
||||
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
||||
|
|
@ -144,7 +144,6 @@ The policycoreutils-python package contains the management tools use to manage a
|
|||
%{_mandir}/man8/genhomedircon.8*
|
||||
%{_mandir}/man8/sandbox.8*
|
||||
%{_mandir}/man8/semanage.8*
|
||||
%{_mandir}/man8/seunshare.8*
|
||||
%{_mandir}/ru/man8/semanage.8*
|
||||
|
||||
%post python
|
||||
|
|
@ -165,10 +164,6 @@ The policycoreutils-python package contains the scripts to create graphical sand
|
|||
|
||||
%files sandbox
|
||||
%defattr(-,root,root,-)
|
||||
%{_sysconfdir}/rc.d/init.d/sandbox
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/sandbox
|
||||
%{_sysconfdir}/sysconfig/sandbox
|
||||
%{_sbindir}/seunshare
|
||||
%{_datadir}/sandbox/sandboxX.sh
|
||||
|
||||
%triggerin python -- selinux-policy
|
||||
|
|
@ -241,6 +236,7 @@ rm -rf %{buildroot}
|
|||
/sbin/fixfiles
|
||||
/sbin/setfiles
|
||||
/sbin/load_policy
|
||||
%{_sbindir}/seunshare
|
||||
%{_sbindir}/genhomedircon
|
||||
%{_sbindir}/load_policy
|
||||
%{_sbindir}/restorecond
|
||||
|
|
@ -254,6 +250,8 @@ rm -rf %{buildroot}
|
|||
%{_bindir}/semodule_expand
|
||||
%{_bindir}/semodule_link
|
||||
%{_bindir}/semodule_package
|
||||
%{_sysconfdir}/rc.d/init.d/sandbox
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/sandbox
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/newrole
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/run_init
|
||||
%config(noreplace) %{_sysconfdir}/sestatus.conf
|
||||
|
|
@ -293,6 +291,7 @@ rm -rf %{buildroot}
|
|||
%{_mandir}/ru/man8/setsebool.8*
|
||||
%{_mandir}/man1/secon.1*
|
||||
%{_mandir}/ru/man1/secon.1*
|
||||
%{_mandir}/man8/seunshare.8*
|
||||
|
||||
%preun
|
||||
if [ $1 -eq 0 ]; then
|
||||
|
|
@ -312,10 +311,17 @@ fi
|
|||
exit 0
|
||||
|
||||
%changelog
|
||||
* Thu May 27 2010 Dan Walsh <dwalsh@redhat.com> 2.0.82-24
|
||||
- Man page fixes
|
||||
- sandbox fixes
|
||||
Resolves: #595796
|
||||
- Move seunshare to base package
|
||||
|
||||
* Fri May 21 2010 Dan Walsh <dwalsh@redhat.com> 2.0.82-23
|
||||
- Fix seunshare translations
|
||||
- Fix seunshare to work on all arches
|
||||
- Fix icon for system-config-selinux
|
||||
Resolves: #595276
|
||||
|
||||
* Fri May 21 2010 Dan Walsh <dwalsh@redhat.com> 2.0.82-22
|
||||
- Fix can_exec definition in sepolgen
|
||||
|
|
|
|||
Loading…
Reference in New Issue