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

component/freetype/buildout.cfg

@@ -13,8 +13,8 @@ parts =
 
 [freetype]
 recipe = slapos.recipe.cmmi
-url = http://download.savannah.gnu.org/releases/freetype/freetype-2.5.4.tar.bz2
-md5sum = 438585445a2f1f71c77590155fd96616
+url = http://download.savannah.gnu.org/releases/freetype/freetype-2.5.5.tar.bz2
+md5sum = 2a7a314927011d5030903179cf183be0
 pkg_config_depends = ${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-options =

component/gnutls/buildout.cfg

@@ -4,20 +4,20 @@ extends =
   ../nettle/buildout.cfg
   ../p11-kit/buildout.cfg
   ../pkgconfig/buildout.cfg
-  ../xz-utils/buildout.cfg
+  ../lunzip/buildout.cfg
   ../zlib/buildout.cfg
 
 parts = gnutls
 
 [gpg-error]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.17.tar.bz2
-md5sum = b4f8d8b9ff14aed41f279aa844563539
+url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.18.tar.bz2
+md5sum = 12312802d2065774b787cbfc22cc04e9
 
 [gcrypt]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.2.tar.bz2
-md5sum = b54395a93cb1e57619943c082da09d5f
+url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.3.tar.bz2
+md5sum = 4262c3aadf837500756c2051a5c4ae5e
 configure-options =
   --with-gpg-error-prefix=${gpg-error:location}
 environment =
@@ -26,8 +26,8 @@ environment =
 
 [gnutls]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-3.2.20.tar.xz
-md5sum = 637ef52191bf87a597240a49cc533972
+url = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-3.2.21.tar.lz
+md5sum = a653d93a5a26434474c603470cc86666
 configure-options =
   --disable-static
   --disable-libdane
@@ -35,7 +35,7 @@ configure-options =
   --disable-crywrap
   --without-tpm
 environment =
-  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:${lunzip:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${nettle:location}/lib/pkgconfig:${p11-kit:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
   CPPFLAGS=-I${gmp:location}/include -I${zlib:location}/include
   LDFLAGS=-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${nettle:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/numpy/buildout.cfg

@@ -6,7 +6,7 @@ extends =
 
 [numpy-env]
 PATH = ${gcc-fortran:location}/bin:%(PATH)s
-BLAS = ${openblas:location}/lib/libopenblas.so
+OPENBLAS = ${openblas:location}/lib/libopenblas.so
 LAPACK = ${openblas:location}/lib/libopenblas.so
 ATLAS = ${openblas:location}/lib/libopenblas.so
 

component/openssl/buildout.cfg

@@ -16,8 +16,8 @@ parts =
 
 [openssl]
 recipe = slapos.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.1k.tar.gz
-md5sum = d4f002bd22a56881340105028842ae1f
+url = https://www.openssl.org/source/openssl-1.0.1m.tar.gz
+md5sum = d143d1555d842a069cb7cc34ba745a06
 patch-binary = ${patch:location}/bin/patch
 patches =
   ${:_profile_base_location_}/openssl-nodoc.patch#b4887a7b4e18402447bc6227d2493b92

component/scikit-learn/buildout.cfg

 [buildout]
 extends =
   ../numpy/buildout.cfg
+  ../scipy/buildout.cfg
 
 parts =
   scikit-learn

stack/erp5/buildout.cfg

@@ -655,7 +655,7 @@ Pympler = 0.4
 StructuredText = 2.11.1
 WSGIUtils = 0.7
 apache-libcloud = 0.17.0
-astroid = 1.3.4
+astroid = 1.3.6
 chardet = 2.3.0
 collective.recipe.template = 1.11
 csp-eventlet = 0.7.0
@@ -682,7 +682,7 @@ pprofile = 1.7.2
 pycountry = 1.10
 pycrypto = 2.6.1
 pyflakes = 0.8.1
-pylint = 1.4.1
+pylint = 1.4.3
 python-ldap = 2.4.19
 python-magic = 0.4.6
 python-memcached = 1.53

stack/slapos.cfg

@@ -113,22 +113,23 @@ Jinja2 = 2.7.3
 MarkupSafe = 0.23
 Werkzeug = 0.10.1
 buildout-versions = 1.7
-cffi = 0.8.6
+cffi = 0.9.2
+collective.recipe.template = 1.11
 cmd2 = 0.6.8
-cryptography = 0.7.2
+cryptography = 0.8
 inotifyx = 0.2.2
 itsdangerous = 0.24
-lxml = 3.4.1
+lxml = 3.4.2
 meld3 = 1.0.0
 mr.developer = 1.31
 netaddr = 0.7.13
-pbr = 0.10.7
+pbr = 0.10.8
 prettytable = 0.7.2
 psutil = 2.2.1
 pyOpenSSL = 0.14
 pyparsing = 2.0.3
 pytz = 2014.10
-requests = 2.5.1
+requests = 2.6.0
 setuptools = 12.0.4
 simplejson = 3.6.5
 six = 1.9.0
@@ -137,7 +138,7 @@ slapos.core = 1.3.8
 slapos.libnetworkcache = 0.14.2
 slapos.recipe.build = 0.20
 slapos.recipe.cmmi = 0.2
-stevedore = 1.2.0
+stevedore = 1.3.0
 xml-marshaller = 0.9.7
 
 # Required by:
@@ -145,16 +146,16 @@ xml-marshaller = 0.9.7
 Flask = 0.10.1
 
 # Required by:
-# cliff==1.9.0
-# stevedore==1.2.0
+# cliff==1.10.1
+# stevedore==1.3.0
 argparse = 1.3.0
 
 # Required by:
 # slapos.core==1.3.8
-cliff = 1.9.0
+cliff = 1.10.1
 
 # Required by:
-# cryptography==0.7.2
+# cryptography==0.8
 enum34 = 1.0.4
 
 # Required by:
@@ -170,15 +171,15 @@ lock-file = 2.0
 netifaces = 0.10.4
 
 # Required by:
-# pbr==0.10.7
+# pbr==0.10.8
 pip = 6.0.8
 
 # Required by:
-# cryptography==0.7.2
+# cryptography==0.8
 pyasn1 = 0.1.7
 
 # Required by:
-# cffi==0.8.6
+# cffi==0.9.2
 pycparser = 2.10
 
 # Required by: