Description: misc patches
Author: Russell Coker <russell@coker.com.au>

---
Last-Update: 2012-02-28

--- policycoreutils-2.1.10.orig/run_init/open_init_pty.c
+++ policycoreutils-2.1.10/run_init/open_init_pty.c
@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
 		/* in the child */
 		struct termios s_tty_attr;
 		if (tcgetattr(fileno(stdin), &s_tty_attr)) {
-			perror("Child:");
+			perror("forkpty child:");
 			fflush(stdout);
 			fflush(stderr);
 			exit(EXIT_FAILURE);
--- policycoreutils-2.1.10.orig/run_init/Makefile
+++ policycoreutils-2.1.10/run_init/Makefile
@@ -33,7 +33,7 @@ open_init_pty: open_init_pty.c
 
 install: all
 	test -d $(SBINDIR)      || install -m 755 -d $(SBINDIR)
-	test -d $(MANDIR)/man1 || install -m 755 -d $(MANDIR)/man1
+	test -d $(MANDIR)/man8 || install -m 755 -d $(MANDIR)/man8
 	install -m 755 run_init $(SBINDIR)
 	install -m 755 open_init_pty $(SBINDIR)
 	install -m 644 run_init.8 $(MANDIR)/man8/
--- policycoreutils-2.1.10.orig/restorecond/restorecond.conf
+++ policycoreutils-2.1.10/restorecond/restorecond.conf
@@ -2,6 +2,11 @@
 /etc/resolv.conf
 /etc/samba/secrets.tdb
 /etc/mtab
+/var/run/cups
+/var/run/dbus
+/var/run/network
+/var/run/network/ifstate
+/var/run/PolicyKit
 /var/run/utmp
 /var/log/wtmp
 /root/*
--- policycoreutils-2.1.10.orig/restorecond/watch.c
+++ policycoreutils-2.1.10/restorecond/watch.c
@@ -186,6 +186,7 @@ int watch(int fd, const char *watch_file
 			printf("wd=%d mask=%u cookie=%u len=%u\n",
 			       event->wd, event->mask,
 			       event->cookie, event->len);
+		if (event->mask & ~IN_IGNORED) {
 		if (event->wd == master_wd)
 			read_config(fd, watch_file);
 		else {
@@ -202,6 +203,7 @@ int watch(int fd, const char *watch_file
 				break;
 			}
 		}
+		} /* end if (event->mask & ~IN_IGNORED) */
 
 		i += EVENT_SIZE + event->len;
 	}
