Merge branch 'erp5-component' into erp5

component/firefox/buildout.cfg

@@ -24,10 +24,10 @@ depends =
   ${liberation-fonts:location}
   ${ipaex-fonts:location}
 
-version = 27.0.1
+version = 28.0
 
-x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 f28b563ed96a78b4d64b0567ad5b9686
-x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 abce08d4816114435539bed8a27d23e5
+x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 b9992b491c3d4131bd7f4982d0240d6d
+x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 8264fda486828d925aa094de902eb182
 
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')

component/fontconfig/buildout.cfg

@@ -15,7 +15,7 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://fontconfig.org/release/fontconfig-2.11.0.tar.bz2
 md5sum = 000bd4baf7aefa828e03414d0c8c7dc5
-pkg_config_depends = ${freetype:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig
+pkg_config_depends = ${freetype:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
 # XXX-Cedric : should we use --with-add-fonts={somefont:location}/share,{someotherfont:location}/share?
 configure-options =
   --disable-static

component/gtkmm/buildout.cfg

@@ -15,8 +15,8 @@ parts =
 
 [cairomm]
 recipe = slapos.recipe.cmmi
-url = http://cairographics.org/releases/cairomm-1.10.0.tar.gz
-md5sum = 9c63fb1c04c8ecd3c5e6473075b8c39f
+url = http://cairographics.org/releases/cairomm-1.11.2.tar.gz
+md5sum = 732a3ff5b57401eb5dfeef795a2a0c52
 depends =
   ${libpng:so_version}
 pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}:${libsigc:location}/lib/pkgconfig

component/imagemagick/buildout.cfg

@@ -24,9 +24,9 @@ extends =
 
 [imagemagick]
 recipe = slapos.recipe.cmmi
-version = 6.8.8-2
+version = 6.8.8-9
 url = http://ftp.vim.org/ImageMagick/ImageMagick-${:version}.tar.xz
-md5sum = d11e1c732add731ff368b2dffcd004b4
+md5sum = d4a7ac7400622a325580e52cf9a562c7
 depends =
   ${libtiff:version}
   ${libpng:so_version}
@@ -47,7 +47,9 @@ configure-options =
   --without-gvc
   --without-lcms
   --with-lcms2
+  --without-openjp2
   --without-lqr
+  --without-lzma
   --without-openexr
   --without-pango
   --without-rsvg

component/xorg/buildout.cfg

@@ -250,7 +250,7 @@ recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.7/src/everything/libXfont-1.4.5.tar.bz2
 md5sum = 6851da5dae0a6cf5f7c9b9e2b05dd3b4
 environment =
-  PKG_CONFIG_PATH=${fontsproto:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${freetype:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${fontsproto:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
@@ -465,7 +465,7 @@ configure-options =
   --with-xkb-path=${xkeyboard-config:location}/share/X11/xkb
   --with-sha1=libgcrypt
 environment =
-  PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${fixesproto:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${fixesproto:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
   CPPFLAGS=-I${bzip2:location}/include -I${gcrypt:location}/include -I${gpg-error:location}/include -I${zlib:location}/include
   PATH=${pkgconfig:location}/bin:%(PATH)s
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gcrypt:location}/lib -Wl,-rpath=${gcrypt:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

software/cloudooo/software.cfg

@@ -108,7 +108,9 @@ mode = 640
 #   Cedric de Saint Martin
 #   Yingjie Xu
 #   Gabriel Monnerat
-#   Test Agent (Automatic Update from Tests)
+#   Łukasz Nowak
+#   Test Agent (Automatic update from tests)
+#   Aurélien Calonne
 signature-certificate-list =
   -----BEGIN CERTIFICATE-----
   MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
@@ -189,6 +191,19 @@ signature-certificate-list =
   yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
   -----END CERTIFICATE-----
   -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
+  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
+  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
+  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
+  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
+  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
+  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
+  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
+  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
   MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
   BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
   MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
@@ -201,3 +216,16 @@ signature-certificate-list =
   5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
   x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
   -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB+DCCAWGgAwIBAgIJAKGd0vpks6T/MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+  BAMMCUNPTVAtMTU4NDAgFw0xMzA2MjAxMjE5MjBaGA8yMTEzMDUyNzEyMTkyMFow
+  FDESMBAGA1UEAwwJQ09NUC0xNTg0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+  gQDZTH9etPUC+wMZQ3UIiOwyyCfHsJ+7duCFYjuo1uZrhtDt/fp8qb8qK9ob+df3
+  EEYgA0IgI2j/9jNUEnKbc5+OrfKznzXjrlrH7zU8lKBVNCLzQuqBKRNajZ+UvO8R
+  nlqK2jZCXP/p3HXDYUTEwIR5W3tVCEn/Vda4upTLcPVE5wIDAQABo1AwTjAdBgNV
+  HQ4EFgQU7KXaNDheQWoy5uOU01tn1M5vNkEwHwYDVR0jBBgwFoAU7KXaNDheQWoy
+  5uOU01tn1M5vNkEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQASmqCU
+  Znbvu6izdicvjuE3aKnBa7G++Fdp2bdne5VCwVbVLYCQWatB+n4crKqGdnVply/u
+  +uZ16u1DbO9rYoKgWqjLk1GfiLw5v86pd5+wZd5I9QJ0/Sbz2vZk5S4ciMIGwArc
+  m711+GzlW5xe6GyH9SZaGOPAdUbI6JTDwLzEgA==
+  -----END CERTIFICATE-----

software/seleniumrunner/software.cfg

@@ -53,12 +53,12 @@ mode = 0644
 setuptools = 2.2
 
 Jinja2 = 2.7.2
-MarkupSafe = 0.18
+MarkupSafe = 0.19
 Werkzeug = 0.9.4
 buildout-versions = 1.7
-cffi = 0.8.1
+cffi = 0.8.2
 cmd2 = 0.6.7
-cryptography = 0.2.1
+cryptography = 0.2.2
 itsdangerous = 0.23
 meld3 = 0.6.10
 pyOpenSSL = 0.14
@@ -88,23 +88,23 @@ lock-file = 2.0
 # slapos.cookbook==0.85
 # slapos.core==1.0.3
 # xml-marshaller==0.9.7
-lxml = 3.3.1
+lxml = 3.3.3
 
 # Required by:
 # slapos.cookbook==0.85
-netaddr = 0.7.10
+netaddr = 0.7.11
 
 # Required by:
 # slapos.core==1.0.3
 netifaces = 0.8-1
 
 # Required by:
-# cffi==0.8.1
+# cffi==0.8.2
 pycparser = 2.10
 
 # Required by:
 # slapos.cookbook==0.85
-pytz = 2013.9
+pytz = 2014.1
 
 # Required by:
 # slapos.core==1.0.3
@@ -112,7 +112,7 @@ requests = 2.2.1
 
 # Required by:
 # cliff==1.5.2
-six = 1.5.2
+six = 1.6.1
 
 # Required by:
 # slapos.cookbook==0.85
@@ -132,7 +132,7 @@ xml-marshaller = 0.9.7
 
 # Required by:
 # slapos.core==1.0.3
-zope.interface = 4.1.0
+zope.interface = 4.1.1
 
 [networkcache]
 # signature certificates of the following uploaders.

stack/slapos.cfg

@@ -16,6 +16,7 @@ extensions +=
 
 # Use shacache and lxml
 extends =
+  ../component/python-2.7/buildout.cfg
   ../component/lxml-python/buildout.cfg
   ../component/python-cffi/buildout.cfg
   ../component/python-cryptography/buildout.cfg