Merge remote-tracking branch 'origin/master' into erp5-component

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(' ')

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