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

component/bash/buildout.cfg

@@ -2,7 +2,15 @@
 parts =
   bash
 
+extends =
+  ../ncurses/buildout.cfg
+
 [bash]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnu.org/gnu/bash/bash-4.2.tar.gz
-md5sum = 3fb927c7c33022f1c327f14a81c0d4b0
+url = http://ftp.gnu.org/gnu/bash/bash-4.3.tar.gz
+md5sum = 81348932d5da294953e15d4814c74dd1
+configure-options =
+  --with-curses
+environment =
+  CPPFLAGS=-I${ncurses:location}/include
+  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib

component/dropbear/buildout.cfg

@@ -5,41 +5,13 @@
 ########################################################
 
 [buildout]
-extends = 
+extends =
   ../zlib/buildout.cfg
   ../coreutils/buildout.cfg
 
 parts =
   dropbear-output
 
-[dropbear-userspace-patch]
-recipe = hexagonit.recipe.download
-md5sum = 3d934c2c90e8c57536a4fa2cf8ad216d
-url = ${:_profile_base_location_}/${:filename}
-filename = userspace.patch
-download-only = true
-
-[dropbear-ipv6-patch]
-recipe = hexagonit.recipe.download
-md5sum = b30dd58d68829a80eee69188134382ef
-url = ${:_profile_base_location_}/${:filename}
-filename = ipv6-support.patch
-download-only = true
-
-[dropbear-no-shell-check-patch]
-recipe = hexagonit.recipe.download
-md5sum = bb2ac410bd4cb2b07c23bfcc712e45f7
-url = ${:_profile_base_location_}/${:filename}
-filename = no-shell-checking.patch
-download-only = true
-
-[dropbear-static_build_fix.patch]
-recipe = hexagonit.recipe.download
-md5sum = 6e0ccc1949dfa31b4bc3951b9bb6472e
-url = ${:_profile_base_location_}/${:filename}
-filename = dropbear-0.53.1-static_build_fix.patch
-download-only = true
-
 [dropbear]
 recipe = slapos.recipe.cmmi
 md5sum = 0284ea239083f04c8b874e08e1aca243
@@ -57,10 +29,10 @@ environment =
   LDFLAGS =-Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib
 
 patches=
-  ${dropbear-userspace-patch:location}/${dropbear-userspace-patch:filename}
-  ${dropbear-ipv6-patch:location}/${dropbear-ipv6-patch:filename}
-  ${dropbear-no-shell-check-patch:location}/${dropbear-no-shell-check-patch:filename}
-  ${dropbear-static_build_fix.patch:location}/${dropbear-static_build_fix.patch:filename}
+  ${:_profile_base_location_}/userspace.patch#3d934c2c90e8c57536a4fa2cf8ad216d
+  ${:_profile_base_location_}/ipv6-support.patch#b30dd58d68829a80eee69188134382ef
+  ${:_profile_base_location_}/no-shell-checking.patch#bb2ac410bd4cb2b07c23bfcc712e45f7
+  ${:_profile_base_location_}/dropbear-0.53.1-static_build_fix.patch#6e0ccc1949dfa31b4bc3951b9bb6472e
 
 patch-options=
   -p1

component/gcc/buildout.cfg

@@ -55,19 +55,12 @@ environment =
   PATH=${m4:location}/bin:%(PATH)s
   LDFLAGS=-Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${ppl:location}/lib
 
-[gcc-multiarch.patch]
-recipe = hexagonit.recipe.download
-md5sum = 819e6735270c8a432b0512b49f40219f
-url = ${:_profile_base_location_}/${:filename}
-filename = ${:_buildout_section_name_}
-download-only = true
-
 [gcc]
 recipe = slapos.recipe.cmmi
 url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-4.5.3.tar.bz2
 md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
 patches =
-  ${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
+  ${:_profile_base_location_}/gcc-multiarch.patch#819e6735270c8a432b0512b49f40219f
 patch-options = -p2
 configure-command = make clean \\; make distclean \\; ./configure
 configure-options =

component/git/buildout.cfg

@@ -15,8 +15,8 @@ parts =
 
 [git]
 recipe = slapos.recipe.cmmi
-url = https://www.kernel.org/pub/software/scm/git/git-2.0.4.tar.xz
-md5sum = 0caa9c54bb04612062d21823163ecb13
+url = https://www.kernel.org/pub/software/scm/git/git-2.1.0.tar.xz
+md5sum = 47b1f55d9a16be112f7ae2c778a9b30c
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}

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.15.tar.xz
-md5sum = ec3b06f80e312137386c5d322183ca5a
+url = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-3.2.16.tar.xz
+md5sum = d9a3fb49121b49bc332bfe9c3f49b005
 configure-options =
   --disable-static
   --disable-libdane

