rpms/sabayon/devel mkdirs.patch, NONE, 1.1 selinux.patch, NONE, 1.1 sabayon.spec, 1.44, 1.45

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3322

Modified Files:
	sabayon.spec 
Added Files:
	mkdirs.patch selinux.patch 
Log Message:
- Be more robust when directories are missing (#329471)
- Work better with SELinux (#329501)
- Move debuglog.py to the -apply package (#330001)




mkdirs.patch:

--- NEW FILE mkdirs.patch ---
diff -up sabayon-2.20.1/lib/storage.py.selinux sabayon-2.20.1/lib/storage.py
--- sabayon-2.20.1/lib/storage.py.selinux	2007-09-19 20:19:29.000000000 -0400
+++ sabayon-2.20.1/lib/storage.py	2007-10-12 15:43:14.000000000 -0400
@@ -52,7 +52,7 @@ def copy_tree (dst_base, src_base, dst_n
     
     try:
         dprint ("Making dir %s", os.path.join (dst_base, dst_name))
-        os.mkdir (os.path.join (dst_base, dst_name))
+        os.makedirs (os.path.join (dst_base, dst_name))
     except OSError, err:
         if err.errno != errno.EEXIST:
             raise err

selinux.patch:

--- NEW FILE selinux.patch ---
diff -up sabayon-2.20.1/lib/userdb.py.selinux sabayon-2.20.1/lib/userdb.py
--- sabayon-2.20.1/lib/userdb.py.selinux	2007-09-19 20:21:09.000000000 -0400
+++ sabayon-2.20.1/lib/userdb.py	2007-10-12 15:43:14.000000000 -0400
@@ -28,6 +28,7 @@ import random
 import ldap
 import socket
 import debuglog
+import selinux
 
 defaultConf="""<profiles>
   <default profile=""/>
@@ -353,7 +354,12 @@ class UserDatabase:
 
 	    raise UserDatabaseException(
 	              _("Failed to save UserDatabase to %s") % filename)
-	
+
+        if selinux.is_selinux_enabled() > 0:
+            rc, con = selinux.matchpathcon(filename, 0)
+            if rc == 0:
+                selinux.setfilecon(filename, con)
+
 	self.modified = 0
 
     def set_default_profile (self, profile):
diff -up sabayon-2.20.1/admin-tool/profilesdialog.py.selinux sabayon-2.20.1/admin-tool/profilesdialog.py
--- sabayon-2.20.1/admin-tool/profilesdialog.py.selinux	2007-09-19 20:19:27.000000000 -0400
+++ sabayon-2.20.1/admin-tool/profilesdialog.py	2007-10-12 15:43:14.000000000 -0400
@@ -34,6 +34,7 @@ import protosession
 import debuglog
 import errors
 from config import *
+import selinux
 
 def dprint (fmt, *args):
     debuglog.debug_log (False, debuglog.DEBUG_LOG_DOMAIN_ADMIN_TOOL, fmt % args)
@@ -110,6 +111,11 @@ class Session (gobject.GObject):
     def __copy_from_user (self, user_path, profile_path):
         os.chown (user_path, os.geteuid (), os.getegid ())
         shutil.move (user_path, profile_path)
+        if selinux.is_selinux_enabled() > 0:
+            rc, con = selinux.matchpathcon(profile_path, 0)
+            if rc == 0:
+                selinux.setfilecon(profile_path, con)
+        
         dprint ("Moved %s back from %s", user_path, profile_path)
 
     @errors.checked_callback (debuglog.DEBUG_LOG_DOMAIN_ADMIN_TOOL)


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sabayon.spec	11 Oct 2007 20:29:51 -0000	1.44
+++ sabayon.spec	13 Oct 2007 02:57:18 -0000	1.45
@@ -8,7 +8,7 @@
 
 Name:    sabayon
 Version: 2.20.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -21,6 +21,10 @@
 
 # Xnest crashes unless we disable the Composite extension
 Patch1:  sabayon-2.12.3-xnestbug.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=486216
+Patch2:  mkdirs.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=486218 
+Patch3:  selinux.patch
 
 Requires: %{name}-apply = %{version}-%{release}
 Requires: libxml2-python
@@ -85,6 +89,8 @@
 cp %{SOURCE2} admin-tool/
 
 %patch1 -p1 -b .xnestbug
+%patch2 -p1 -b .mkdirs
+%patch3 -p1 -b .selinux
 
 %build
 
@@ -195,6 +201,9 @@
 %{python_sitearch}/%{name}/util.py
 %{python_sitearch}/%{name}/util.pyc
 %ghost %{python_sitearch}/%{name}/util.pyo
+%{python_sitearch}/%{name}/debuglog.py
+%{python_sitearch}/%{name}/debuglog.pyc
+%ghost %{python_sitearch}/%{name}/debuglog.pyo
 
 %dir %{python_sitearch}/%{name}/sources
 %{python_sitearch}/%{name}/sources/*.py
@@ -260,9 +269,6 @@
 %{python_sitearch}/%{name}/lockdownappliersabayon.py
 %{python_sitearch}/%{name}/lockdownappliersabayon.pyc
 %ghost %{python_sitearch}/%{name}/lockdownappliersabayon.pyo
-%{python_sitearch}/%{name}/debuglog.py
-%{python_sitearch}/%{name}/debuglog.pyc
-%ghost %{python_sitearch}/%{name}/debuglog.pyo
 %{python_sitearch}/%{name}/errors.py
 %{python_sitearch}/%{name}/errors.pyc
 %ghost %{python_sitearch}/%{name}/errors.pyo
@@ -273,6 +279,11 @@
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Fri Oct 12 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.1-3
+- Be more robust when directories are missing (#329471)
+- Work better with SELinux (#329501)
+- Move debuglog.py to the -apply package (#330001)
+
 * Thu Oct 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.1-2
 - Require pyxdg (#327851)