auto-import policycoreutils-1.14.1-3 from policycoreutils-1.14.1-3.src.rpm
This commit is contained in:
cvsdist
parent
a1449eece0
commit
0ad2425731
|
|
@ -1,3 +1,15 @@
|
||||||
|
--- policycoreutils-1.14.1/setfiles/setfiles.c.rhat 2004-06-30 12:03:27.000000000 -0400
|
||||||
|
+++ policycoreutils-1.14.1/setfiles/setfiles.c 2004-07-06 16:44:21.464473808 -0400
|
||||||
|
@@ -654,7 +654,8 @@
|
||||||
|
|
||||||
|
freecon(context);
|
||||||
|
|
||||||
|
- if (outfile)
|
||||||
|
+ if (outfile &&
|
||||||
|
+ !only_changed_user(context, spec_arr[i].context))
|
||||||
|
fprintf(outfile, "%s\n", my_file);
|
||||||
|
|
||||||
|
/*
|
||||||
--- policycoreutils-1.14.1/scripts/Makefile.rhat 2004-06-30 12:03:27.000000000 -0400
|
--- policycoreutils-1.14.1/scripts/Makefile.rhat 2004-06-30 12:03:27.000000000 -0400
|
||||||
+++ policycoreutils-1.14.1/scripts/Makefile 2004-06-30 13:14:42.000000000 -0400
|
+++ policycoreutils-1.14.1/scripts/Makefile 2004-06-30 13:14:42.000000000 -0400
|
||||||
@@ -12,6 +12,7 @@
|
@@ -12,6 +12,7 @@
|
||||||
|
|
@ -9,7 +21,7 @@
|
||||||
install -m 644 fixfiles.8.gz $(MANDIR)/man8/
|
install -m 644 fixfiles.8.gz $(MANDIR)/man8/
|
||||||
|
|
||||||
--- policycoreutils-1.14.1/scripts/fixfiles.cron.rhat 2004-06-30 13:12:42.000000000 -0400
|
--- policycoreutils-1.14.1/scripts/fixfiles.cron.rhat 2004-06-30 13:12:42.000000000 -0400
|
||||||
+++ policycoreutils-1.14.1/scripts/fixfiles.cron 2004-07-06 11:35:18.896372632 -0400
|
+++ policycoreutils-1.14.1/scripts/fixfiles.cron 2004-07-06 16:12:48.000000000 -0400
|
||||||
@@ -0,0 +1,22 @@
|
@@ -0,0 +1,22 @@
|
||||||
+#!/bin/sh
|
+#!/bin/sh
|
||||||
+
|
+
|
||||||
|
|
@ -27,14 +39,14 @@
|
||||||
+if [ $? -eq 0 ]; then
|
+if [ $? -eq 0 ]; then
|
||||||
+ renice +19 -p $$ >/dev/null 2>&1
|
+ renice +19 -p $$ >/dev/null 2>&1
|
||||||
+ OUTFILE=`mktemp ${INVALIDFILE}.XXXXXXXXXX` || exit 1
|
+ OUTFILE=`mktemp ${INVALIDFILE}.XXXXXXXXXX` || exit 1
|
||||||
+ /sbin/fixfiles -o $OUTFILE $CRONTYPE
|
+ /sbin/fixfiles -l /dev/null -o $OUTFILE $CRONTYPE
|
||||||
+ mv -f $OUTFILE $INVALIDFILE
|
+ mv -f $OUTFILE $INVALIDFILE
|
||||||
+ if [ -s $INVALIDFILE ]; then
|
+ if [ -s $INVALIDFILE ]; then
|
||||||
+ mail ${MAILTO} -s "Invalid File Contexts" < $INVALIDFILE
|
+ mail ${MAILTO} -s "Invalid File Contexts" < $INVALIDFILE
|
||||||
+ fi
|
+ fi
|
||||||
+fi
|
+fi
|
||||||
--- policycoreutils-1.14.1/scripts/fixfiles.rhat 2004-06-30 13:10:21.000000000 -0400
|
--- policycoreutils-1.14.1/scripts/fixfiles.rhat 2004-06-30 13:10:21.000000000 -0400
|
||||||
+++ policycoreutils-1.14.1/scripts/fixfiles 2004-06-30 13:11:46.000000000 -0400
|
+++ policycoreutils-1.14.1/scripts/fixfiles 2004-07-06 16:29:00.000000000 -0400
|
||||||
@@ -19,25 +19,37 @@
|
@@ -19,25 +19,37 @@
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
|
|
@ -50,7 +62,7 @@
|
||||||
+rpmFiles=""
|
+rpmFiles=""
|
||||||
+outfileFlag=0
|
+outfileFlag=0
|
||||||
+OUTFILES=""
|
+OUTFILES=""
|
||||||
+LOGFILE=`mktemp /var/tmp/fixfiles.XXXXXXXXXX` || exit 1
|
+logfileFlag=0
|
||||||
+SETFILES=/usr/sbin/setfiles
|
+SETFILES=/usr/sbin/setfiles
|
||||||
+FILESYSTEMS=`mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[23]| xfs | reiserfs ).*rw/{print $3}';`
|
+FILESYSTEMS=`mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[23]| xfs | reiserfs ).*rw/{print $3}';`
|
||||||
SELINUXTYPE="targeted"
|
SELINUXTYPE="targeted"
|
||||||
|
|
@ -87,7 +99,7 @@
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
- ${SETFILES} -v ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
|
- ${SETFILES} -v ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
|
||||||
+ ${SETFILES} ${OUTFILES} ${OUTFILES} -v ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
|
+ ${SETFILES} ${OUTFILES} -v ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -152,3 +164,13 @@
|
||||||
*)
|
*)
|
||||||
usage
|
usage
|
||||||
exit 1
|
exit 1
|
||||||
|
@@ -129,6 +150,9 @@
|
||||||
|
if [ $restoreFlag = 1 ]; then
|
||||||
|
restoreLabels $rpmFiles
|
||||||
|
fi
|
||||||
|
+if [ $logfileFlag = 0 ]; then
|
||||||
|
+ LOGFILE=`mktemp /var/tmp/fixfiles.XXXXXXXXXX` || exit 1
|
||||||
|
+fi
|
||||||
|
if [ $relabelFlag = 1 ]; then
|
||||||
|
if [ $fullFlag = 1 ]; then
|
||||||
|
relabelLabels $rpmFiles
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
Summary: SELinux policy core utilities.
|
Summary: SELinux policy core utilities.
|
||||||
Name: policycoreutils
|
Name: policycoreutils
|
||||||
Version: 1.14.1
|
Version: 1.14.1
|
||||||
Release: 2
|
Release: 3
|
||||||
License: GPL
|
License: GPL
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
||||||
|
|
@ -77,6 +77,7 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Jul 6 2004 Dan Walsh <dwalsh@redhat.com> 1.14.1-2
|
* Tue Jul 6 2004 Dan Walsh <dwalsh@redhat.com> 1.14.1-2
|
||||||
- Fix fixfiles.cron to not run on non SELinux boxes
|
- Fix fixfiles.cron to not run on non SELinux boxes
|
||||||
|
- Fix several problems in fixfiles and fixfiles.cron
|
||||||
|
|
||||||
* Wed Jun 30 2004 Dan Walsh <dwalsh@redhat.com> 1.14.1-1
|
* Wed Jun 30 2004 Dan Walsh <dwalsh@redhat.com> 1.14.1-1
|
||||||
- Update from NSA
|
- Update from NSA
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue