Merge branch 'master' into erp5-cluster

Conflicts:
	stack/erp5/buildout.cfg

component/firefox/buildout.cfg

@@ -26,12 +26,12 @@ depends =
   ${liberation-fonts:location}
   ${ipaex-fonts:location}
 
-version = 33.0
+version = 33.1
 
 # MD5SUMs are available at :
 # https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${:version}/MD5SUMS
-x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 542b27d5f3afcb55406a7af72f68f3d5
-x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 ae4e8275750fd5f87963cbe263e8ba34
+x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 1106b9c56da48a3e5c5ef965fea70078
+x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 4201d94f32b6b778456e5681cdcacd76
 
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')

component/gnutls/buildout.cfg

@@ -26,8 +26,8 @@ environment =
 
 [gnutls]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-3.2.19.tar.xz
-md5sum = 8884492d0ad4339c831c6d507afbeea9
+url = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-3.2.20.tar.xz
+md5sum = 637ef52191bf87a597240a49cc533972
 configure-options =
   --disable-static
   --disable-libdane

component/libreoffice-bin/buildout.cfg

@@ -9,11 +9,11 @@ parts =
 [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 = 4.3.3.2
+version = 4.3.4.1
 url = http://downloadarchive.documentfoundation.org/libreoffice/old/${:version}/rpm/%s/LibreOffice_${:version}_Linux_%s_rpm.tar.gz
 # supported architectures md5sums
-md5sum_x86 = c24d4d7db03a5c983633efde754efae4
-md5sum_x86-64 = 94e0c1027d864f26a65e742874514b92
+md5sum_x86 = 6fddbe8508fd2e6d5b942ad360013da2
+md5sum_x86-64 = b3b0eab681d2cd2d22e3c065530b36c2
 
 # where office code can be found?
 officedir = libreoffice4.3

component/percona-toolkit/buildout.cfg

@@ -8,8 +8,8 @@ parts =
 
 [percona-toolkit]
 recipe = slapos.recipe.cmmi
-version = 2.2.10
-url = http://www.percona.com/redir/downloads/percona-toolkit/${:version}/percona-toolkit-${:version}.tar.gz
-md5sum = 9a5f464942c1aafe89a982c031e5e9fa
+version = 2.2.12
+url = http://www.percona.com/redir/downloads/percona-toolkit/${:version}/tarball/percona-toolkit-${:version}.tar.gz
+md5sum = 7c39b06b97ebab97ae5d3c78d1186258
 configure-command =
   ${perl:location}/bin/perl Makefile.PL

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.91'
+version = '0.92'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"

slapos/recipe/request.py

@@ -107,10 +107,10 @@ class Recipe(object):
     if 'config' in options or 'sla' in options:
       raise UserError("'config' & 'sla' options are obsolete."
                       " Clean up your software release.")
-    filter_kw = {k: v
+    filter_kw = {k[4:]: v
       for k, v in options.iteritems()
       if k.startswith('sla-') and v}
-    partition_parameter_kw = self._filterForStorage({k: v
+    partition_parameter_kw = self._filterForStorage({k[7:]: v
       for k, v in options.iteritems()
       if k.startswith('config-')})
     slave = options.get('slave', 'false').lower() in \

stack/erp5/buildout.cfg

@@ -599,7 +599,7 @@ cloudooo = 1.2.5-dev
 
 # use newer version than specified in ZTK
 PasteDeploy = 1.5.2
-Pygments = 1.6
+Pygments = 2.0.1
 coverage = 3.7.1
 
 # test_UserManagerInterfaces in testERP5Security fails with 1.10.0.
@@ -650,7 +650,7 @@ PyXML = 0.8.5
 Pympler = 0.3.1
 StructuredText = 2.11.1
 WSGIUtils = 0.7
-apache-libcloud = 0.15.1
+apache-libcloud = 0.16.0
 astroid = 1.2.1
 async = 0.6.1
 chardet = 2.3.0
@@ -661,14 +661,14 @@ erp5diff = 0.8.1.5
 eventlet = 0.15.2
 five.formlib = 1.0.4
 five.localsitemanager = 2.0.5
-gitdb = 0.5.4
+gitdb = 0.6.0
 greenlet = 0.4.5
 http-parser = 0.8.3
 httplib2 = 0.9
 huBarcode = 1.0.0
 interval = 1.0.0
 ipdb = 0.8
-ipython = 2.3.0
+ipython = 2.3.1
 logilab-common = 0.63.0
 minitage.paste = 1.4.6
 minitage.recipe.egg = 1.107
@@ -677,7 +677,7 @@ plone.recipe.command = 1.1
 ply = 3.4
 polib = 1.0.5
 pprofile = 1.7.2
-pycountry = 1.8
+pycountry = 1.10
 pyflakes = 0.8.1
 pylint = 1.3.1
 python-ldap = 2.4.17
@@ -688,7 +688,7 @@ restkit = 4.2.2
 rtjp-eventlet = 0.3.2
 slapos.recipe.template = 2.5
 slapos.toolbox = 0.43.0
-smmap = 0.8.2
+smmap = 0.8.3
 socketpool = 0.5.3
 spyne = 2.11.0
 suds = 0.4
@@ -701,15 +701,15 @@ xupdate-processor = 0.4
 xfw = 0.10
 
 # Required by:
-# slapos.toolbox==0.40.2
-GitPython = 0.3.2.RC1
+# slapos.toolbox==0.43.0
+GitPython = 0.3.2.1
 
 # Required by:
 # Products.CMFCore==2.2.8
 Products.ZSQLMethods = 2.13.4
 
 # Required by:
-# slapos.toolbox==0.40.2
+# slapos.toolbox==0.43.0
 atomize = 0.2.0
 
 # Required by:
@@ -717,7 +717,7 @@ atomize = 0.2.0
 erp5.util = 0.4.41
 
 # Required by:
-# slapos.toolbox==0.40.2
+# slapos.toolbox==0.43.0
 feedparser = 5.1.3
 
 # Required by:
@@ -746,7 +746,7 @@ minitage.recipe.common = 1.90
 ordereddict = 1.1
 
 # Required by:
-# slapos.toolbox==0.40.2
+# slapos.toolbox==0.43.0
 paramiko = 1.15.1
 
 # Required by:

stack/resilient/buildout.cfg

@@ -126,6 +126,6 @@ Jinja2 = 2.6
 # ... And newer s.r.template requires Jinja2 >= 2.7
 slapos.recipe.template = 2.4.2
 rdiff-backup = 1.3.4nxd2
-slapos.cookbook = 0.91
+slapos.cookbook = 0.92
 
 

stack/slapos.cfg

@@ -137,7 +137,7 @@ Flask = 0.10.1
 # Required by:
 # cliff==1.8.0
 # stevedore==1.1.0
-argparse = 1.2.1
+argparse = 1.2.2
 
 # Required by:
 # slapos.core==1.3.3