diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index e7b960d..9afb82a 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1690,8 +1690,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po + 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=sepolgen-1.0.19 --exclude=gui --exclude=po +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=sepolgen-1.0.19 --exclude=gui --exclude=po + 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=sepolgen-1.0.19 --exclude=gui --exclude=po 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=sepolgen-1.0.19 --exclude=gui --exclude=po $ 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 diff --git a/policycoreutils.spec b/policycoreutils.spec index 02ffd91..fdc0b0c 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -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 2.0.79-3 +- Fix semanage man page + * Wed Feb 17 2010 Dan Walsh 2.0.79-2 - Fix sandbox to complain if mount-shared has not been run - Fix to use /etc/sysconfig/sandbox