From c8f4893a95a6116ec161d6e229151342ba11b61a Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Wed, 3 Feb 2010 16:42:37 +0000
Subject: [PATCH] * Wed Feb 3 2010 Dan Walsh <dwalsh@redhat.com> 2.0.78-18 -
 Fix seobject and fixfiles

---
 policycoreutils-gui.patch  | 5 +++--
 policycoreutils-rhat.patch | 6 ------
 policycoreutils.spec       | 5 ++++-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/policycoreutils-gui.patch b/policycoreutils-gui.patch
index 3de47e7..42ea360 100644
--- a/policycoreutils-gui.patch
+++ b/policycoreutils-gui.patch
@@ -6414,8 +6414,8 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policyc
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.78/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.78/gui/polgen.py	2010-01-28 12:17:31.000000000 -0500
-@@ -0,0 +1,1212 @@
++++ policycoreutils-2.0.78/gui/polgen.py	2010-02-03 11:46:45.000000000 -0500
+@@ -0,0 +1,1213 @@
 +#!/usr/bin/python
 +#
 +# Copyright (C) 2007, 2008, 2009 Red Hat 
@@ -6729,6 +6729,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycore
 +		self.in_udp = [False, False, False, []]
 +		self.out_tcp = [False, False, False, []]
 +		self.out_udp = [False, False, False, []]
++		self.use_resolve = False
 +		self.use_tmp = False
 +		self.use_uid = False
 +		self.use_syslog = False
diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 8d19220..b8d275a 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -2509,7 +2509,6 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po
 +    break
 +done
 +exit 0
-Binary files nsapolicycoreutils/sandbox/seunshare and policycoreutils-2.0.78/sandbox/seunshare differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.78/sandbox/seunshare.c
 --- nsapolicycoreutils/sandbox/seunshare.c	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-2.0.78/sandbox/seunshare.c	2010-01-19 12:15:41.000000000 -0500
@@ -2779,7 +2778,6 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po
 +
 +	return status;
 +}
-Binary files nsapolicycoreutils/sandbox/seunshare.o and policycoreutils-2.0.78/sandbox/seunshare.o differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.78/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2009-12-01 15:46:50.000000000 -0500
 +++ policycoreutils-2.0.78/scripts/fixfiles	2010-01-29 16:40:10.000000000 -0500
@@ -4147,7 +4145,6 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po
 +	free(buf);
 +}
  
-Binary files nsapolicycoreutils/setfiles/restorecon and policycoreutils-2.0.78/setfiles/restorecon differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restorecon.8 policycoreutils-2.0.78/setfiles/restorecon.8
 --- nsapolicycoreutils/setfiles/restorecon.8	2008-08-28 09:34:24.000000000 -0400
 +++ policycoreutils-2.0.78/setfiles/restorecon.8	2009-12-16 08:14:22.000000000 -0500
@@ -4196,8 +4193,6 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po
  
 +void exclude_non_seclabel_mounts();
  #endif
-Binary files nsapolicycoreutils/setfiles/restore.o and policycoreutils-2.0.78/setfiles/restore.o differ
-Binary files nsapolicycoreutils/setfiles/setfiles and policycoreutils-2.0.78/setfiles/setfiles differ
 diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-2.0.78/setfiles/setfiles.8
 --- nsapolicycoreutils/setfiles/setfiles.8	2008-08-28 09:34:24.000000000 -0400
 +++ policycoreutils-2.0.78/setfiles/setfiles.8	2009-12-16 08:14:25.000000000 -0500
@@ -4353,4 +4348,3 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po
  		}
  	}
  	
-Binary files nsapolicycoreutils/setfiles/setfiles.o and policycoreutils-2.0.78/setfiles/setfiles.o differ
diff --git a/policycoreutils.spec b/policycoreutils.spec
index c5c29e0..e212f42 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.78
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -298,6 +298,9 @@ fi
 exit 0
 
 %changelog
+* Wed Feb 3 2010 Dan Walsh <dwalsh@redhat.com> 2.0.78-18
+- Fix seobject and fixfiles
+
 * Fri Jan 29 2010 Dan Walsh <dwalsh@redhat.com> 2.0.78-17
 - Change seobject to use translations properly