rpms
/
policycoreutils
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fri Apr 29 2005 Dan Walsh <dwalsh@redhat.com> 1.23.6-2 

- Change -f flag in fixfiles to remove stuff from /tmp
- Change -F flag to pass -F flag  to restorecon/fixfiles.  (IE Force relabel).
This commit is contained in:
Daniel J Walsh 2005-04-29 14:55:24 +00:00
parent 7f5e289547
commit 60aab1a370
2 changed files with 84 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
policycoreutils-rhat.patch
View File

@ -1,15 +1,80 @@
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/load_policy/load_policy.c policycoreutils-1.23.4/load_policy/load_policy.c
--- nsapolicycoreutils/load_policy/load_policy.c 2005-04-11 16:00:46.000000000 -0400
+++ policycoreutils-1.23.4/load_policy/load_policy.c 2005-04-11 16:56:50.000000000 -0400
@@ -42,11 +42,6 @@
textdomain (PACKAGE);
#endif
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.23.6/scripts/fixfiles
--- nsapolicycoreutils/scripts/fixfiles 2005-03-15 08:44:43.000000000 -0500
+++ policycoreutils-1.23.6/scripts/fixfiles 2005-04-29 10:40:15.000000000 -0400
@@ -24,6 +24,7 @@
# Set global Variables
#
fullFlag=0
+FORCEFLAG=""
DIRS=""
RPMILES=""
OUTFILES=""
@@ -108,16 +109,16 @@
fi
if [ ! -z "$RPMFILES" ]; then
for i in `echo $RPMFILES | sed 's/,/ /g'`; do
- rpmlist $i | ${RESTORECON} ${OUTFILES} -R $1 -v -f - 2>&1 >> $LOGFILE
+ rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v -f - 2>&1 >> $LOGFILE
done
exit $?
fi
if [ ! -z "$DIRS" ]; then
- ${RESTORECON} ${OUTFILES} -R $1 -v $DIRS 2>&1 >> $LOGFILE
+ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v $DIRS 2>&1 >> $LOGFILE
exit $?
fi
LogReadOnly
-${SETFILES} ${OUTFILES} ${SYSLOGFLAG} $1 -v ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
+${SETFILES} ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $1 -v ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
exit $?
}
- if (is_selinux_enabled() <= 0 ) {
- fprintf( stderr, "%s: Requires an enabled SELinux kernel.\n", argv[0] );
- exit(1);
- }
-
while ((opt = getopt(argc, argv, "qb")) > 0) {
switch (opt) {
case 'b':
@@ -165,9 +166,9 @@
# See how we were called.
while getopts "C:Fo:R:l:" i; do
case "$i" in
- F)
- fullFlag=1
- ;;
+ f)
+ fullFlag=1
+ ;;
R)
RPMFILES=$OPTARG
;;
@@ -180,6 +181,9 @@
C)
PREFC=$OPTARG
;;
+ F)
+ FORCEFLAG="-F"
+ ;;
*)
usage
exit 1
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-1.23.6/scripts/fixfiles.8
--- nsapolicycoreutils/scripts/fixfiles.8 2005-03-15 08:44:43.000000000 -0500
+++ policycoreutils-1.23.6/scripts/fixfiles.8 2005-04-29 10:41:45.000000000 -0400
@@ -3,9 +3,9 @@
fixfiles \- fix file security contexts.
.SH "SYNOPSIS"
-.B fixfiles [ -R rpmpackagename[,rpmpackagename...] ] [ -C PREVIOUS_FILECONTEXT ] [-l logfile ] [-o outputfile ] { check | restore | [-F] relabel }"
+.B fixfiles [-F] [ -R rpmpackagename[,rpmpackagename...] ] [ -C PREVIOUS_FILECONTEXT ] [-l logfile ] [-o outputfile ] { check | restore | [-F] relabel }"
-.B fixfiles [-l logfile ] [-o outputfile ] { check | restore|[-F] relabel } [[dir/file] ... ]
+.B fixfiles [-F] [-l logfile ] [-o outputfile ] { check | restore|[-f] relabel } [[dir/file] ... ]
.SH "DESCRIPTION"
This manual page describes the
@@ -31,6 +31,10 @@
.TP
.B -F
+Force reset of context to match file_context for customizable files
+
+.TP
+.B -f
Don't prompt for removal of /tmp directory.
.TP

6
policycoreutils.spec
View File

@ -3,7 +3,7 @@
Summary: SELinux policy core utilities.
Name: policycoreutils
Version: 1.23.6
Release: 1
Release: 2
License: GPL
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@ -80,6 +80,10 @@ rm -rf ${RPM_BUILD_ROOT}
%config(noreplace) %{_sysconfdir}/sestatus.conf
%changelog
* Fri Apr 29 2005 Dan Walsh <dwalsh@redhat.com> 1.23.6-2
- Change -f flag in fixfiles to remove stuff from /tmp
- Change -F flag to pass -F flag to restorecon/fixfiles. (IE Force relabel).
* Thu Apr 14 2005 Dan Walsh <dwalsh@redhat.com> 1.23.6-1
- Update to match NSA
* Fixed signed/unsigned pointer bug in load_policy.