component/make/buildout.cfg

@@ -10,18 +10,10 @@ extends =
 # Moreover, vanilla 3.81 does some seg faults, so use Debian patched version.
 <= make3.81-debian
 
-[make-dfsg_3.81-8.2.diff]
-# Debian patch coming from:
-# http://ftp.de.debian.org/debian/pool/main/m/make-dfsg/make-dfsg_3.81-8.2.diff.gz
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:_buildout_section_name_}
-md5sum = fa77bb989a096fafbe7c78582e9415e3
-download-only = true
-
 [make3.81-debian]
 recipe = slapos.recipe.cmmi
 url = http://ftp.de.debian.org/debian/pool/main/m/make-dfsg/make-dfsg_3.81.orig.tar.gz
 md5sum = 7c93b1ab4680eb21c2c13f4f47741e2d
 patches =
-  ${make-dfsg_3.81-8.2.diff:location}/make-dfsg_3.81-8.2.diff
+  ${:_profile_base_location_}/make-dfsg_3.81-8.2.diff#fa77bb989a096fafbe7c78582e9415e3
 patch-options = -p1

component/nettle/buildout.cfg

@@ -3,24 +3,18 @@ extends =
   ../gmp/buildout.cfg
   ../m4/buildout.cfg
 
-[nettle-lib-location.patch]
-recipe = hexagonit.recipe.download
-download-only = true
-filename = ${:_buildout_section_name_}
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 41dd0ce2a73487929bdc637b75dd62c9
-
 [nettle]
 recipe = slapos.recipe.cmmi
 url = http://www.lysator.liu.se/~nisse/archive/nettle-2.7.1.tar.gz
 md5sum = 003d5147911317931dd453520eb234a5
 patches =
-  ${nettle-lib-location.patch:location}/${nettle-lib-location.patch:filename}
+  ${:_profile_base_location_}/nettle-lib-location.patch#41dd0ce2a73487929bdc637b75dd62c9
 configure-option =
   --disable-static
   --disable-assembler
   --disable-openssl
+  --disable-documentation
 environment =
   PATH=${m4:location}/bin:%(PATH)s
   CPPFLAGS=-I${gmp:location}/include
-  LDFLAGS=-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib
+  LDFLAGS=-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib

component/perl-Term-ReadLine-Gnu/buildout.cfg

@@ -5,19 +5,12 @@ extends =
   ../readline/buildout.cfg
 parts = perl-Term-ReadLine-Gnu
 
-[perl-Term-ReadLine-Gnu.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = d4e4624e717c8da63e4d153149d57b68
-download-only = true
-filename = ${:_buildout_section_name_}
-
 [perl-Term-ReadLine-Gnu]
 recipe = slapos.recipe.cmmi
 url = http://search.cpan.org/CPAN/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.20.tar.gz
 md5sum = fa33510193b89a2ada74fcef00816322
 patch-options = -p0
 patches =
-  ${perl-Term-ReadLine-Gnu.patch:location}/${perl-Term-ReadLine-Gnu.patch:filename}
+  ${:_profile_base_location_}/perl-Term-ReadLine-Gnu.patch#d4e4624e717c8da63e4d153149d57b68
 configure-command =
   ${perl:location}/bin/perl Makefile.PL --libdir=${readline:location}/lib --includedir="${readline:location}/include" LIBS="-Wl,-R${readline:location}/lib -L${ncurses:location}/lib -Wl,-R${ncurses:location}/lib" INC="-I${ncurses:location}/include"

software/erp5-util-testing/instance.cfg

-[buildout]
-parts =
-  erp5-util-setup
-  test-runner
-  sh-environment
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[create-directory]
-recipe = slapos.cookbook:mkdirectory
-bin = $${buildout:directory}/bin
-etc = $${buildout:directory}/etc
-services = $${:etc}/run
-srv = $${buildout:directory}/srv
-source-code = $${:srv}/eggs-source-code
-
-[download-source]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-
-# Local development
-[erp5-util]
-<= download-source
-repository = ${erp5-util-repository:location}
-
-[erp5-util-setup]
-recipe = plone.recipe.command
-command = echo "Updating setup...";cd $${erp5-util:location}; export PATH="$${slapos-test-runner:prepend-path}:$PATH"; export CPPFLAGS="$${environment:CPPFLAGS}"; export LDFLAGS="$${environment:LDFLAGS}"; export PYTHONPATH="$${environment:PYTHONPATH}"; python setup.py test -n; python setup.py test -n; python setup.py test -n; python setup.py test -n
-update-command = $${:command}
-
-[test-runner]
-recipe = slapos.cookbook:egg_test
-run-test-suite = $${create-directory:bin}/runTestSuite
-run-test-suite-binary = ${buildout:bin-directory}/runTestSuite
-# The list of executables should be defined here and a combination
-# of tests should dynamically generated.
-#python-list = $${}
-test-list =
-  $${erp5-util:location}
-prepend-path = ${git:location}/bin:${libxslt:location}/bin:${python2.7:location}/bin
-environment = environment
-
-[environment]
-CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include
-LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib
-PYTHONPATH = ${buildout:eggs-directory}/setuptools-${versions:setuptools}-py2.7.egg
-LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:location}/lib
-
-[sh-environment]
-# Section exposes testing default environment as sh file. It is thus easy
-# to directly develop and test the egg inside of this instance.
-recipe = collective.recipe.template
-input = inline:
-  export PATH="$${test-runner:prepend-path}:$PATH"
-  export CPPFLAGS="$${environment:CPPFLAGS}"
-  export LDFLAGS="$${environment:LDFLAGS}"
-  export PYTHONPATH="$${environment:PYTHONPATH}"
-  export PS1="[slapos-testing env Active] $PS1"
-output = $${create-directory:bin}/environment.sh
-mode = 755

