rpms/policycoreutils/F-12 policycoreutils-rhat.patch, 1.463, 1.464 policycoreutils.spec, 1.675, 1.676
Daniel J Walsh
dwalsh at fedoraproject.org
Mon Feb 22 18:31:33 UTC 2010
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5915
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
Log Message:
* Mon Feb 22 2010 Dan Walsh <dwalsh at redhat.com> 2.0.79-3
- Fix semanage man page
policycoreutils-rhat.patch:
Makefile | 2
audit2allow/audit2allow | 64 -
audit2allow/audit2allow.1 | 3
newrole/newrole.c | 2
restorecond/Makefile | 24
restorecond/org.selinux.Restorecond.service | 3
restorecond/restorecond.8 | 15
restorecond/restorecond.c | 429 +---------
restorecond/restorecond.conf | 5
restorecond/restorecond.desktop | 7
restorecond/restorecond.h | 19
restorecond/restorecond.init | 5
restorecond/restorecond_user.conf | 2
restorecond/user.c | 239 +++++
restorecond/watch.c | 260 ++++++
sandbox/.sandboxSKnKBc/.esd_auth | 1
sandbox/.sandboxSKnKBc/.gconf/apps/panel/applets/clock/prefs/%gconf.xml | 24
sandbox/.sandboxSKnKBc/.gconf/apps/panel/applets/window_list/prefs/%gconf.xml | 8
sandbox/.sandboxSKnKBc/.gconf/apps/panel/applets/workspace_switcher/prefs/%gconf.xml | 6
sandbox/.sandboxSKnKBc/.gconf/desktop/gnome/accessibility/keyboard/%gconf.xml | 23
sandbox/.sandboxSKnKBc/.gconf/desktop/gnome/interface/%gconf.xml | 6
sandbox/.sandboxSKnKBc/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml | 4
sandbox/.sandboxSKnKBc/.gconf/desktop/gnome/peripherals/keyboard/general/%gconf.xml | 8
sandbox/.sandboxSKnKBc/.xmodmap | 248 +++++
sandbox/Makefile | 37
sandbox/deliverables/README | 32
sandbox/deliverables/basicwrapper | 4
sandbox/deliverables/run-in-sandbox.py | 49 +
sandbox/deliverables/sandbox | 216 +++++
sandbox/sandbox | 377 ++++++++
sandbox/sandbox.8 | 50 +
sandbox/sandbox.config | 2
sandbox/sandbox.init | 67 +
sandbox/sandboxX.sh | 14
sandbox/seunshare.c | 265 ++++++
scripts/fixfiles | 20
semanage/default_encoding/Makefile | 8
semanage/default_encoding/build/lib.linux-x86_64-2.6/policycoreutils/__init__.py | 17
semanage/default_encoding/build/lib.linux-x86_64-2.6/policycoreutils/default_encoding_utf8.so |binary
semanage/default_encoding/build/temp.linux-x86_64-2.6/default_encoding.o |binary
semanage/default_encoding/default_encoding.c | 59 +
semanage/default_encoding/policycoreutils/__init__.py | 17
semanage/default_encoding/setup.py | 38
semanage/semanage | 127 ++
semanage/semanage.8 | 10
semanage/seobject.py | 406 +++++++--
semodule/semodule.8 | 6
semodule/semodule.c | 53 +
setfiles/restore.c | 101 ++
setfiles/restore.h | 4
setfiles/restorecon.8 | 7
setfiles/setfiles.8 | 3
setfiles/setfiles.c | 78 -
53 files changed, 2867 insertions(+), 607 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils-rhat.patch,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -p -r1.463 -r1.464
--- policycoreutils-rhat.patch 18 Feb 2010 15:52:36 -0000 1.463
+++ policycoreutils-rhat.patch 22 Feb 2010 18:31:31 -0000 1.464
@@ -1690,8 +1690,8 @@ diff --exclude-from=exclude --exclude=se
+
diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.79/sandbox/Makefile
--- nsapolicycoreutils/sandbox/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.79/sandbox/Makefile 2010-02-17 14:53:37.000000000 -0500
-@@ -0,0 +1,38 @@
++++ policycoreutils-2.0.79/sandbox/Makefile 2010-02-22 13:29:22.000000000 -0500
+@@ -0,0 +1,37 @@
+# Installation directories.
+PREFIX ?= ${DESTDIR}/usr
+INITDIR ?= ${DESTDIR}/etc/rc.d/init.d/
@@ -1702,7 +1702,6 @@ diff --exclude-from=exclude --exclude=se
+LOCALEDIR ?= /usr/share/locale
+SHAREDIR ?= $(PREFIX)/share/sandbox
+override CFLAGS += $(LDFLAGS) -I$(PREFIX)/include -DPACKAGE="\"policycoreutils\""
-+LDLIBS += -lselinux -lcap-ng
+
+all: sandbox seunshare sandboxX.sh
+
@@ -3456,12 +3455,12 @@ diff --exclude-from=exclude --exclude=se
+ errorExit(error.args[1])
diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.79/semanage/semanage.8
--- nsapolicycoreutils/semanage/semanage.8 2009-11-18 17:06:03.000000000 -0500
-+++ policycoreutils-2.0.79/semanage/semanage.8 2010-02-16 13:46:01.000000000 -0500
++++ policycoreutils-2.0.79/semanage/semanage.8 2010-02-22 12:53:17.000000000 -0500
@@ -19,6 +19,8 @@
.br
.B semanage fcontext \-{a|d|m} [\-frst] file_spec
.br
-+.B semanage fcontext \-{a|d|m} \-e src_path tgt_path
++.B semanage fcontext \-{a|d|m} \-e replacement target
+.br
.B semanage permissive \-{a|d} type
.br
@@ -3471,9 +3470,9 @@ diff --exclude-from=exclude --exclude=se
Remove all OBJECTS local customizations
.TP
+.I \-e, \-\-equal
-+Substitute src path for targetpath when labeling. This is used with
-+fcontext. Requires source and destination path arguments. The context
-+labeling for the destination subtree is made equivalent to that
++Substiture target path with sourcepath when generating default label. This is used with
++fcontext. Requires source and target path arguments. The context
++labeling for the target subtree is made equivalent to that
+defined for the source.
+.TP
.I \-f, \-\-ftype
@@ -3483,8 +3482,8 @@ diff --exclude-from=exclude --exclude=se
$ semanage login -a -s user_u %clerks
# Add file-context for everything under /web (used by restorecon)
$ semanage fcontext -a -t httpd_sys_content_t "/web(/.*)?"
-+# Make /home1 labeling equivalent to /home (used by restorecon)
-+$ semanage fcontext -a -e /home1 /home
++# Substitute /home1 with /home when setting file context (used by restorecon)
++$ semanage fcontext -a -e /home /home1
# Allow Apache to listen on port 81
$ semanage port -a -t http_port_t -p tcp 81
# Change apache to a permissive domain
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-12/policycoreutils.spec,v
retrieving revision 1.675
retrieving revision 1.676
diff -u -p -r1.675 -r1.676
--- policycoreutils.spec 18 Feb 2010 15:52:36 -0000 1.675
+++ policycoreutils.spec 22 Feb 2010 18:31:33 -0000 1.676
@@ -7,7 +7,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.79
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -305,6 +305,9 @@ fi
exit 0
%changelog
+* Mon Feb 22 2010 Dan Walsh <dwalsh at redhat.com> 2.0.79-3
+- Fix semanage man page
+
* Wed Feb 17 2010 Dan Walsh <dwalsh at redhat.com> 2.0.79-2
- Fix sandbox to complain if mount-shared has not been run
- Fix to use /etc/sysconfig/sandbox
More information about the scm-commits
mailing list