diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-2.0.22/audit2allow/Makefile

--- nsapolicycoreutils/audit2allow/Makefile	2007-07-16 14:20:41.000000000 -0400

+++ policycoreutils-2.0.22/audit2allow/Makefile	2007-07-20 12:07:46.000000000 -0400

@@ -1,6 +1,7 @@

 # Installation directories.

 PREFIX ?= ${DESTDIR}/usr

 BINDIR ?= $(PREFIX)/bin

+SBINDIR ?= $(PREFIX)/sbin

 LIBDIR ?= $(PREFIX)/lib

 MANDIR ?= $(PREFIX)/share/man

 LOCALEDIR ?= /usr/share/locale

@@ -10,7 +11,7 @@

 install: all

 	-mkdir -p $(BINDIR)

 	install -m 755 audit2allow $(BINDIR)

-	install -m 755 sepolgen-ifgen $(BINDIR)

+	install -m 755 sepolgen-ifgen $(SBINDIR)

 	-mkdir -p $(MANDIR)/man1

 	install -m 644 audit2allow.1 $(MANDIR)/man1/

diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.22/Makefile

--- nsapolicycoreutils/Makefile	2007-07-16 14:20:43.000000000 -0400

+++ policycoreutils-2.0.22/Makefile	2007-07-20 12:07:46.000000000 -0400

@@ -1,4 +1,4 @@

-SUBDIRS=setfiles semanage load_policy newrole run_init restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po

+SUBDIRS=setfiles semanage load_policy newrole run_init restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui

 all install relabel clean indent:

 	@for subdir in $(SUBDIRS); do \

diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.22/restorecond/Makefile

--- nsapolicycoreutils/restorecond/Makefile	2007-07-16 14:20:41.000000000 -0400

+++ policycoreutils-2.0.22/restorecond/Makefile	2007-07-20 12:07:46.000000000 -0400

@@ -22,7 +22,7 @@

 	-mkdir -p $(INITDIR)

 	install -m 644 restorecond.init $(INITDIR)/restorecond

 	-mkdir -p $(SELINUXDIR)

-	install -m 600 restorecond.conf $(SELINUXDIR)/restorecond.conf

+	install -m 644 restorecond.conf $(SELINUXDIR)/restorecond.conf

 relabel: install

 	/sbin/restorecon $(SBINDIR)/restorecond 

diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.22/restorecond/restorecond.c

--- nsapolicycoreutils/restorecond/restorecond.c	2007-07-16 14:20:41.000000000 -0400

+++ policycoreutils-2.0.22/restorecond/restorecond.c	2007-07-20 12:07:46.000000000 -0400

@@ -210,9 +210,10 @@

 			}

 			if (fsetfilecon(fd, scontext) < 0) {

-				syslog(LOG_ERR,

-				       "set context %s->%s failed:'%s'\n",

-				       filename, scontext, strerror(errno));

+				if (errno != EOPNOTSUPP) 

+					syslog(LOG_ERR,

+					       "set context %s->%s failed:'%s'\n",

+					       filename, scontext, strerror(errno));

 				if (retcontext >= 0)

 					free(prev_context);

 				free(scontext);

@@ -225,8 +226,9 @@

 		if (retcontext >= 0)

 			free(prev_context);

 	} else {

-		syslog(LOG_ERR, "get context on %s failed: '%s'\n",

-		       filename, strerror(errno));

+		if (errno != EOPNOTSUPP) 

+			syslog(LOG_ERR, "get context on %s failed: '%s'\n",

+			       filename, strerror(errno));

 	}

 	free(scontext);

 	close(fd);

diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/run_init/Makefile policycoreutils-2.0.22/run_init/Makefile

--- nsapolicycoreutils/run_init/Makefile	2007-07-16 14:20:41.000000000 -0400

+++ policycoreutils-2.0.22/run_init/Makefile	2007-07-20 12:07:46.000000000 -0400

@@ -34,8 +34,8 @@

 install: all

 	test -d $(SBINDIR)      || install -m 755 -d $(SBINDIR)

 	test -d $(MANDIR)/man1 || install -m 755 -d $(MANDIR)/man1

