[Python-apps-commits] r7006 - in packages/slapos.tool.grid/trunk/debian/patches (4 files)

[arnau at users.alioth.debian.org]

    Date: Friday, April 29, 2011 @ 07:38:06
  Author: arnau
Revision: 7006

Add patches fixing various issues specific to Debian and to upstream as well

Added:
  packages/slapos.tool.grid/trunk/debian/patches/fix_namespace.patch
  packages/slapos.tool.grid/trunk/debian/patches/fix_python26_missing_initgroups.patch
  packages/slapos.tool.grid/trunk/debian/patches/fix_zc.buildout_conflicts.patch
Modified:
  packages/slapos.tool.grid/trunk/debian/patches/series

Added: packages/slapos.tool.grid/trunk/debian/patches/fix_namespace.patch
===================================================================
--- packages/slapos.tool.grid/trunk/debian/patches/fix_namespace.patch	                        (rev 0)
+++ packages/slapos.tool.grid/trunk/debian/patches/fix_namespace.patch	2011-04-29 07:38:06 UTC (rev 7006)
@@ -0,0 +1,18 @@
+Author: Arnaud Fontaine <arnau at debian.org>
+Forwarded: not-needed
+Description: Avoid __init__.py clash with slapformat
+ Slapformat Debian package already installs the namespace __init__.py,
+ so no  need to do it  again, especially because dpkg  complains about
+ that.
+
+--- a/setup.py
++++ b/setup.py
+@@ -26,7 +26,7 @@ setup(
+     packages = find_packages('src'),
+     include_package_data = True,
+     package_dir = {'':'src'},
+-    namespace_packages = [ 'slapos' ],
++    namespace_packages = [ 'slapos.tool' ],
+     install_requires = [
+       'setuptools', # namespaces
+       'slapos.slap', # slapgrid uses slap to communicate with vifib

Added: packages/slapos.tool.grid/trunk/debian/patches/fix_python26_missing_initgroups.patch
===================================================================
--- packages/slapos.tool.grid/trunk/debian/patches/fix_python26_missing_initgroups.patch	                        (rev 0)
+++ packages/slapos.tool.grid/trunk/debian/patches/fix_python26_missing_initgroups.patch	2011-04-29 07:38:06 UTC (rev 7006)
@@ -0,0 +1,31 @@
+Author: Arnaud Fontaine <arnau at debian.org>
+Forwarded: not-needed
+Description: os.initgroups is only available on Python >= 2.7
+ Rely instead on  initgroups from Zope project  which provides exactly
+ the same API.
+
+--- a/src/slapos/tool/grid/utils.py
++++ b/src/slapos/tool/grid/utils.py
+@@ -36,6 +36,13 @@ import grp
+ from exception import BuildoutFailedError, WrongPermissionError
+ from hashlib import md5
+ 
++try:
++  # Python 2.7 only
++  from os import initgroups
++except:
++  # Otherwise, fallback on Zope initgroups
++  from initgroups import initgroups
++
+ # Such umask by default will create paths with full permission
+ # for user, non writable by group and not accessible by others
+ SAFE_UMASK = 027
+@@ -180,7 +187,7 @@ def dropPrivileges(uid, gid):
+   user_name = pwd.getpwuid(uid)[0]
+   group_list = [x.gr_gid for x in grp.getgrall() if user_name in x.gr_mem]
+   group_list.append(gid)
+-  os.initgroups(pwd.getpwuid(uid)[0], gid)
++  initgroups(pwd.getpwuid(uid)[0], gid)
+   os.setgid(gid)
+   os.setuid(uid)
+ 

Added: packages/slapos.tool.grid/trunk/debian/patches/fix_zc.buildout_conflicts.patch
===================================================================
--- packages/slapos.tool.grid/trunk/debian/patches/fix_zc.buildout_conflicts.patch	                        (rev 0)
+++ packages/slapos.tool.grid/trunk/debian/patches/fix_zc.buildout_conflicts.patch	2011-04-29 07:38:06 UTC (rev 7006)
@@ -0,0 +1,17 @@
+Author: Arnaud Fontaine <arnau at debian.org>
+Description: zc.buildout should not be required at all
+ zc.buildout-bootstrap.py   provided   in  this   package   bootstraps
+ setuptools  and  zc.buildout,  however if  zc.buildout  is  installed
+ system-wide, this can  cause system zc.buildout to be  used and later
+ fail.
+
+--- a/setup.py
++++ b/setup.py
+@@ -29,7 +29,6 @@ setup(
+     namespace_packages = [ 'slapos' ],
+     install_requires = [
+       'setuptools', # namespaces
+-      'zc.buildout>=1.5.0', # slapgrid uses buildout as its backend to do the job
+       'slapos.slap', # slapgrid uses slap to communicate with vifib
+       'supervisor', # slapgrid uses supervisor to manage processes
+     ],

Modified: packages/slapos.tool.grid/trunk/debian/patches/series
===================================================================
--- packages/slapos.tool.grid/trunk/debian/patches/series	2011-04-29 07:10:55 UTC (rev 7005)
+++ packages/slapos.tool.grid/trunk/debian/patches/series	2011-04-29 07:38:06 UTC (rev 7006)
@@ -1 +1,4 @@
 system_configuration_file_by_default.patch
+fix_zc.buildout_conflicts.patch
+fix_namespace.patch
+fix_python26_missing_initgroups.patch