* Thu Sep 24 2009 Dan Walsh <dwalsh@redhat.com> 2.0.62-12.14
- Fix tight loop in restorecond patch from Martin Orr
This commit is contained in:
parent
b5aeeb75bc
commit
531062f702
@ -1,6 +1,47 @@
|
||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.62/restorecond/restorecond.c
|
||||
--- nsapolicycoreutils/restorecond/restorecond.c 2009-02-18 13:45:01.000000000 -0800
|
||||
+++ policycoreutils-2.0.62/restorecond/restorecond.c 2009-09-24 20:03:16.000000000 -0700
|
||||
@@ -315,21 +315,24 @@
|
||||
printf("wd=%d mask=%u cookie=%u len=%u\n",
|
||||
event->wd, event->mask,
|
||||
event->cookie, event->len);
|
||||
- if (event->wd == master_wd)
|
||||
- read_config(fd);
|
||||
- else {
|
||||
- switch (utmpwatcher_handle(fd, event->wd)) {
|
||||
- case -1: /* Message was not for utmpwatcher */
|
||||
- if (event->len)
|
||||
- watch_list_find(event->wd, event->name);
|
||||
- break;
|
||||
|
||||
- case 1: /* utmp has changed need to reload */
|
||||
+ if (event->mask & ~IN_IGNORED) {
|
||||
+ if (event->wd == master_wd)
|
||||
read_config(fd);
|
||||
- break;
|
||||
-
|
||||
- default: /* No users logged in or out */
|
||||
- break;
|
||||
+ else {
|
||||
+ switch (utmpwatcher_handle(fd, event->wd)) {
|
||||
+ case -1: /* Message was not for utmpwatcher */
|
||||
+ if (event->len)
|
||||
+ watch_list_find(event->wd, event->name);
|
||||
+ break;
|
||||
+
|
||||
+ case 1: /* utmp has changed need to reload */
|
||||
+ read_config(fd);
|
||||
+ break;
|
||||
+
|
||||
+ default: /* No users logged in or out */
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.62/scripts/fixfiles
|
||||
--- nsapolicycoreutils/scripts/fixfiles 2009-05-22 14:10:01.000000000 -0400
|
||||
+++ policycoreutils-2.0.62/scripts/fixfiles 2009-06-01 06:37:19.000000000 -0400
|
||||
--- nsapolicycoreutils/scripts/fixfiles 2009-05-22 11:10:01.000000000 -0700
|
||||
+++ policycoreutils-2.0.62/scripts/fixfiles 2009-07-14 09:08:10.000000000 -0700
|
||||
@@ -129,7 +129,7 @@
|
||||
if [ ! -z "$FILEPATH" ]; then
|
||||
if [ -x /usr/bin/find ]; then
|
||||
@ -11,8 +52,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po
|
||||
else
|
||||
${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $FILEPATH 2>&1 >> $LOGFILE
|
||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.62/scripts/Makefile
|
||||
--- nsapolicycoreutils/scripts/Makefile 2009-02-18 16:45:01.000000000 -0500
|
||||
+++ policycoreutils-2.0.62/scripts/Makefile 2009-05-22 14:11:06.000000000 -0400
|
||||
--- nsapolicycoreutils/scripts/Makefile 2009-02-18 13:45:01.000000000 -0800
|
||||
+++ policycoreutils-2.0.62/scripts/Makefile 2009-07-14 09:08:10.000000000 -0700
|
||||
@@ -5,11 +5,12 @@
|
||||
MANDIR ?= $(PREFIX)/share/man
|
||||
LOCALEDIR ?= /usr/share/locale
|
||||
@ -28,8 +69,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po
|
||||
install -m 755 genhomedircon $(SBINDIR)
|
||||
-mkdir -p $(MANDIR)/man8
|
||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox policycoreutils-2.0.62/scripts/sandbox
|
||||
--- nsapolicycoreutils/scripts/sandbox 1969-12-31 19:00:00.000000000 -0500
|
||||
+++ policycoreutils-2.0.62/scripts/sandbox 2009-06-01 06:31:39.000000000 -0400
|
||||
--- nsapolicycoreutils/scripts/sandbox 1969-12-31 16:00:00.000000000 -0800
|
||||
+++ policycoreutils-2.0.62/scripts/sandbox 2009-07-14 09:08:10.000000000 -0700
|
||||
@@ -0,0 +1,139 @@
|
||||
+#!/usr/bin/python -E
|
||||
+import os, sys, getopt, socket, random, fcntl
|
||||
@ -171,8 +212,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po
|
||||
+
|
||||
+ sys.exit(rc)
|
||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.8 policycoreutils-2.0.62/scripts/sandbox.8
|
||||
--- nsapolicycoreutils/scripts/sandbox.8 1969-12-31 19:00:00.000000000 -0500
|
||||
+++ policycoreutils-2.0.62/scripts/sandbox.8 2009-05-22 14:11:10.000000000 -0400
|
||||
--- nsapolicycoreutils/scripts/sandbox.8 1969-12-31 16:00:00.000000000 -0800
|
||||
+++ policycoreutils-2.0.62/scripts/sandbox.8 2009-07-14 09:08:10.000000000 -0700
|
||||
@@ -0,0 +1,22 @@
|
||||
+.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
|
||||
+.SH NAME
|
||||
|
@ -6,7 +6,7 @@
|
||||
Summary: SELinux policy core utilities
|
||||
Name: policycoreutils
|
||||
Version: 2.0.62
|
||||
Release: 12.13%{?dist}
|
||||
Release: 12.14%{?dist}
|
||||
License: GPLv2+
|
||||
Group: System Environment/Base
|
||||
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
||||
@ -225,6 +225,9 @@ else
|
||||
fi
|
||||
|
||||
%changelog
|
||||
* Thu Sep 24 2009 Dan Walsh <dwalsh@redhat.com> 2.0.62-12.14
|
||||
- Fix tight loop in restorecond patch from Martin Orr
|
||||
|
||||
* Wed Sep 23 2009 Miroslav Grepl <mgrepl@redhat.com> 2.0.62-12.13
|
||||
- Fix for setfiles leaks descriptors from Steve Grubb
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user