diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index a544ba1..15c2348 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,3 +1,15 @@ +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.33.12/audit2allow/audit2allow.1 +--- nsapolicycoreutils/audit2allow/audit2allow.1 2006-11-16 17:14:29.000000000 -0500 ++++ policycoreutils-1.33.12/audit2allow/audit2allow.1 2007-01-12 10:58:14.000000000 -0500 +@@ -24,7 +24,7 @@ + .\" + .TH AUDIT2ALLOW "1" "January 2005" "Security Enhanced Linux" NSA + .SH NAME +-audit2allow \- generate policy allow rules from logs of denied operations ++audit2allow \- generate SELinux policy allow rules from logs of denied operations + .SH SYNOPSIS + .B audit2allow + .RI [ options "] " diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.12/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 +++ policycoreutils-1.33.12/gui/booleansPage.py 2007-01-11 14:12:49.000000000 -0500 @@ -4841,6 +4853,17 @@ diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*. + except ValueError, e: + self.error(e.args[0]) + +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/load_policy/load_policy.8 policycoreutils-1.33.12/load_policy/load_policy.8 +--- nsapolicycoreutils/load_policy/load_policy.8 2006-11-16 17:14:31.000000000 -0500 ++++ policycoreutils-1.33.12/load_policy/load_policy.8 2007-01-12 10:57:30.000000000 -0500 +@@ -1,6 +1,6 @@ + .TH LOAD_POLICY "8" "May 2003" "Security Enhanced Linux" NSA + .SH NAME +-load_policy \- load a new policy into the kernel ++load_policy \- load a new SELinux policy into the kernel + + .SH SYNOPSIS + .B load_policy diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.12/Makefile --- nsapolicycoreutils/Makefile 2006-11-16 17:15:00.000000000 -0500 +++ policycoreutils-1.33.12/Makefile 2007-01-11 14:12:50.000000000 -0500 @@ -4850,6 +4873,39 @@ diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*. all install relabel clean indent: @for subdir in $(SUBDIRS); do \ +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/newrole/newrole.1 policycoreutils-1.33.12/newrole/newrole.1 +--- nsapolicycoreutils/newrole/newrole.1 2006-11-16 17:14:32.000000000 -0500 ++++ policycoreutils-1.33.12/newrole/newrole.1 2007-01-12 10:58:07.000000000 -0500 +@@ -1,6 +1,6 @@ + .TH NEWROLE "1" "October 2000" "Security Enhanced Linux" NSA + .SH NAME +-newrole \- run a shell with a new role ++newrole \- run a shell with a new SELinux role + .SH SYNOPSIS + .B newrole + [\fB-r\fR|\fB--role\fR] +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecon/restorecon.8 policycoreutils-1.33.12/restorecon/restorecon.8 +--- nsapolicycoreutils/restorecon/restorecon.8 2006-11-16 17:14:26.000000000 -0500 ++++ policycoreutils-1.33.12/restorecon/restorecon.8 2007-01-12 10:57:01.000000000 -0500 +@@ -1,6 +1,6 @@ + .TH "restorecon" "8" "2002031409" "" "" + .SH "NAME" +-restorecon \- set file security contexts. ++restorecon \- restore file(s) default SELinux security contexts. + + .SH "SYNOPSIS" + .B restorecon +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-1.33.12/restorecond/restorecond.8 +--- nsapolicycoreutils/restorecond/restorecond.8 2006-11-16 17:14:28.000000000 -0500 ++++ policycoreutils-1.33.12/restorecond/restorecond.8 2007-01-12 10:57:25.000000000 -0500 +@@ -1,6 +1,6 @@ + .TH "restorecond" "8" "2002031409" "" "" + .SH "NAME" +-restorecond \- daemon that watches for file creation and then corrects file context ++restorecond \- daemon that watches for file creation and then sets the default SELinux file context + + .SH "SYNOPSIS" + .B restorecond [\-d] diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.12/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2006-11-16 17:14:28.000000000 -0500 +++ policycoreutils-1.33.12/restorecond/restorecond.c 2007-01-11 14:12:50.000000000 -0500 @@ -4888,6 +4944,62 @@ diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*. /etc/samba/secrets.tdb /etc/mtab /var/run/utmp +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/run_init/run_init.8 policycoreutils-1.33.12/run_init/run_init.8 +--- nsapolicycoreutils/run_init/run_init.8 2006-11-16 17:14:27.000000000 -0500 ++++ policycoreutils-1.33.12/run_init/run_init.8 2007-01-12 10:56:18.000000000 -0500 +@@ -1,6 +1,6 @@ + .TH RUN_INIT "8" "May 2003" "Security Enhanced Linux" NSA + .SH NAME +-run_init \- run an init script in the proper context ++run_init \- run an init script in the proper SELinux context + .SH SYNOPSIS + .B run_init + \fISCRIPT\fR [[\fIARGS\fR]...] +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/chcat.8 policycoreutils-1.33.12/scripts/chcat.8 +--- nsapolicycoreutils/scripts/chcat.8 2006-11-16 17:14:27.000000000 -0500 ++++ policycoreutils-1.33.12/scripts/chcat.8 2007-01-12 10:56:09.000000000 -0500 +@@ -1,6 +1,6 @@ + .TH CHCAT "8" "September 2005" "chcat" "User Commands" + .SH NAME +-chcat \- change file security category ++chcat \- change file SELinux security category + .SH SYNOPSIS + .B chcat + \fICATEGORY FILE\fR... +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-1.33.12/scripts/fixfiles.8 +--- nsapolicycoreutils/scripts/fixfiles.8 2006-11-16 17:14:27.000000000 -0500 ++++ policycoreutils-1.33.12/scripts/fixfiles.8 2007-01-12 10:56:04.000000000 -0500 +@@ -1,6 +1,6 @@ + .TH "fixfiles" "8" "2002031409" "" "" + .SH "NAME" +-fixfiles \- fix file security contexts. ++fixfiles \- fix file SELinux security contexts. + + .SH "SYNOPSIS" + .B fixfiles [-F] [ -R rpmpackagename[,rpmpackagename...] ] [ -C PREVIOUS_FILECONTEXT ] [-l logfile ] [-o outputfile ] { check | restore | [-F] relabel | verify }" +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/genhomedircon.8 policycoreutils-1.33.12/scripts/genhomedircon.8 +--- nsapolicycoreutils/scripts/genhomedircon.8 2006-11-20 12:19:55.000000000 -0500 ++++ policycoreutils-1.33.12/scripts/genhomedircon.8 2007-01-12 10:55:56.000000000 -0500 +@@ -24,7 +24,7 @@ + .\" + .TH GENHOMEDIRCON "8" "January 2005" "Security Enhanced Linux" "" + .SH NAME +-genhomedircon \- generate file context configuration entries for user home directories ++genhomedircon \- generate SELinux file context configuration entries for user home directories + .SH SYNOPSIS + .B genhomedircon [ -d selinuxdir ] [-n | --nopasswd] [-t selinuxtype ] [-h] + +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/secon/secon.1 policycoreutils-1.33.12/secon/secon.1 +--- nsapolicycoreutils/secon/secon.1 2006-11-16 17:14:31.000000000 -0500 ++++ policycoreutils-1.33.12/secon/secon.1 2007-01-12 10:58:00.000000000 -0500 +@@ -1,6 +1,6 @@ + .TH SECON "1" "April 2006" "Security Enhanced Linux" NSA + .SH NAME +-secon \- See a context, from a file, program or user input. ++secon \- See an SELinux context, from a file, program or user input. + .SH SYNOPSIS + .B secon + [\fB-hVurtscmPRfLp\fR] diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.33.12/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2006-11-16 17:14:26.000000000 -0500 +++ policycoreutils-1.33.12/semanage/semanage 2007-01-11 14:12:50.000000000 -0500 @@ -5070,3 +5182,25 @@ diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*. ddict = self.get_all() keys = ddict.keys() for k in keys: +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semodule_deps/semodule_deps.8 policycoreutils-1.33.12/semodule_deps/semodule_deps.8 +--- nsapolicycoreutils/semodule_deps/semodule_deps.8 2006-11-16 17:14:31.000000000 -0500 ++++ policycoreutils-1.33.12/semodule_deps/semodule_deps.8 2007-01-12 10:55:43.000000000 -0500 +@@ -1,6 +1,6 @@ + .TH SEMODULE_DEPS "8" "June 2006" "Security Enhanced Linux" NSA + .SH NAME +-semodule_deps \- show the dependencies between policy packages. ++semodule_deps \- show the dependencies between SELinux policy packages. + + .SH SYNOPSIS + .B semodule_deps [-v -g -b] basemodpkg modpkg1 [modpkg2 ... ] +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-1.33.12/setfiles/setfiles.8 +--- nsapolicycoreutils/setfiles/setfiles.8 2006-11-16 17:15:00.000000000 -0500 ++++ policycoreutils-1.33.12/setfiles/setfiles.8 2007-01-12 10:55:31.000000000 -0500 +@@ -1,6 +1,6 @@ + .TH "setfiles" "8" "2002031409" "" "" + .SH "NAME" +-setfiles \- set file security contexts. ++setfiles \- set file SELinux security contexts. + + .SH "SYNOPSIS" + .B setfiles diff --git a/policycoreutils.spec b/policycoreutils.spec index 91bcc77..ef714b9 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.33.12 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -168,6 +168,10 @@ fi [ -x /sbin/service ] && /sbin/service restorecond condrestart > /dev/null %changelog +* Fri Jan 12 2007 Dan Walsh 1.33.12-2 +- Update man pages by adding SELinux to header to fix apropos database +Resolves: #217881 + * Tue Jan 9 2007 Dan Walsh 1.33.12-1 - Want to update to match api - Update to upstream