Merge branch 'master' of https://git.erp5.org/repos/slapos

component/stunnel/buildout.cfg

@@ -17,8 +17,8 @@ filename = stunnel-4-hooks.py
 
 [stunnel-4]
 recipe = hexagonit.recipe.cmmi
-url = http://mirror.bit.nl/stunnel/stunnel-4.44.tar.gz
-md5sum = c9dd51fc02b913ce5bf7b3fc12f9cb4a
+url = http://mirror.bit.nl/stunnel/stunnel-4.45.tar.gz
+md5sum = dee104214a7c13593c1053cdff9a850f
 pre-configure-hook = ${stunnel-4-hook-download:location}/${stunnel-4-hook-download:filename}:pre_configure_hook
 configure-options =
   --enable-ipv6

software/slaprunner/software.cfg

@@ -36,19 +36,80 @@ eggs +=
   slapos.core
 
 [versions]
-slapos.cookbook = 0.12
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-010
 
-# Required by slapos.cookbook==0.12
-slapos.core = 0.8
-collective.recipe.template = 1.8
-netaddr = 0.7.5
-xml-marshaller = 0.9.7
-setuptools = 0.6c12dev-r88795
+# Pinned to old version (2.4 does not compile well everywhere)
+pycrypto = 2.3
 
+Jinja2 = 2.6
+Werkzeug = 0.8.1
+apache-libcloud = 0.5.2
+buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.7
+slapos.cookbook = 0.31
+slapos.libnetworkcache = 0.10
+slapos.recipe.template = 2.2
+slapos.toolbox = 0.8
+
+# Required by:
+# slapos.core==0.18
+Flask = 0.8
+
+# Required by:
+# slapos.cookbook==0.31
+PyXML = 0.8.4
+
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
 hexagonit.recipe.download = 1.5.0
-plone.recipe.command = 1.1
-slapos.libnetworkcache = 0.2
 
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-009
+# Required by:
+# slapos.cookbook==0.31
+# slapos.core==0.18
+# xml-marshaller==0.9.7
+lxml = 2.3.1
+
+# Required by:
+# slapos.cookbook==0.31
+netaddr = 0.7.6
+
+# Required by:
+# slapos.core==0.18
+netifaces = 0.5
+
+# Required by:
+# slapos.toolbox==0.8
+paramiko = 1.7.7.1
+
+# Required by:
+# slapos.toolbox==0.8
+psutil = 0.3.0
+
+# Required by:
+# slapos.cookbook==0.31
+# slapos.core==0.18
+# zc.buildout==1.5.3-dev-SlapOS-010
+# zc.recipe.egg==1.3.2
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.cookbook==0.31
+slapos.core = 0.18
+
+# Required by:
+# slapos.core==0.18
+supervisor = 3.0a10
+
+# Required by:
+# slapos.cookbook==0.31
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.cookbook==0.31
+zc.recipe.egg = 1.3.2
+
+# Required by:
+# slapos.core==0.18
+zope.interface = 3.8.0
\ No newline at end of file

stack/erp5.cfg

@@ -20,6 +20,7 @@ allow-hosts =
   *.nexedi.org
   *.python.org
   *.sourceforge.net
+  alastairs-place.net
   dist.repoze.org
   effbot.org
   github.com