Merge branch 'erp5' into erp5-cluster

Conflicts:
	stack/erp5/buildout.cfg

component/cups/buildout.cfg

+[buildout]
+extends =
+  ../zlib/buildout.cfg
+parts =
+  cups
+
+# for now we build and install library and header files only.
+[cups]
+recipe = slapos.recipe.cmmi
+url = http://www.cups.org/software/1.7.1/cups-1.7.1-source.tar.bz2
+md5sum = 55277c40fd4b7183dc3671d39c5c42b7
+configure-options =
+  --disable-static
+  --disable-dbus
+  --disable-gssapi
+  --disable-ssl
+  --disable-pam
+  --disable-avahi
+  --disable-dnssd
+  --disable-launchd
+  --disable-browsing
+  --disable-default-shared
+  --disable-raw-printing
+  --disable-webif
+make-options =
+  libs
+make-targets =
+  install-headers
+  install-libs
+environment =
+  CPPFLAGS=-I${zlib:location}/include
+  DSOFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/libreoffice-bin/buildout.cfg

@@ -12,14 +12,14 @@ find-links =
 [libreoffice-bin]
 recipe = slapos.recipe.build
 # here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
-version = 3.6.7.2
-url = http://downloadarchive.documentfoundation.org/libreoffice/old/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
+version = 4.2.0.4
+url = http://downloadarchive.documentfoundation.org/libreoffice/old/${:version}/rpm/%s/LibreOffice_${:version}_Linux_%s_rpm.tar.gz
 # supported architectures md5sums
-md5sum_x86 = 4097e53922a42996a30e573777809b33
-md5sum_x86-64 = 85eccac0bcb11f8789d49a3249546749
+md5sum_x86 = 16ca256b37abdec33707d163c89c0879
+md5sum_x86-64 = e1562e0400decb9e51efcabfd3e809e2
 
 # where office code can be found?
-officedir = libreoffice3.6
+officedir = libreoffice4.2
 
 # script to install
 script =

software/cloudooo/instance-cloudoo.cfg.in

@@ -19,7 +19,7 @@ url = cloudooo://${haproxy:ip}:${haproxy:port}/
 recipe = slapos.cookbook:generic.cloudooo
 ip = {{ ipv4 }}
 environment =
-  LD_LIBRARY_PATH = {{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['zlib'] }}/lib
+  LD_LIBRARY_PATH = {{ parameter_dict['cups'] }}/lib:{{ parameter_dict['cups'] }}/lib64:{{ parameter_dict['dbus'] }}/lib:{{ parameter_dict['dbus-glib'] }}/lib:{{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['glib'] }}/lib:{{ parameter_dict['libffi'] }}/lib:{{ parameter_dict['libffi'] }}/lib64:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['zlib'] }}/lib
   FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
   PATH = ${binary-link:target-directory}
 # Binary information

software/cloudooo/instance.cfg.in

@@ -25,10 +25,15 @@ context =
     ${:extra-context}
 
 [dynamic-template-cloudooo-parameters]
+cups = {{ cups_location }}
+dbus = {{ dbus_location }}
+dbus-glib = {{ dbus_glib_location }}
 file = {{ file_location }}
 fontconfig = {{ fontconfig_location }}
 freetype = {{ freetype_location }}
+glib = {{ glib_location }}
 haproxy = {{ haproxy_location }}
+libffi = {{ libffi_location }}
 libICE = {{ libICE_location }}
 libpng12 = {{ libpng12_location }}
 libSM = {{ libSM_location }}

software/cloudooo/software.cfg

@@ -62,15 +62,19 @@ context =
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 425cb2e76d46d53bb0b0eebdb8c1aa95
+md5sum = 1c5dab821393845b118644686154710f
 extra-context =
     key buildout_bin_directory buildout:bin-directory
+    key cups_location cups:location
+    key dbus_location dbus:location
+    key dbus_glib_location dbus-glib:location
     key dcron_location dcron:location
     key file_location file:location
     key fontconfig_location fontconfig:location
     key fonts_location fonts:location
     key freetype_location freetype:location
     key git_location git:location
+    key glib_location glib:location
     key haproxy_location haproxy:location
     key imagemagick_location imagemagick:location
     key libICE_location libICE:location
@@ -80,6 +84,7 @@ extra-context =
     key libXdmcp_location libXdmcp:location
     key libXext_location libXext:location
     key libXrender_location libXrender:location
+    key libffi_location libffi:location
     key libpng12_location libpng12:location
     key libreoffice_bin_location libreoffice-bin:location
     key libxcb_location libxcb:location
@@ -92,7 +97,7 @@ extra-context =
 [template-cloudooo]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
-md5sum = bbe84b4c9022db62c926e8a8a4bf02a1
+md5sum = 740a313b0d9d98800b099af8bf7cd0a7
 mode = 640
 
 [networkcache]

stack/cloudooo.cfg

@@ -33,7 +33,11 @@ allow-hosts =
   bitbucket.org
 
 extends =