software/erp5-util-testing/software.cfg

-[buildout]
-
-extends =
-  ../../component/git/buildout.cfg
-  ../../component/lxml-python/buildout.cfg
-  ../../component/libxml2/buildout.cfg
-  ../../component/libxslt/buildout.cfg
-  ../../component/python-2.7/buildout.cfg
-  ../../component/python-setuptools/buildout.cfg
-  ../../component/zlib/buildout.cfg
-  ../../stack/slapos.cfg
-
-parts =
-  slapos.cookbook-repository
-  erp5-util-repository
-  eggs
-  template
-
-[eggs]
-recipe = zc.recipe.egg
-eggs = 
-  ${lxml-python:egg}
-  erp5.util
-  slapos.cookbook
-  collective.recipe.template
-entry-points =
-  runTestSuite=erp5.util.testsuite:runTestSuite
-scripts =
-  runTestSuite
-
-[slapos.cookbook-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
-repository = http://git.erp5.org/repos/slapos.git
-branch = master
-
-[erp5-util-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
-repository = http://git.erp5.org/repos/erp5.git
-branch = master
-
-[template]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-md5sum = 194278f0a65d692bd165a909e6c83148
-output =  ${buildout:directory}/template.cfg
-mode = 640
-
-[versions]
-Jinja2 = 2.6
-Werkzeug = 0.8.3
-buildout-versions = 1.7
-erp5.util = 0.4.7
-hexagonit.recipe.cmmi = 1.6
-lxml = 2.3.6
-meld3 = 0.6.8
-plone.recipe.command = 1.1
-slapos.cookbook = 0.65
-slapos.libnetworkcache = 0.13.2
-slapos.recipe.build = 0.11.2
-slapos.recipe.download = 1.0.dev-r4053
-slapos.recipe.template = 2.4.2
-
-# Required by:
-# slapos.core==0.28.5
-Flask = 0.9
-
-# Required by:
-# slapos.cookbook==0.65
-PyXML = 0.8.4
-
-# Required by:
-# hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.6nxd002
-
-# Required by:
-# slapos.cookbook==0.65
-inotifyx = 0.2.0
-
-# Required by:
-# slapos.cookbook==0.65
-netaddr = 0.7.10
-
-# Required by:
-# slapos.core==0.28.5
-netifaces = 0.10.4
-
-# Required by:
-# slapos.cookbook==0.65
-slapos.core = 0.28.5
-
-# Required by:
-# slapos.core==0.28.5
-supervisor = 3.0a12
-
-# Required by:
-# slapos.cookbook==0.65
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.65
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.28.5
-zope.interface = 4.0.1

software/jio/instance.cfg.in

-#############################
-#
-# Deploy jio instance
-#
-#############################
-[buildout]
-parts =
-  test-runner
-  phantomjs-wrapper
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-# Create all needed directories, depending on your needs
-[directory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-bin = $${buildout:directory}/bin/
-
-[download-source]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-
-# Local development
-[jio]
-<= download-source
-repository = ${jio-repository:location}
-
-[test-runner]
-recipe = slapos.cookbook:egg_test
-run-test-suite = $${directory:bin}/runTestSuite
-run-test-suite-binary = ${buildout:bin-directory}/runTestSuite
-test-list =
-  $${jio:location}
-prepend-path = ${git:location}/bin:${libxslt:location}/bin:${python2.7:location}/bin:${buildout:bin-directory}
-environment = environment
-
-[environment]
-CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include
-LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib -L${fontconfig:location}/lib -L${libexpat:location}/lib -L${freetype:location}/lib
-PYTHONPATH = ${python-setuptools:pythonpath}
-LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:location}/lib:${fontconfig:location}/lib:${libexpat:location}/lib:${freetype:location}/lib
-
-[phantomjs-wrapper]
-recipe = slapos.cookbook:wrapper
-command-line = ${phantomjs:location}/phantomjs-slapos
-wrapper-path = $${directory:bin}/phantomjs
-# XXX we must use "parameters-extra" (- instead of _)
-# when new slapos.cookbook will be used
-parameters_extra = true

software/jio/software.cfg

-[buildout]
-
-extends = 
-  ../../stack/slapos.cfg
-  ../../component/git/buildout.cfg
-  ../../component/phantomjs/buildout.cfg
-  ../../component/python-2.7/buildout.cfg
-  ../../component/python-setuptools/buildout.cfg
-
-parts =
-  template
-  phantomjs
-  eggs
-
-[eggs]
-recipe = zc.recipe.egg
-eggs =
-  ${lxml-python:egg}
-  slapos.cookbook
-  erp5.util
-  collective.recipe.template
-entry-points =
-  runTestSuite=erp5.util.testsuite:runTestSuite
-scripts =
-  runTestSuite
-
-[template]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg.in
-output = ${buildout:directory}/instance.cfg
-# MD5 checksum can be skipped for development, but must be filled for production
-md5sum = fa50ec507dafffedd1c7367195d4e214
-mode = 0644
-
-[jio-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
-repository = http://git.erp5.org/repos/jio.git
-branch = master
-
-[versions]
-Jinja2 = 2.6
-Werkzeug = 0.8.3
-buildout-versions = 1.7
-collective.recipe.template = 1.10
-erp5.util = 0.4.34
-hexagonit.recipe.cmmi = 2.0
-lxml = 3.1.1
-meld3 = 0.6.10
-plone.recipe.command = 1.1
-psutil = 0.6.1
-slapos.cookbook = 0.78.1
-slapos.recipe.build = 0.11.6
-slapos.recipe.template = 2.4.2
-
-# Required by:
-# slapos.core==0.35.1
-Flask = 0.9
-
-# Required by:
-# slapos.cookbook==0.76.0
-inotifyx = 0.2.0
-
-# Required by:
-# slapos.cookbook==0.76.0
-netaddr = 0.7.10
-
-# Required by:
-# slapos.core==0.35.1
-netifaces = 0.10.4
-
-# Required by:
-# slapos.core==0.35.1
-pyflakes = 0.6.1
-
-# Required by:
-# slapos.cookbook==0.76.0
-pytz = 2013b
-
-# Required by:
-# slapos.cookbook==0.76.0
-slapos.core = 0.35.1
-
-# Required by:
-# slapos.core==0.35.1
-supervisor = 3.0b1
-
-# Required by:
-# slapos.core==0.35.1
-unittest2 = 0.5.1
-
-# Required by:
-# slapos.cookbook==0.76.0
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.core==0.35.1
-zope.interface = 4.0.5

software/kvm/software.cfg

@@ -118,99 +118,41 @@ signature-certificate-list =
   -----END CERTIFICATE-----
 
 [versions]
-Werkzeug = 0.9.4
-apache-libcloud = 0.13.2
+PyRSS2Gen = 1.1
+apache-libcloud = 0.15.1
 async = 0.6.1
-buildout-versions = 1.7
-collective.recipe.template = 1.10
-erp5.util = 0.4.36
+collective.recipe.template = 1.11
+erp5.util = 0.4.38
 gitdb = 0.5.4
-itsdangerous = 0.23
-lxml = 3.2.3
-meld3 = 0.6.10
 plone.recipe.command = 1.1
-psutil = 1.1.1
-pycrypto = 2.6
+pycrypto = 2.6.1
 rdiff-backup = 1.0.5
-slapos.cookbook = 0.84.2
-slapos.recipe.cmmi = 0.2
 slapos.recipe.download = 1.0.dev-r4053
-slapos.toolbox = 0.37.4
+slapos.toolbox = 0.39.4
 smmap = 0.8.2
-websockify = 0.5.1
+websockify = 0.6.0
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# slapos.core==0.35.1
-# slapos.toolbox==0.37.4
-Flask = 0.10.1
-
-# Required by:
-# slapos.toolbox==0.37.4
+# slapos.toolbox==0.39.4
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.toolbox==0.37.4
-atomize = 0.1.1
+# slapos.toolbox==0.39.4
+atomize = 0.2.0
 
 # Required by:
-# paramiko==1.12.0
-ecdsa = 0.9
+# paramiko==1.14.0
+ecdsa = 0.11
 
 # Required by:
-# slapos.toolbox==0.37.4
+# slapos.toolbox==0.39.4
 feedparser = 5.1.3
 
 # Required by:
-# slapos.cookbook==0.84.2
-inotifyx = 0.2.0-1
-
-# Required by:
-# slapos.cookbook==0.84.2
-lock-file = 2.0
-
-# Required by:
-# slapos.cookbook==0.84.2
-netaddr = 0.7.10
-
-# Required by:
-# slapos.core==0.35.1
-netifaces = 0.10.4
-
-# Required by:
-# websockify==0.5.1
-numpy = 1.7.1
-
-# Required by:
-# slapos.toolbox==0.37.4
-paramiko = 1.12.0
-
-# Required by:
-# slapos.core==0.35.1
-pyflakes = 0.7.3
-
-# Required by:
-# slapos.cookbook==0.84.2
-pytz = 2013.7
-
-# Required by:
-# slapos.cookbook==0.84.2
-# slapos.toolbox==0.37.4
-slapos.core = 0.35.1
-
-# Required by:
-# slapos.core==0.35.1
-supervisor = 3.0
-
-# Required by:
-# slapos.core==0.35.1
-unittest2 = 0.5.1
-
-# Required by:
-# slapos.cookbook==0.84.2
-# slapos.toolbox==0.37.4
-xml-marshaller = 0.9.7
+# websockify==0.6.0
+numpy = 1.8.2
 
 # Required by:
-# slapos.core==0.35.1
-zope.interface = 4.0.5
+# slapos.toolbox==0.39.4
+paramiko = 1.14.0

software/officejs/instance.cfg.in

-#############################
-#
-# Deploy officejs instance
-#
-#############################
-[buildout]
-parts =
-  test-runner
-  phantomjs-wrapper
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-# Create all needed directories, depending on your needs
-[directory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-bin = $${buildout:directory}/bin/
-
-[download-source]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-
-# Local development
-[officejs]
-<= download-source
-repository = ${officejs-repository:location}
-
-[test-runner]
-recipe = slapos.cookbook:egg_test
-run-test-suite = $${directory:bin}/runTestSuite
-run-test-suite-binary = ${buildout:bin-directory}/runTestSuite
-test-list =
-  $${officejs:location}
-prepend-path = ${git:location}/bin:${libxslt:location}/bin:${python2.7:location}/bin:${buildout:bin-directory}
-environment = environment
-
-[environment]
-CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include
-LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib -L${fontconfig:location}/lib -L${libexpat:location}/lib -L${freetype:location}/lib
-PYTHONPATH = ${python-setuptools:location}
-LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:location}/lib:${fontconfig:location}/lib:${libexpat:location}/lib:${freetype:location}/lib
-
-[phantomjs-wrapper]
-recipe = slapos.cookbook:wrapper
-command-line = ${phantomjs:location}/phantomjs-slapos
-wrapper-path = $${directory:bin}/phantomjs
-# XXX we must use "parameters-extra" (- instead of _)
-# when new slapos.cookbook will be used
-parameters_extra = true

software/officejs/software.cfg

-[buildout]
-
-extends = 
-  ../../stack/slapos.cfg
-  ../../component/git/buildout.cfg
-  ../../component/phantomjs/buildout.cfg
-  ../../component/git/buildout.cfg
-  ../../component/python-2.7/buildout.cfg
-  ../../component/python-setuptools/buildout.cfg
-
-parts =
-  template
-  phantomjs
-  eggs
-
-[eggs]
-recipe = zc.recipe.egg
-eggs =
-  ${lxml-python:egg}
-  slapos.cookbook
-  erp5.util
-  collective.recipe.template
-entry-points =
-  runTestSuite=erp5.util.testsuite:runTestSuite
-scripts =
-  runTestSuite
-
-[template]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg.in
-output = ${buildout:directory}/instance.cfg
-# MD5 checksum can be skipped for development, but must be filled for production
-md5sum = bad9eca44660b819a69816e53c7d5428
-mode = 0644
-
-[officejs-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
-repository = http://git.erp5.org/repos/officejs.git
-branch = jqs
-
-[versions]
-Jinja2 = 2.6
-Werkzeug = 0.8.3
-buildout-versions = 1.7
-collective.recipe.template = 1.10
-erp5.util = 0.4.34
-hexagonit.recipe.cmmi = 2.0
-lxml = 3.1.1
-meld3 = 0.6.10
-plone.recipe.command = 1.1
-psutil = 0.6.1
-slapos.cookbook = 0.78.1
-slapos.recipe.build = 0.12
-slapos.recipe.template = 2.4.2
-
-# Required by:
-# slapos.core==0.35.1
-Flask = 0.9
-
-# Required by:
-# slapos.cookbook==0.76.0
-inotifyx = 0.2.0
-
-# Required by:
-# slapos.cookbook==0.76.0
-netaddr = 0.7.10
-
-# Required by:
-# slapos.core==0.35.1
-netifaces = 0.10.4
-
-# Required by:
-# slapos.core==0.35.1
-pyflakes = 0.6.1
-
-# Required by:
-# slapos.cookbook==0.76.0
-pytz = 2013b
-
-# Required by:
-# slapos.cookbook==0.76.0
-slapos.core = 0.35.1
-
-# Required by:
-# slapos.core==0.35.1
-supervisor = 3.0b1
-
-# Required by:
-# slapos.core==0.35.1
-unittest2 = 0.5.1
-
-# Required by:
-# slapos.cookbook==0.76.0
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.core==0.35.1
-zope.interface = 4.0.5

software/slaprunner-lite/README.txt

-slaprunner
-==========
-
-Introduction
-------------
-
-This software release is used to deploy Slaprunner instances.
-Slaprunner is an all-in-one IDE used to develop and test profiles and recipes for SlapOS.
-
-Parameters
-----------
-
-authorized-key
-~~~~~~~~~~~~~~
-
-You need to specify your SSH public key in order to connect to the SSH server of this instance.
-
-Example of parameter XML::
-
-  <?xml version="1.0" encoding="utf-8"?>
-  <instance>
-  <parameter id="authorized-key">ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdNp7qZMVAzNc07opHshiIFDmJpYXQpetfcSgUj39a409d42PpsJElp7WsAE/x0nN6gUIoWIl7UiAlMzf6bKEJGJVSOZEPTmiJVlgK1Gp+kE0x9yNcncYg7p38Jny0daVA/NkkpAFyRsAm5kLGzyLtaCcktSvy0cJuy7WSSHU05pd1f8Y8thofE9g5t+/JA2VZvipxPkRfkFAG3aOAGLULlTImTSDFSDFGSDFG5F6mMnl7yvY2d6vEHVBu+K+aKmAwZVfCUwtSpa/tq3i2Lppjrw3UfrxbQSFHZCkzefr+u+l4YYe+tJrX7rYJYXD7LIfZfdSeFTlHFaN/yI1 user@host.local</parameter>
-  </instance>
-
-instance-amount
-~~~~~~~~~~~~~~~
-
-Optional parameter.
-
-Default: 10

software/slaprunner-lite/common.cfg

-[buildout]
-extends =
-  ../../component/dash/buildout.cfg
-  ../../component/dropbear/buildout.cfg
-  ../../component/git/buildout.cfg
-  ../../component/lxml-python/buildout.cfg
-  ../../stack/flask.cfg
-  ../../stack/shacache-client.cfg
-  ../../stack/slapos.cfg
-
-parts =
-  template
-  slapos-cookbook
-  eggs
-
-[template]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-output = ${buildout:directory}/template.cfg
-mode = 0644
-md5sum = 5307e4200f044ae57b504ad68444491c
-
-[template-runner]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-runner.cfg
-output = ${buildout:directory}/template-runner.cfg
-md5sum = 4861be4a581686feef9f9edea865d7ee
-mode = 0644
-
-[eggs]
-recipe = z3c.recipe.scripts
-eggs =
-  ${lxml-python:egg}
-  slapos.libnetworkcache
-  slapos.toolbox[flask_auth]
-  slapos.core
-  cns.recipe.symlink

software/slaprunner-lite/development.cfg

-# Development profile of slaprunner.
-# Exactly the same as software.cfg, but fetch the slapos.cookbook and
-# slapos.toolbox from git repository instead of fetching stable version,
-# allowing to play with bleeding edge environment.
-
-# You'll need to run buildout twice for this profile.
-
-[buildout]
-extends = common.cfg
-
-parts +=
-  slapos.cookbook-repository
-  slapos.core-repository
-  slapos.toolbox-repository
-  check-recipe
-
-develop =
-  ${:parts-directory}/slapos.cookbook-repository
-  ${:parts-directory}/slapos.core-repository
-  ${:parts-directory}/slapos.toolbox-repository
-
-
-[slapos.toolbox-repository]
-recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/slapos.toolbox.git
-branch = slaprunner
-git-executable = ${git:location}/bin/git
-
-[slapos.cookbook-repository]
-recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/slapos.git
-branch = slaprunner
-git-executable = ${git:location}/bin/git
-
-[slapos.core-repository]
-recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/slapos.core.git
-branch = master
-git-executable = ${git:location}/bin/git
-
-[check-recipe]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command =
-  grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
-  grep parts ${buildout:develop-eggs-directory}/slapos.core.egg-link &&
-  grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link

software/slaprunner-lite/instance-runner.cfg

-[buildout]
-parts =
-  slaprunner
-  test-runner
-  sshkeys-dropbear
-  dropbear-server-add-authorized-key
-  sshkeys-authority
-  publish-connection-informations
-  slaprunner-promise
-  slaprunner-frontend-promise
-  dropbear-promise
-  symlinks
-
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-
-# Create all needed directories
-[directory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc/
-var = $${buildout:directory}/var/
-srv = $${buildout:directory}/srv/
-bin = $${buildout:directory}/bin/
-
-sshkeys = $${:srv}/sshkeys
-services = $${:etc}/service/
-scripts = $${:etc}/run/
-ssh = $${:etc}/ssh/
-log = $${:var}/log/
-run = $${:var}/run/
-backup = $${:srv}/backup/
-promises = $${:etc}/promise/
-test = $${:etc}/test/
-
-[runnerdirectory]
-recipe = slapos.cookbook:mkdirectory
-home = $${directory:srv}/runner/
-test = $${directory:srv}/test/
-project = $${:home}/project
-software-root = $${:home}/software
-instance-root = $${:home}/instance
-project-test = $${:test}/project
-software-test = $${:test}/software
-instance-test = $${:test}/instance
-sessions = $${buildout:directory}/.sessions
-
-#Create password recovery code for slaprunner
-[recovery-code]
-recipe = slapos.cookbook:generate.password
-storage-path = $${directory:etc}/.rcode
-bytes = 4
-
-[slaprunner]
-recipe = slapos.cookbook:slaprunner
-slaprunner = ${buildout:directory}/bin/slaprunner
-slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr
-slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
-slapproxy = ${buildout:directory}/bin/slapproxy
-supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl
-git-binary = ${git:location}/bin/git
-slapos.cfg = $${directory:etc}/slapos.cfg
-working-directory = $${runnerdirectory:home}
-project-directory = $${runnerdirectory:project}
-software-directory = $${runnerdirectory:software-root}
-instance-directory = $${runnerdirectory:instance-root}
-etc_dir = $${directory:etc}
-log_dir =  $${directory:log}
-run_dir = $${directory:run}
-ssh_client = $${sshkeys-dropbear:wrapper}
-public_key = $${sshkeys-dropbear:public-key}
-private_key = $${sshkeys-dropbear:private-key}
-ipv4 = $${slap-network-information:local-ipv4}
-ipv6 = $${slap-network-information:global-ipv6}
-proxy_port = 50000
-runner_port = 50000
-partition-amount = $${slap-parameter:instance-amount}
-wrapper = $${directory:services}/slaprunner
-debug = $${slap-parameter:debug}
-# Backward compatiblity
-cloud9-url =
-
-[test-runner]
-<= slaprunner
-recipe = slapos.cookbook:slaprunner.test
-slaprunnertest = ${buildout:directory}/bin/slaprunnertest
-slapos.cfg = $${directory:etc}/slapos-test.cfg
-working-directory = $${runnerdirectory:test}
-project-directory = $${runnerdirectory:project-test}
-software-directory = $${runnerdirectory:software-test}
-instance-directory = $${runnerdirectory:instance-test}
-proxy_port = 8602
-wrapper = $${directory:bin}/runTestSuite
-etc_dir = $${directory:test}
-
-
-# Deploy dropbear (minimalist SSH server)
-[sshkeys-directory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${directory:sshkeys}/requests/
-keys = $${directory:sshkeys}/keys/
-
-[sshkeys-authority]
-recipe = slapos.cookbook:sshkeys_authority
-request-directory = $${sshkeys-directory:requests}
-keys-directory = $${sshkeys-directory:keys}
-wrapper = $${directory:services}/sshkeys_authority
-keygen-binary = ${dropbear:location}/bin/dropbearkey
-
-[dropbear-server]
-recipe = slapos.cookbook:dropbear
-host = $${slap-network-information:global-ipv6}
-port = 2222
-home = $${directory:ssh}
-wrapper = $${directory:bin}/raw_sshd
-shell = /bin/bash
-rsa-keyfile = $${directory:ssh}/server_key.rsa
-dropbear-binary = ${dropbear:location}/sbin/dropbear
-
-[sshkeys-dropbear]
-<= sshkeys-authority
-recipe = slapos.cookbook:sshkeys_authority.request
-name = dropbear
-type = rsa
-executable = $${dropbear-server:wrapper}
-public-key = $${dropbear-server:rsa-keyfile}.pub
-private-key = $${dropbear-server:rsa-keyfile}
-wrapper = $${directory:services}/sshd
-
-[dropbear-server-add-authorized-key]
-<= dropbear-server
-recipe = slapos.cookbook:dropbear.add_authorized_key
-key = $${slap-parameter:authorized-key}
-
-
-# Request frontend
-[request-frontend]
-<= slap-connection
-recipe = slapos.cookbook:requestoptional
-name = Frontend
-# XXX We have hardcoded SR URL here.
-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
-config = url
-config-url = $${slaprunner:access-url}
-return = site_url
-
-
-# Send informations to SlapOS Master
-[publish-connection-informations]
-recipe = slapos.cookbook:publish
-backend_url = $${slaprunner:access-url}
-url =  $${request-frontend:connection-site_url}
-ssh_command = ssh $${dropbear-server:host} -p $${dropbear-server:port}
-password_recovery_code = $${recovery-code:passwd}
-
-
-# Deploy promises scripts
-[slaprunner-promise]
-recipe = slapos.cookbook:check_port_listening
-path = $${directory:promises}/slaprunner
-hostname = $${slaprunner:ipv6}
-port = $${slaprunner:runner_port}
-
-[slaprunner-frontend-promise]
-recipe = slapos.cookbook:check_url_available
-path = $${directory:promises}/slaprunner_frontend
-url = $${request-frontend:connection-site_url}
-dash_path = ${dash:location}/bin/dash
-curl_path = ${curl:location}/bin/curl
-
-[dropbear-promise]
-recipe = slapos.cookbook:check_port_listening
-path = $${directory:promises}/dropbear
-hostname = $${dropbear-server:host}
-port = $${dropbear-server:port}
-
-[symlinks]
-recipe = cns.recipe.symlink
-symlink_target = $${directory:bin}
-symlink_base = ${buildout:directory}/bin
-
-[slap-parameter]
-# Default value if no ssh key is specified
-authorized-key =
-# Default value of instances number in slaprunner
-instance-amount = 10
-debug = false

software/slaprunner-lite/instance.cfg

-[buildout]
-parts =
-  switch_softwaretype
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[switch_softwaretype]
-recipe = slapos.cookbook:softwaretype
-default = ${template-runner:output}
\ No newline at end of file

software/slaprunner-lite/software.cfg

-# Production profile of slaprunner.
-# Exactly the same as common.cfg, but:
-# 1/ Use a defined set of Python eggs instead of using the latest available
-#    ones from Pypi, to ensure stability;
-# 2/ Define list of trusted certificates for the cache.
-
-[buildout]
-extends = common.cfg
-
-[networkcache]
-# signature certificates of the following uploaders.
-#   Cedric de Saint Martin
-#   Test Agent
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-
-[versions]
-Flask-Auth = 0.85
-apache-libcloud = 0.15.1
-async = 0.6.1
-cns.recipe.symlink = 0.2.3
-gitdb = 0.5.4
-plone.recipe.command = 1.1
-pycrypto = 2.6.1
-slapos.recipe.download = 1.0.dev-r4053
-slapos.recipe.template = 2.5
-slapos.toolbox = 0.39.3
-smmap = 0.8.2
-z3c.recipe.scripts = 1.0.1
-
-# Required by:
-# slapos.toolbox==0.39.3
-GitPython = 0.3.2.RC1
-
-# Required by:
-# slapos.toolbox==0.39.3
-atomize = 0.2.0
-
-# Required by:
-# paramiko==1.14.0
-ecdsa = 0.11
-
-# Required by:
-# slapos.toolbox==0.39.3
-feedparser = 5.1.3
-
-# Required by:
-# slapos.toolbox==0.39.3
-paramiko = 1.14.0

software/test-slave-instance-deployment/software.cfg

 # This Software Release is used to test
 # the behavior of Slave Instances in slapos and in slaprunner.
 [buildout]
-
+# Local development
 develop =
-	/srv/slapgrid/slappart74/srv//runner/project/slapos
-
+  ${:parts-directory}/slapos.cookbook-repository
+extends =
+  ../../component/lxml-python/buildout.cfg
+  ../../component/git/buildout.cfg
 parts =
+  slapos.cookbook-repository
+  check-recipe
   slapos-cookbook
   instance-profile
   collective-egg
 
+# Local development
+[slapos.cookbook-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.git
+branch = master
+git-executable = ${git:location}/bin/git
+
+[check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
+
 [instance-profile]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
@@ -67,6 +84,8 @@ stevedore = 0.15
 supervisor = 3.1.0
 xml-marshaller = 0.9.7
 collective.recipe.template = 1.11
+plone.recipe.command = 1.1
+slapos.recipe.build = 0.12
 
 # Required by:
 # slapos.core==1.1.2
@@ -103,10 +122,6 @@ extensions +=
   buildout-versions
   mr.developer
 
-# Use shacache and lxml
-extends =
-  ../../component/lxml-python/buildout.cfg
-
 # Separate from site eggs
 allowed-eggs-from-site-packages =
 include-site-packages = false