* Wed Feb 2 2005 Dan Walsh <dwalsh@redhat.com> 1.21.10-2
- More cleanup of fixfiles sed patch
This commit is contained in:
Daniel J Walsh
parent
41933ac0b5
commit
859013f3be
@ -1,6 +1,92 @@
|
||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/debugfiles.list policycoreutils-1.21.10/debugfiles.list
|
||||
--- nsapolicycoreutils/debugfiles.list 1969-12-31 19:00:00.000000000 -0500
|
||||
+++ policycoreutils-1.21.10/debugfiles.list 2005-02-02 12:17:23.000000000 -0500
|
||||
@@ -0,0 +1,8 @@
|
||||
+/usr/lib/debug/sbin/restorecon.debug
|
||||
+/usr/lib/debug/usr/sbin/setfiles.debug
|
||||
+/usr/lib/debug/usr/sbin/open_init_pty.debug
|
||||
+/usr/lib/debug/usr/sbin/sestatus.debug
|
||||
+/usr/lib/debug/usr/sbin/run_init.debug
|
||||
+/usr/lib/debug/usr/sbin/load_policy.debug
|
||||
+/usr/lib/debug/usr/bin/newrole.debug
|
||||
+/usr/src/debug/policycoreutils-1.21.10
|
||||
Binary files nsapolicycoreutils/debugsources.list and policycoreutils-1.21.10/debugsources.list differ
|
||||
Binary files nsapolicycoreutils/load_policy/load_policy and policycoreutils-1.21.10/load_policy/load_policy differ
|
||||
Binary files nsapolicycoreutils/newrole/newrole and policycoreutils-1.21.10/newrole/newrole differ
|
||||
Binary files nsapolicycoreutils/po/sv.gmo and policycoreutils-1.21.10/po/sv.gmo differ
|
||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/policycoreutils.lang policycoreutils-1.21.10/policycoreutils.lang
|
||||
--- nsapolicycoreutils/policycoreutils.lang 1969-12-31 19:00:00.000000000 -0500
|
||||
+++ policycoreutils-1.21.10/policycoreutils.lang 2005-02-02 12:17:22.000000000 -0500
|
||||
@@ -0,0 +1,65 @@
|
||||
+%defattr (644, root, root, 755)
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+%lang(sv) /usr/share/locale/sv/LC_MESSAGES/policycoreutils.mo
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
Binary files nsapolicycoreutils/restorecon/restorecon and policycoreutils-1.21.10/restorecon/restorecon differ
|
||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.8 policycoreutils-1.21.10/restorecon/restorecon.8
|
||||
--- nsapolicycoreutils/restorecon/restorecon.8 2005-01-20 15:59:21.000000000 -0500
|
||||
+++ policycoreutils-1.21.10/restorecon/restorecon.8 2005-02-02 12:16:06.000000000 -0500
|
||||
+++ policycoreutils-1.21.10/restorecon/restorecon.8 2005-02-02 12:17:10.000000000 -0500
|
||||
@@ -4,10 +4,10 @@
|
||||
|
||||
.SH "SYNOPSIS"
|
||||
@ -26,7 +112,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.8
|
||||
.TP
|
||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.21.10/restorecon/restorecon.c
|
||||
--- nsapolicycoreutils/restorecon/restorecon.c 2005-01-31 09:49:15.000000000 -0500
|
||||
+++ policycoreutils-1.21.10/restorecon/restorecon.c 2005-02-02 12:16:49.000000000 -0500
|
||||
+++ policycoreutils-1.21.10/restorecon/restorecon.c 2005-02-02 12:17:10.000000000 -0500
|
||||
@@ -10,6 +10,7 @@
|
||||
* USAGE:
|
||||
* restorecon [-Rnv] pathname...
|
||||
@ -145,9 +231,12 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c
|
||||
case 'o':
|
||||
outfile = fopen(optarg,"w");
|
||||
if (!outfile) {
|
||||
Binary files nsapolicycoreutils/restorecon/restorecon.o and policycoreutils-1.21.10/restorecon/restorecon.o differ
|
||||
Binary files nsapolicycoreutils/run_init/open_init_pty and policycoreutils-1.21.10/run_init/open_init_pty differ
|
||||
Binary files nsapolicycoreutils/run_init/run_init and policycoreutils-1.21.10/run_init/run_init differ
|
||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.21.10/scripts/fixfiles
|
||||
--- nsapolicycoreutils/scripts/fixfiles 2005-01-31 09:49:15.000000000 -0500
|
||||
+++ policycoreutils-1.21.10/scripts/fixfiles 2005-02-02 12:16:06.000000000 -0500
|
||||
+++ policycoreutils-1.21.10/scripts/fixfiles 2005-02-02 13:37:23.000000000 -0500
|
||||
@@ -60,12 +60,26 @@
|
||||
if [ -f ${PREFC} -a -x /usr/bin/diff ]; then
|
||||
TEMPFILE=`mktemp ${FC}.XXXXXXXXXX`
|
||||
@ -163,9 +252,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policyc
|
||||
+ -e 's|\?.*|*|g' \
|
||||
+ -e 's|\(.*|*|g' \
|
||||
+ -e 's|\[.*|*|g' \
|
||||
+ -e 's|\.\*|*|g' \
|
||||
+ -e 's|\.\+|*|g' | \
|
||||
+ sort -u | \
|
||||
+ -e 's|\.\*.*|*|g' \
|
||||
+ -e 's|\.\+.*|*|g' | \
|
||||
+ sort -d -u | \
|
||||
+ while read pattern ; \
|
||||
+ do if ! echo "$pattern" | grep -q -f ${TEMPFILE} 2>/dev/null; then \
|
||||
+ echo "$pattern"; \
|
||||
@ -176,13 +265,16 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policyc
|
||||
+ done | \
|
||||
while read pattern ; do find $pattern -maxdepth 0 -print; done 2> /dev/null | \
|
||||
- ${RESTORECON} $2 -v -f -R -
|
||||
+ ${RESTORECON} -R $2 -v -e /root -e /home -e /tmp -e /var/tmp -f -
|
||||
+ ${RESTORECON} -R $2 -v -e /root -e /home -e /tmp -e /var/tmp -e /dev -f -
|
||||
rm -f ${TEMPFILE}
|
||||
fi
|
||||
}
|
||||
Binary files nsapolicycoreutils/sestatus/sestatus and policycoreutils-1.21.10/sestatus/sestatus differ
|
||||
Binary files nsapolicycoreutils/sestatus/sestatus.o and policycoreutils-1.21.10/sestatus/sestatus.o differ
|
||||
Binary files nsapolicycoreutils/setfiles/setfiles and policycoreutils-1.21.10/setfiles/setfiles differ
|
||||
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-1.21.10/setfiles/setfiles.c
|
||||
--- nsapolicycoreutils/setfiles/setfiles.c 2005-01-31 09:49:15.000000000 -0500
|
||||
+++ policycoreutils-1.21.10/setfiles/setfiles.c 2005-02-02 12:16:16.000000000 -0500
|
||||
+++ policycoreutils-1.21.10/setfiles/setfiles.c 2005-02-02 12:17:10.000000000 -0500
|
||||
@@ -116,6 +116,35 @@
|
||||
va_end(ap);
|
||||
}
|
||||
@ -257,3 +349,4 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.c poli
|
||||
|
||||
case 'd':
|
||||
debug = 1;
|
||||
Binary files nsapolicycoreutils/setfiles/setfiles.o and policycoreutils-1.21.10/setfiles/setfiles.o differ
|
||||
|
||||
Loading…
Reference in New Issue
Block a user