+  ../component/cups/buildout.cfg
+  ../component/dbus/buildout.cfg
+  ../component/glib/buildout.cfg
   ../component/libreoffice-bin/buildout.cfg 
+  ../component/libffi/buildout.cfg
   ../component/libpng/buildout.cfg
   ../component/lxml-python/buildout.cfg
   ../component/python-2.7/buildout.cfg
@@ -71,6 +75,11 @@ parts =
   ocrb-fonts
 
 # Dependencies
+  cups
+  dbus
+  dbus-glib
+  glib
+  libffi
   libpng12
   imagemagick
   file

stack/erp5/buildout.cfg

@@ -22,6 +22,8 @@ extends =
   https://raw.github.com/zopefoundation/Zope/2.13.21/versions.cfg
   ../../stack/slapos.cfg
   ../../component/logrotate/buildout.cfg
+  ../../component/cups/buildout.cfg
+  ../../component/dbus/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/file/buildout.cfg
   ../../component/fonts/buildout.cfg
@@ -36,6 +38,7 @@ extends =
   ../../component/inkscape/buildout.cfg
   ../../component/kumo/buildout.cfg
   ../../component/libdmtx/buildout.cfg
+  ../../component/libffi/buildout.cfg
   ../../component/libpng/buildout.cfg
   ../../component/libreoffice-bin/buildout.cfg
   ../../component/lxml-python/buildout.cfg
@@ -195,7 +198,7 @@ md5sum = fe9a9349c4bad2ba999e9d8bac065ebb
 [template-cloudooo]
 < = download-base
 filename = instance-cloudoo.cfg.in
-md5sum = 9622cc0a21b6caf9c9beb5efea3e1998
+md5sum = 1cb9160482a6be615c34dbc55b017dce
 
 [template-zope-conf]
 < = download-base
@@ -227,7 +230,7 @@ md5sum = 2440e054821628bfbc4837d4ceb16bc2
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 3a3845caa33fffd762b346ed5949f196
+md5sum = 51afdc28de00edb00352922266f8d563
 extra-context =
     key mariadb_link_binary template-mariadb:link-binary
     key zope_link_binary template-zope:link-binary
@@ -235,8 +238,11 @@ extra-context =
     key aspell_location aspell:location
     key buildout_bin_directory buildout:bin-directory
     key coreutils_location coreutils:location
+    key cups_location cups:location
     key curl_location curl:location
     key dash_location dash:location
+    key dbus_location dbus:location
+    key dbus_glib_location dbus-glib:location
     key dcron_location dcron:location
     key erp5_location erp5:location
     key file_location file:location
@@ -244,6 +250,7 @@ extra-context =
     key fontconfig_location fontconfig:location
     key fonts_location fonts:location
     key freetype_location freetype:location
+    key glib_location glib:location
     key gzip_location gzip:location
     key haproxy_location haproxy:location
     key jsl_location jsl:location
@@ -255,6 +262,7 @@ extra-context =
     key libXdmcp_location libXdmcp:location
     key libXext_location libXext:location
     key libXrender_location libXrender:location
+    key libffi_location libffi:location
     key libpng12_location libpng12:location
     key libreoffice_bin_location libreoffice-bin:location
     key librsvg_location librsvg:location
@@ -562,7 +570,7 @@ scripts = zodbanalyze
 
 [cloudooo-repository]
 branch =
-revision = 5c67568c403239bd8e25993602d03c553236fcec
+revision = b91e43a3922160fe5f080eca45e0c51fe5345bcd
 
 [mysql-python]
 python = python2.7

stack/erp5/instance-cloudoo.cfg.in

@@ -36,7 +36,7 @@ wrapper = ${directory:service}/cloudooo
 data-directory = ${directory:cloudooo-data}
 
 environment =
-  LD_LIBRARY_PATH = {{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['zlib'] }}/lib
+  LD_LIBRARY_PATH = {{ parameter_dict['cups'] }}/lib:{{ parameter_dict['cups'] }}/lib64:{{ parameter_dict['dbus'] }}/lib:{{ parameter_dict['dbus-glib'] }}/lib:{{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['glib'] }}/lib:{{ parameter_dict['libffi'] }}/lib:{{ parameter_dict['libffi'] }}/lib64:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['zlib'] }}/lib
   FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
 
 # Binary information

stack/erp5/instance.cfg.in

@@ -29,9 +29,14 @@ context =
     ${:extra-context}
 
 [dynamic-template-cloudooo-parameters]
+cups = {{ cups_location }}
+dbus = {{ dbus_location }}
+dbus-glib = {{ dbus_glib_location }}
 file = {{ file_location }}
 fontconfig = {{ fontconfig_location }}
 freetype = {{ freetype_location }}
+glib = {{ glib_location }}
+libffi = {{ libffi_location }}
 libICE = {{ libICE_location }}
 libpng12 = {{ libpng12_location }}
 libSM = {{ libSM_location }}