From 6fd04fc09321b9d789b88ecb7ea9d0190adc4c45 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Tue, 7 Oct 2014 11:40:46 +0200
Subject: [PATCH] version up eggs.

---
 software/ajaxplorer/software.cfg                     | 1 -
 software/apache-frontend/software.cfg                | 1 -
 software/backupserver/software.cfg                   | 1 -
 software/erp5testnode/software.cfg                   | 1 -
 software/html5as/software.cfg                        | 1 -
 software/mariadb/software.cfg                        | 1 -
 software/nginx-push-stream/software.cfg              | 1 -
 software/powerdns/software.cfg                       | 1 -
 software/seleniumrunner/software.cfg                 | 1 -
 software/slapos-testing/software.cfg                 | 1 -
 software/slaprunner/software.cfg                     | 1 -
 software/test-slave-instance-deployment/software.cfg | 2 +-
 stack/cloudooo.cfg                                   | 1 -
 stack/erp5/buildout.cfg                              | 7 +++----
 stack/lamp.cfg                                       | 1 -
 stack/lamp/buildout.cfg                              | 1 -
 stack/lapp/buildout.cfg                              | 1 -
 stack/slapos.cfg                                     | 6 +++---
 18 files changed, 7 insertions(+), 23 deletions(-)
 mode change 100755 => 100644 stack/cloudooo.cfg

diff --git a/software/ajaxplorer/software.cfg b/software/ajaxplorer/software.cfg
index f307287bf..8643575b0 100644
--- a/software/ajaxplorer/software.cfg
+++ b/software/ajaxplorer/software.cfg
@@ -86,7 +86,6 @@ numpy = 1.6.2
 # websockify 0.4.1 doesn't install well
 websockify = 0.3.0
 plone.recipe.command = 1.1
-slapos.recipe.build = 0.11.6
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
 z3c.recipe.mkdir = 0.5
diff --git a/software/apache-frontend/software.cfg b/software/apache-frontend/software.cfg
index bd1266a4b..fb246fc22 100644
--- a/software/apache-frontend/software.cfg
+++ b/software/apache-frontend/software.cfg
@@ -12,7 +12,6 @@ gitdb = 0.5.4
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
 rdiff-backup = 1.0.5
-slapos.recipe.build = 0.12
 slapos.recipe.template = 2.5
 slapos.toolbox = 0.40.2
 smmap = 0.8.2
diff --git a/software/backupserver/software.cfg b/software/backupserver/software.cfg
index 6458a6b58..fdb2931ab 100644
--- a/software/backupserver/software.cfg
+++ b/software/backupserver/software.cfg
@@ -120,6 +120,5 @@ mode = 0644
 rdiff-backup = 1.0.5
 gunicorn = 19.1.1
 plone.recipe.command = 1.1
-slapos.recipe.build = 0.11.6
 slapos.recipe.template = 2.4.2
 PyRSS2Gen = 1.1
diff --git a/software/erp5testnode/software.cfg b/software/erp5testnode/software.cfg
index 304bf7c2d..959124908 100644
--- a/software/erp5testnode/software.cfg
+++ b/software/erp5testnode/software.cfg
@@ -76,5 +76,4 @@ md5sum = b4556610d17ae769d759c49b0955b63e
 PyXML = 0.8.5
 erp5.util = 0.4.41
 plone.recipe.command = 1.1
-slapos.recipe.build = 0.12
 slapos.recipe.template = 2.5
diff --git a/software/html5as/software.cfg b/software/html5as/software.cfg
index 87acd81c0..f5846c36e 100644
--- a/software/html5as/software.cfg
+++ b/software/html5as/software.cfg
@@ -72,7 +72,6 @@ async = 0.6.1
 gitdb = 0.5.4
 pycrypto = 2.6
 rdiff-backup = 1.0.5
-slapos.recipe.build = 0.11.6
 slapos.recipe.template = 2.4.2
 slapos.toolbox = 0.40.2
 smmap = 0.8.2
