auto-import changelog data from policycoreutils-1.13.1-2.src.rpm
* Sat Jun 12 2004 Dan Walsh <dwalsh@redhat.com> 1.13.1-2 - Fix run_init to use policy formats * Wed Jun 02 2004 Dan Walsh <dwalsh@redhat.com> 1.13.1-1 - Update from NSA
This commit is contained in:
cvsdist
parent
af1869ce11
commit
06e15c6c4b
@ -1 +1 @@
|
||||
policycoreutils-1.13.tgz
|
||||
policycoreutils-1.13.1.tgz
|
||||
|
||||
@ -1,67 +1,43 @@
|
||||
--- policycoreutils-1.13/scripts/fixfiles.rhat 2004-05-21 14:26:51.000000000 -0400
|
||||
+++ policycoreutils-1.13/scripts/fixfiles 2004-05-25 15:06:03.586866792 -0400
|
||||
@@ -19,24 +19,42 @@
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
-
|
||||
-FC=/etc/security/selinux/file_contexts
|
||||
+SELINUXTYPE="targeted"
|
||||
+. /etc/selinux/config
|
||||
+FC=/etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts
|
||||
LOGFILE=`mktemp /var/tmp/fixfiles.XXXXXXXXXX` || exit 1
|
||||
-echo "logging to $LOGFILE"
|
||||
SETFILES=/usr/sbin/setfiles
|
||||
FILESYSTEMS=`mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[23]| xfs).*rw/{print $3}';`
|
||||
checkLabels () {
|
||||
+echo "logging to $LOGFILE"
|
||||
${SETFILES} -v -n ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
|
||||
}
|
||||
--- policycoreutils-1.13.1/run_init/run_init.c.rhat 2004-06-02 15:20:37.000000000 -0400
|
||||
+++ policycoreutils-1.13.1/run_init/run_init.c 2004-06-12 05:24:51.069687208 -0400
|
||||
@@ -51,6 +51,7 @@
|
||||
#include <ctype.h>
|
||||
#include <libintl.h>
|
||||
#include <locale.h>
|
||||
+#include <limits.h>
|
||||
#define _(msgid) gettext (msgid)
|
||||
#ifndef PACKAGE
|
||||
#define PACKAGE "policycoreutils" /* the name of this package lang translation */
|
||||
@@ -60,7 +61,7 @@
|
||||
where: <script> is the name of the init script to run,\n\
|
||||
<args ...> are the arguments to that script.")
|
||||
|
||||
restoreLabels () {
|
||||
+echo "logging to $LOGFILE"
|
||||
${SETFILES} -v ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
|
||||
}
|
||||
-#define CONTEXT_FILE "/etc/security/initrc_context"
|
||||
+#define CONTEXT_FILE "initrc_context"
|
||||
#ifdef USE_PAM
|
||||
|
||||
relabel() {
|
||||
+echo "logging to $LOGFILE"
|
||||
echo "Cleaning out /tmp"
|
||||
rm -rf /tmp/.??* /tmp/*
|
||||
-${SETFILES} ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
|
||||
+${SETFILES} -v ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
|
||||
+}
|
||||
+relabelCheck() {
|
||||
+echo -n "
|
||||
+Files in the /tmp directory may be labeled incorrectly, this command
|
||||
+can remove all files in /tmp. If you choose to remove files from /tmp,
|
||||
+a reboot will be required after completion.
|
||||
+
|
||||
+Do you wish to clean out the /tmp directory [N]? "
|
||||
+read answer
|
||||
+if [ "$answer" = y -o "$answer" = Y ]; then
|
||||
+ relabel
|
||||
+else
|
||||
+ restoreLabels
|
||||
+fi
|
||||
+
|
||||
}
|
||||
/************************************************************************
|
||||
@@ -269,10 +270,11 @@
|
||||
FILE* fp;
|
||||
char buf[255], *bufp;
|
||||
int buf_len;
|
||||
-
|
||||
- fp = fopen(CONTEXT_FILE, "r");
|
||||
+ char context_file[PATH_MAX];
|
||||
+ snprintf(context_file, sizeof(context_file)-1, "%s%s", selinux_default_context_path(), CONTEXT_FILE);
|
||||
+ fp = fopen(context_file, "r");
|
||||
if (!fp) {
|
||||
- fprintf(stderr, _("Could not open file %s\n"), CONTEXT_FILE);
|
||||
+ fprintf(stderr, _("Could not open file %s\n"), context_file);
|
||||
return -1;
|
||||
}
|
||||
|
||||
# See how we were called.
|
||||
@@ -48,10 +66,15 @@
|
||||
restoreLabels
|
||||
;;
|
||||
relabel)
|
||||
- relabel
|
||||
+ relabelCheck
|
||||
;;
|
||||
+ -F)
|
||||
+ if "$1" = "relabel"; then
|
||||
+ relabel
|
||||
+ fi
|
||||
+ ;;
|
||||
*)
|
||||
- echo $"Usage: $0 {check|restore|relabel}"
|
||||
+ echo $"Usage: $0 {check|restore|[-F] relabel}"
|
||||
exit 1
|
||||
esac
|
||||
exit $?
|
||||
@@ -299,7 +301,7 @@
|
||||
}
|
||||
out:
|
||||
fclose(fp);
|
||||
- fprintf(stderr, _("No context in file %s\n"), CONTEXT_FILE);
|
||||
+ fprintf(stderr, _("No context in file %s\n"), context_file);
|
||||
return -1;
|
||||
|
||||
} /* get_init_context() */
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: SELinux policy core utilities.
|
||||
Name: policycoreutils
|
||||
Version: 1.13
|
||||
Release: 3
|
||||
Version: 1.13.1
|
||||
Release: 2
|
||||
License: GPL
|
||||
Group: System Environment/Base
|
||||
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
||||
@ -30,7 +30,6 @@ context.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1 -b .rhat
|
||||
|
||||
%build
|
||||
make all
|
||||
@ -72,6 +71,12 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
%config(noreplace) %{_sysconfdir}/sestatus.conf
|
||||
|
||||
%changelog
|
||||
* Sat Jun 12 2004 Dan Walsh <dwalsh@redhat.com> 1.13.1-2
|
||||
- Fix run_init to use policy formats
|
||||
|
||||
* Wed Jun 2 2004 Dan Walsh <dwalsh@redhat.com> 1.13.1-1
|
||||
- Update from NSA
|
||||
|
||||
* Tue May 25 2004 Dan Walsh <dwalsh@redhat.com> 1.13-3
|
||||
- Change location of file_context file
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user