Merge branch 'erp5' into deployment_generic_CR1094

Conflicts:
	component/mariadb/buildout.cfg
	software/erp5/software.cfg

component/imagemagick/buildout.cfg

@@ -27,8 +27,8 @@ filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
 
 [imagemagick]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.4-10.tar.bz2
-md5sum = b44464c9d79dc8fe9d253fc0a9d52470
+url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.5-6.tar.bz2
+md5sum = bcf07cf0822572fa2b47fa6d506f699a
 configure-options =
   --disable-static
   --without-x

component/libpng/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../zlib/buildout.cfg
 
 parts =
+  libpng12
   libpng
 
 [libpng-common]
@@ -13,6 +14,11 @@ environment =
   CPPFLAGS =-I${zlib:location}/include
   LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 
+[libpng12]
+<= libpng-common
+url = http://download.sourceforge.net/libpng/libpng-1.2.46.tar.bz2
+md5sum = e8b43dc78ef95b3949af7f961d76874b
+
 [libpng]
 <= libpng-common
 url = http://download.sourceforge.net/libpng/libpng-1.5.5.tar.bz2

component/libreoffice-bin/buildout.cfg

 [buildout]
 extends =
   ../cpio/buildout.cfg
+  ../gcc/buildout.cfg
   ../rpm2cpio/buildout.cfg
 
 parts =
@@ -44,9 +45,14 @@ script =
   os.mkdir(os.path.join(location, 'basis-link'))
   os.symlink(os.path.join('..', 'program'), os.path.join(location, 'basis-link', 'program'))
   # temporary workaround for https://bugs.freedesktop.org/show_bug.cgi?id=45696
+  # copy GCC 4.5's libgcc_s.so and libstdc++.so to ure/lib directory.
+  ARCH_LIBDIR_MAP = { 'x86': 'lib', 'x86-64': 'lib64' }
   os.unlink(os.path.join(location, 'ure', 'lib', 'libgcc_s.so.1'))
+  os.symlink(os.path.join('${:gcc_4_5_location}', ARCH_LIBDIR_MAP[platform], 'libgcc_s.so.1'), os.path.join(location, 'ure', 'lib', 'libgcc_s.so.1'))
   os.unlink(os.path.join(location, 'ure', 'lib', 'libstdc++.so.6'))
+  os.symlink(os.path.join('${:gcc_4_5_location}', ARCH_LIBDIR_MAP[platform], 'libstdc++.so.6'), os.path.join(location, 'ure', 'lib', 'libstdc++.so.6'))
 
 # helper binaries
 cpio = ${cpio:location}/bin/cpio
 rpm2cpio = ${rpm2cpio:target}
+gcc_4_5_location = ${gcc-java-minimal:location}

component/xorg/buildout.cfg

@@ -12,8 +12,8 @@ parts =
   libXdmcp
   libXext
   libXau
-  libXinerama
   libSM
+  libXrender
 
 [xorg-aclocal]
 ACLOCAL=${xorg-util-macros:location}/share/aclocal
@@ -155,21 +155,6 @@ configure-options =
   --without-xmlto
   --without-fop
 
-[xineramaproto]
-recipe = hexagonit.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/proto/xineramaproto-1.2.tar.bz2
-md5sum = a8aadcb281b9c11a91303e24cdea45f5
-
-[libXinerama]
-recipe = hexagonit.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/lib/libXinerama-1.1.1.tar.bz2
-md5sum = ecd4839ad01f6f637c6fb5327207f89b
-environment =
-  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-configure-options =
-  --disable-static
-
 [libICE]
 recipe = hexagonit.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libICE-1.0.7.tar.bz2
@@ -194,3 +179,19 @@ environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${libICE:location}/lib/pkgconfig:${libuuid:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
   LIBUUID_CFLAGS=-I${libuuid:location}/include
+
+[renderproto]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/proto/renderproto-0.11.1.tar.bz2
+md5sum = a914ccc1de66ddeb4b611c6b0686e274
+
+[libXrender]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/lib/libXrender-0.9.6.tar.bz2
+md5sum = 3b3b7d076c2384b6c600c0b5f4ba971f
+configure-options =
+  --disable-static
+environment =
+  PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  CPPFLAGS=-I${libX11:location}/include -I${renderproto:location}/include -I${xproto:location}/include

slapos/recipe/request.py

@@ -76,13 +76,18 @@ class Recipe(object):
       options['name'], partition_parameter_kw=partition_parameter_kw,
         filter_kw=filter_kw)
 
+    self.failed = None
     for param in self.return_parameters:
       try:
-        options['connection-%s' % param] = instance.getConnectionParameter(param)
+        options['connection-%s' % param] = str(instance.getConnectionParameter(param))
       except slapmodule.NotFoundError:
         options['connection-%s' % param] = ''
+        if self.failed is None:
+          self.failed = param
 
   def install(self):
+    if self.failed is not None:
+      raise KeyError("Connection parameter %r not found." % self.failed)
     return []
 
   update = install

software/cloudooo/instance.cfg

@@ -23,4 +23,4 @@ link_binary_list =
   ${pdftk:location}/bin/pdftk
 
 environment =
-  LD_LIBRARY_PATH = ${file:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libICE:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXdmcp:location}/lib:${libXext:location}/lib:${libXinerama:location}/lib:${libxcb:location}/lib:${zlib:location}/lib
+  LD_LIBRARY_PATH = ${file:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libICE:location}/lib:${libpng12:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXdmcp:location}/lib:${libXext:location}/lib:${libxcb:location}/lib:${libXrender:location}/lib:${zlib:location}/lib

software/cloudooo/software.cfg

@@ -33,6 +33,6 @@ module = cloudooo
 # Default template for erp5 instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 2a38a928deb5870e02a8271b34341f5b
+md5sum = 49da453a38dc5462c170747a029037b7
 output = ${buildout:directory}/template.cfg
 mode = 0644

software/erp5/instance-cloudooo.cfg

@@ -27,7 +27,7 @@ wrapper = $${basedirectory:services}/cloudooo
 data-directory = $${directory:cloudooo-data}
 
 environment =
-  LD_LIBRARY_PATH = ${file:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libICE:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXdmcp:location}/lib:${libXext:location}/lib:${libXinerama:location}/lib:${libxcb:location}/lib:${zlib:location}/lib
+  LD_LIBRARY_PATH = ${file:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libICE:location}/lib:${libpng12:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXdmcp:location}/lib:${libXext:location}/lib:${libxcb:location}/lib:${libXrender:location}/lib:${zlib:location}/lib
   FONTCONFIG_FILE = $${fontconfig-instance:conf-path}
 
 # Binary information

software/erp5/software.cfg

@@ -90,7 +90,7 @@ mode = 0644
 [template-cloudooo]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-cloudooo.cfg
-md5sum = 8ea2839e951f26af2bc74b9a8c0fa5c2
+md5sum = e7698a0537785339e249bdc57f369e93
 output = ${buildout:directory}/template-cloudooo.cfg
 mode = 0644
 
@@ -177,6 +177,7 @@ mode = 0644
 #   Romain Courteaud
 #   Sebastien Robin
 #   Kazuhiko Shiozaki
+#   Cedric de Saint Martin
 signature-certificate-list =
   -----BEGIN CERTIFICATE-----
   MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE

stack/cloudooo.cfg

@@ -9,7 +9,8 @@ find-links = http://www.nexedi.org/static/packages/source/slapos.buildout/
     http://www.nexedi.org/static/packages/source/
 
 extends =
-  ../component/openoffice-bin/buildout.cfg 
+  ../component/libreoffice-bin/buildout.cfg 
+  ../component/libpng/buildout.cfg
   ../component/lxml-python/buildout.cfg
   ../component/python-2.6/buildout.cfg
   ../component/python-2.7/buildout.cfg
@@ -24,20 +25,21 @@ extends =
 versions = versions
 
 parts =
-  openoffice-bin
+  libreoffice-bin
 
 # basic Xorg
   libXdmcp
   libXext
   libXau
-  libXinerama
   libSM
+  libXrender
 
 # fonts
   liberation-fonts
   ipaex-fonts
 
 # Dependencies
+  libpng12
   imagemagick
   file
   xpdf 

stack/erp5.cfg

@@ -45,6 +45,7 @@ extends =
   ../component/hookbox/buildout.cfg
   ../component/imagemagick/buildout.cfg
   ../component/kumo/buildout.cfg
+  ../component/libpng/buildout.cfg
   ../component/libreoffice-bin/buildout.cfg
   ../component/lxml-python/buildout.cfg
   ../component/percona-toolkit/buildout.cfg
@@ -90,6 +91,7 @@ parts =
   stunnel
   w3m
   poppler
+  libpng12
   libpng
   ghostscript
   mysql-tritonn-5.0
@@ -120,8 +122,8 @@ parts =
   libXdmcp
   libXext
   libXau
-  libXinerama
   libSM
+  libXrender
 
 # fonts
   liberation-fonts