diff --git a/software/mariadb/software.cfg b/software/mariadb/software.cfg
index b7cee9dbb..29106ca8d 100644
--- a/software/mariadb/software.cfg
+++ b/software/mariadb/software.cfg
@@ -67,5 +67,4 @@ output = ${buildout:directory}/template-recover.cfg
 mode = 0644
 
 [versions]
-slapos.recipe.build = 0.11.5
 slapos.recipe.template = 2.4.2
diff --git a/software/nginx-push-stream/software.cfg b/software/nginx-push-stream/software.cfg
index 14bf70651..bcdc1d6f8 100644
--- a/software/nginx-push-stream/software.cfg
+++ b/software/nginx-push-stream/software.cfg
@@ -43,5 +43,4 @@ mode = 0644
 
 [versions]
 plone.recipe.command = 1.1
-slapos.recipe.build = 0.12
 slapos.recipe.template = 2.5
diff --git a/software/powerdns/software.cfg b/software/powerdns/software.cfg
index e3aa9874c..d33259972 100644
--- a/software/powerdns/software.cfg
+++ b/software/powerdns/software.cfg
@@ -64,5 +64,4 @@ PyRSS2Gen = 1.1
 cns.recipe.symlink = 0.2.3
 collective.recipe.template = 1.11
 plone.recipe.command = 1.1
-slapos.recipe.build = 0.12
 slapos.recipe.template = 2.5
diff --git a/software/seleniumrunner/software.cfg b/software/seleniumrunner/software.cfg
index e7423ad31..4076e39ec 100644
--- a/software/seleniumrunner/software.cfg
+++ b/software/seleniumrunner/software.cfg
@@ -47,5 +47,4 @@ mode = 0644
 
 [versions]
 plone.recipe.command = 1.1
-slapos.recipe.build = 0.12
 slapos.recipe.template = 2.5
diff --git a/software/slapos-testing/software.cfg b/software/slapos-testing/software.cfg
index ccc5b6553..626128d75 100644
--- a/software/slapos-testing/software.cfg
+++ b/software/slapos-testing/software.cfg
@@ -91,5 +91,4 @@ mode = 640
 Pygments = 1.6
 collective.recipe.template = 1.10
 plone.recipe.command = 1.1
-slapos.recipe.build = 0.12
 slapos.recipe.template = 2.5
diff --git a/software/slaprunner/software.cfg b/software/slaprunner/software.cfg
index 53af8310f..5bcfb95d6 100644
--- a/software/slaprunner/software.cfg
+++ b/software/slaprunner/software.cfg
@@ -21,7 +21,6 @@ gunicorn = 19.1.1
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
 rdiff-backup = 1.0.5
-slapos.recipe.build = 0.12
 slapos.recipe.download = 1.0.dev-r4053
 slapos.toolbox = 0.40.2
 smmap = 0.8.2
diff --git a/software/test-slave-instance-deployment/software.cfg b/software/test-slave-instance-deployment/software.cfg
index e85a976ee..49d884385 100644
--- a/software/test-slave-instance-deployment/software.cfg
+++ b/software/test-slave-instance-deployment/software.cfg
@@ -58,7 +58,7 @@ eggs = collective.recipe.template
 [versions]
 collective.recipe.template = 1.11
 plone.recipe.command = 1.1
-slapos.recipe.build = 0.12
+slapos.recipe.build = 0.13
 slapos.recipe.template = 2.5
 
 # Replicate slapos stack, but without shacache to not have to compile the entire world for a simple test.
diff --git a/stack/cloudooo.cfg b/stack/cloudooo.cfg
old mode 100755
new mode 100644
index 9d2f7e6ce..db79e1705
--- a/stack/cloudooo.cfg
+++ b/stack/cloudooo.cfg
@@ -77,7 +77,6 @@ WSGIUtils = 0.7
 plone.recipe.command = 1.1
 python-magic = 0.4.6
 rdiff-backup = 1.0.5
