[policycoreutils/f14/master] - Fix sandbox copyfile when copying a dir with a socket, print error

[Daniel J Walsh]

commit e73828104a215bc52f3d9652faf620916228e812
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Mon Sep 13 11:41:37 2010 -0400

    - Fix sandbox copyfile when copying a dir with a socket, print error

 policycoreutils-rhat.patch |   28 ++++++++++++++++------------
 policycoreutils.spec       |    5 ++++-
 2 files changed, 20 insertions(+), 13 deletions(-)
---
diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 84e96dd..f886068 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -1647,7 +1647,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
  	@python test_sandbox.py -v
 diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.83/sandbox/sandbox
 --- nsapolicycoreutils/sandbox/sandbox	2010-06-16 08:03:38.000000000 -0400
-+++ policycoreutils-2.0.83/sandbox/sandbox	2010-09-09 16:28:25.000000000 -0400
++++ policycoreutils-2.0.83/sandbox/sandbox	2010-09-13 11:40:20.000000000 -0400
 @@ -1,5 +1,6 @@
 -#! /usr/bin/python -E
 +#! /usr/bin/python -Es
@@ -1704,16 +1704,20 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
                       if not os.path.exists(newdir):
                              os.makedirs(newdir)
                       dest = newdir + "/" + bname
-@@ -83,7 +87,7 @@
+@@ -81,9 +85,10 @@
+                             shutil.copytree(file, dest)
+                      else:
                              shutil.copy2(file, dest)
++
                except shutil.Error, elist:
-                      for e in elist:
+-                     for e in elist:
 -                            sys.stderr.write(e[1])
-+                            sys.stderr.write(str(e[1]))
++                     for e in elist.message:
++                            sys.stderr.write(e[2])
                       
                SAVE_FILES[file] = (dest, os.path.getmtime(dest))
  
-@@ -161,10 +165,10 @@
+@@ -161,10 +166,10 @@
                    if not self.__options.homedir or not self.__options.tmpdir:
                           self.usage(_("Homedir and tempdir required for level mounts"))
  
@@ -1727,7 +1731,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
  
      def __mount_callback(self, option, opt, value, parser):
             self.__mount = True
-@@ -172,6 +176,15 @@
+@@ -172,6 +177,15 @@
      def __x_callback(self, option, opt, value, parser):
             self.__mount = True
             setattr(parser.values, option.dest, True)
@@ -1743,7 +1747,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
  
      def __validdir(self, option, opt, value, parser):
             if not os.path.isdir(value):
-@@ -218,7 +231,7 @@
+@@ -218,7 +232,7 @@
  /usr/bin/test -r ~/.xmodmap && /usr/bin/xmodmap ~/.xmodmap
  %s &
  WM_PID=$!
@@ -1752,7 +1756,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
  kill -TERM $WM_PID  2> /dev/null
  """ % (command, wm, command))
             fd.close()
-@@ -230,9 +243,9 @@
+@@ -230,9 +244,9 @@
      def __parse_options(self):
          from optparse import OptionParser
          usage = _("""
@@ -1764,7 +1768,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
  """)
          
          parser = OptionParser(version=self.VERSION, usage=usage)
-@@ -268,6 +281,10 @@
+@@ -268,6 +282,10 @@
                            action="callback", callback=self.__validdir,
                            help=_("alternate /tmp directory to use for mounting"))
  
@@ -1775,7 +1779,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
          parser.add_option("-W", "--windowmanager", dest="wm",  
                            type="string",
                            default="/usr/bin/matchbox-window-manager -use_titlebar no",
-@@ -276,13 +293,17 @@
+@@ -276,13 +294,17 @@
          parser.add_option("-l", "--level", dest="level", 
                            help=_("MCS/MLS level for the sandbox"))
  
@@ -1794,7 +1798,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
          if self.__options.setype:
                 self.setype = self.__options.setype
  
-@@ -299,6 +320,9 @@
+@@ -299,6 +321,9 @@
                 self.__options.X_ind = True
                 self.__homedir = self.__options.homedir
                 self.__tmpdir = self.__options.tmpdir
@@ -1804,7 +1808,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
          else:
                 if len(cmds) == 0:
                        self.usage(_("Command required"))
-@@ -351,22 +375,24 @@
+@@ -351,22 +376,24 @@
  
      def __execute(self):
             try:
diff --git a/policycoreutils.spec b/policycoreutils.spec
index bd9075d..64127ba 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.83
-Release: 26%{?dist}
+Release: 27%{?dist}
 License: GPLv2
 Group:	 System Environment/Base
 Source:  http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -315,6 +315,9 @@ fi
 exit 0
 
 %changelog
+* Mon Sep 13 2010 Dan Walsh <dwalsh at redhat.com> 2.0.83-27
+- Fix sandbox copyfile when copying a dir with a socket, print error
+
 * Fri Sep 10 2010 Dan Walsh <dwalsh at redhat.com> 2.0.83-26
 - Stop polgengui from crashing if selinux policy is not installed