-	install -m 555 run_init $(SBINDIR)

-	install -m 555 open_init_pty $(SBINDIR)

+	install -m 755 run_init $(SBINDIR)

+	install -m 755 open_init_pty $(SBINDIR)

 	install -m 644 run_init.8 $(MANDIR)/man8/

 	install -m 644 open_init_pty.8 $(MANDIR)/man8/

 ifeq (${PAMH}, /usr/include/security/pam_appl.h)

diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.22/scripts/chcat

--- nsapolicycoreutils/scripts/chcat	2007-07-16 14:20:41.000000000 -0400

+++ policycoreutils-2.0.22/scripts/chcat	2007-07-20 12:07:46.000000000 -0400

@@ -77,7 +77,7 @@

         if len(cats) > 0:

             new_serange = "%s-%s:%s" % (serange[0], top[0], ",".join(cats))

-        else

+        else:

             new_serange = "%s-%s" % (serange[0], top[0])

         if add_ind:

@@ -155,7 +155,7 @@

         if len(cats) > 0:

             new_serange = "%s-%s:%s" % (serange[0], top[0], ",".join(cats))

-        else

+        else:

             new_serange = "%s-%s" % (serange[0], top[0])

         if add_ind:

diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.22/scripts/fixfiles

--- nsapolicycoreutils/scripts/fixfiles	2007-07-16 14:20:41.000000000 -0400

+++ policycoreutils-2.0.22/scripts/fixfiles	2007-07-23 10:25:32.000000000 -0400

@@ -108,6 +108,7 @@

 rpmlist() {

 rpm -q --qf '[%{FILESTATES} %{FILENAMES}\n]' "$1" | grep '^0 ' | cut -f2- -d ' '

+[ ${PIPESTATUS[0]} != 0 ] && echo "$1 not found" >/dev/stderr

 }

 # 

diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-2.0.22/scripts/genhomedircon

--- nsapolicycoreutils/scripts/genhomedircon	2007-07-16 14:20:41.000000000 -0400

+++ policycoreutils-2.0.22/scripts/genhomedircon	2007-07-20 12:07:46.000000000 -0400

@@ -302,7 +302,7 @@

 			    regex = re.sub("\(\/\.\*\)\?", "", regex)

 			    regex = regex + "/*$"

-			    if re.search(regex,home, 0):

+			    if re.match(regex,home):

 				    return 1

 		    except:

 			    continue

diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.22/semanage/semanage

--- nsapolicycoreutils/semanage/semanage	2007-07-16 14:20:41.000000000 -0400

+++ policycoreutils-2.0.22/semanage/semanage	2007-07-20 12:07:46.000000000 -0400

@@ -34,7 +34,10 @@

 sys.stdout = codecs.getwriter(locale.getpreferredencoding())(sys.__stdout__, 'replace')

 try:

-       gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1)

+       gettext.install(PROGNAME,

+                       localedir="/usr/share/locale",

+                       unicode=False,

+                       codeset = 'utf-8')

 except IOError:

        import __builtin__

        __builtin__.__dict__['_'] = unicode

diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.22/semanage/seobject.py

--- nsapolicycoreutils/semanage/seobject.py	2007-07-16 14:20:41.000000000 -0400

+++ policycoreutils-2.0.22/semanage/seobject.py	2007-07-20 12:07:46.000000000 -0400

@@ -210,6 +210,7 @@

 		os.write(fd, self.out())

 		os.close(fd)

 		os.rename(newfilename, self.filename)

+                os.system("/sbin/service mcstrans reload > /dev/null")

 class semanageRecords:

 	def __init__(self):

@@ -1283,9 +1284,12 @@

 			raise ValueError(_("Could not list booleans"))

 		for boolean in self.blist:

-			name = semanage_bool_get_name(boolean)

-			value = semanage_bool_get_value(boolean)

-			ddict[name] = value

+                       value = []

+                       name = semanage_bool_get_name(boolean)

+                       value[0] = semanage_bool_get_value(boolean)

+                       value[1] = selinux.security_get_boolean_pending(boolean)

+                       value[2] = selinux.security_get_boolean_active(boolean)

+                       ddict[name] = value

 		return ddict