-slapos.recipe.build = 0.12
 slapos.recipe.template = 2.5
 
 # Required by:
diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg
index f823a4406..db76ada6f 100644
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -599,7 +599,7 @@ WSGIUtils = 0.7
 apache-libcloud = 0.15.1
 astroid = 1.2.1
 async = 0.6.1
-chardet = 2.2.1
+chardet = 2.3.0
 csp-eventlet = 0.7.0
 ecdsa = 0.11
 elementtree = 1.2.7-20070827-preview
@@ -614,7 +614,7 @@ httplib2 = 0.9
 huBarcode = 1.0.0
 interval = 1.0.0
 ipdb = 0.8
-ipython = 2.2.0
+ipython = 2.3.0
 logilab-common = 0.62.1
 minitage.paste = 1.4.6
 minitage.recipe.egg = 1.107
@@ -626,13 +626,12 @@ pprofile = 1.7.2
 pycountry = 1.8
 pyflakes = 0.8.1
 pylint = 1.3.1
-python-ldap = 2.4.15
+python-ldap = 2.4.17
 python-magic = 0.4.6
 python-memcached = 1.53
 qrcode = 5.0.1
 restkit = 4.2.2
 rtjp-eventlet = 0.3.2
-slapos.recipe.build = 0.12
 slapos.recipe.template = 2.5
 slapos.toolbox = 0.40.2
 smmap = 0.8.2
diff --git a/stack/lamp.cfg b/stack/lamp.cfg
index 374990d39..3e65213cf 100644
--- a/stack/lamp.cfg
+++ b/stack/lamp.cfg
@@ -44,7 +44,6 @@ apache-libcloud = 0.9.1
 async = 0.6.1
 gitdb = 0.5.4
 plone.recipe.command = 1.1
-slapos.recipe.build = 0.7
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.3
 slapos.toolbox = 0.40.2
diff --git a/stack/lamp/buildout.cfg b/stack/lamp/buildout.cfg
index 5240bf89e..efced7791 100644
--- a/stack/lamp/buildout.cfg
+++ b/stack/lamp/buildout.cfg
@@ -185,7 +185,6 @@ async = 0.6.1
 gitdb = 0.5.4
 pycrypto = 2.6
 rdiff-backup = 1.0.5
-slapos.recipe.build = 0.11.6
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
 slapos.toolbox = 0.40.2
diff --git a/stack/lapp/buildout.cfg b/stack/lapp/buildout.cfg
index e975302d5..d4e330ba5 100644
--- a/stack/lapp/buildout.cfg
+++ b/stack/lapp/buildout.cfg
@@ -183,7 +183,6 @@ gitdb = 0.5.4
 plone.recipe.command = 1.1
 pycrypto = 2.6
 rdiff-backup = 1.0.5
-slapos.recipe.build = 0.11.6
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
 slapos.toolbox = 0.40.2
diff --git a/stack/slapos.cfg b/stack/slapos.cfg
index 91421b714..7ac0bb803 100644
--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -111,7 +111,7 @@ Werkzeug = 0.9.6
 buildout-versions = 1.7
 cffi = 0.8.6
 cmd2 = 0.6.7
-cryptography = 0.5.4
+cryptography = 0.6
 itsdangerous = 0.24
 lxml = 3.4.0
 meld3 = 1.0.0
@@ -159,7 +159,7 @@ netifaces = 0.10.4
 
 # Required by:
 # slapos.core==1.2.4.1
-psutil = 2.1.2
+psutil = 2.1.3
 
 # Required by:
 # cffi==0.8.6
@@ -171,7 +171,7 @@ pytz = 2014.7
 
 # Required by:
 # slapos.core==1.2.4.1
-requests = 2.4.1
+requests = 2.4.3
 
 # Required by:
 # slapos.core==1.2.4.1
-- 
2.30.9