Merge branch 'master' into master+ZODB4-wc2

* master:
  software/proftpd/test: fix flaky test_partial_upload_are_deleted
  fixup! slapos.cookbook: remove deprecated softwaretype recipe
  slapos.cookbook: remove deprecated softwaretype recipe
  move old software releases to unstable
  component/pysvn-python: version up 1.9.15
  component/subversion: version up 1.14.1
  component/serf: version up 1.3.9
  fixup! jstestnode: some cleanup
  remove unused test software releases
  nodejs: old versions need Python 2
  jstestnode: some cleanup
  nodejs: remove unused versions
  etherpad-lite: move to unstable
  cloud9: move to unstable
  software/kvm: remove unused nodejs compilation
  component/python3: do not build nis module
  component/openssh: version up 8.8p1
  Revert "component/fonts: Workaround download bug"
  version up: slapos.recipe.build 0.49
  python2.7: small cleanup

component/fonts/buildout.cfg

@@ -67,8 +67,6 @@ md5sum = b25e165c3fb984bbf6d847adfbd9d694
 <= fonts-base
 url = https://download.jetbrains.com/fonts/JetBrainsMono-2.001.zip
 md5sum = 62f02985bfef43a27dbdd17641fec210
-# Workaround download strip autodetection bug
-strip-top-level-dir = false
 
 # Microsoft's TrueType core fonts
 # non-free so not enabled by default

component/nodejs/buildout.cfg

@@ -11,8 +11,8 @@ extends =
 parts =
   nodejs
 
-[nodejs]
-<= nodejs-8.9.4
+#[nodejs]
+#<= nodejs-X.Y.Z
 
 [nodejs-14.16.0]
 <= nodejs-base
@@ -25,33 +25,19 @@ md5sum = 7dc3666f407bf4e12a01ce1be2883d31
 openssl_location = ${openssl:location}
 version = v12.18.3
 md5sum = 28bf6a4d98b238403fa58a0805f4a979
-
-[nodejs-10.19.0]
-<= nodejs-base
-openssl_location = ${openssl:location}
-version = v10.19.0
-md5sum = 9e433c753d839d2d2a6341861501674f
-
-[nodejs-10.6.0]
-<= nodejs-base
-openssl_location = ${openssl:location}
-version = v10.6.0
-md5sum = 9df233b86244ebda1ded1f91694fbe86
-
-[nodejs-8.9.4]
-<= nodejs-base
-version = v8.9.4
-md5sum = 4ddc1daff327d7e6f63da57fdfc24f55
+PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
 
 [nodejs-8.6.0]
 <= nodejs-base
 version = v8.6.0
 md5sum = 0c95e08220667d8a18b97ecec8218ac6
+PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
 
 [nodejs-8.12.0]
 <= nodejs-base
 version = v8.12.0
 md5sum = 5690333b77964edf81945fc724f6ea85
+PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
 
 [nodejs-base]
 # Server-side Javascript.
@@ -66,85 +52,15 @@ configure-options =
   --shared-openssl
   --shared-openssl-includes=${:openssl_location}/include
   --shared-openssl-libpath=${:openssl_location}/lib
+PATH = ${pkgconfig:location}/bin:%(PATH)s
 environment =
   HOME=@@LOCATION@@
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${:PATH}
   PKG_CONFIG_PATH=${:openssl_location}/lib/pkgconfig/
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-Wl,-rpath=${:openssl_location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
   LD_LIBRARY_PATH=${:openssl_location}/lib
 
-[nodejs-8.6.0-output]
-# Shared binary location to ease migration
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = ${coreutils-output:test} -x ${:node} -a -x ${:npm}
-node = ${nodejs-8.6.0:location}/bin/node
-npm = ${nodejs-8.6.0:location}/bin/npm
-
-[nodejs-5]
-# Server-side Javascript.
-recipe = slapos.recipe.cmmi
-version = v5.9.1
-url = http://nodejs.org/dist/${:version}/node-${:version}.tar.gz
-md5sum = 346c9325912271dc7614fe955c75c3a6
-configure-options =
-  --shared-openssl
-  --shared-openssl-includes=${openssl:location}/include
-  --shared-openssl-libpath=${openssl:location}/lib
-environment =
-  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
-  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-
-[nodejs-4]
-# Server-side Javascript.
-recipe = slapos.recipe.cmmi
-version = v4.4.1
-url = http://nodejs.org/dist/${:version}/node-${:version}.tar.gz
-md5sum = ef756c3e773f08bccada08eb37ee699c
-configure-options =
-  --shared-openssl
-  --shared-openssl-includes=${openssl:location}/include
-  --shared-openssl-libpath=${openssl:location}/lib
-environment =
-  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
-  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-
-[nodejs-0.6]
-# Server-side Javascript.
-recipe = slapos.recipe.cmmi
-url = http://nodejs.org/dist/v0.6.21/node-v0.6.21.tar.gz
-md5sum = 0da985a0bf820400af92363b9f453fe4
-configure-options =
-  --openssl-includes=${openssl:location}/include
-  --openssl-libpath=${openssl:location}/lib
-environment =
-  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
-  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-
-[nodejs-0.4]
-recipe = slapos.recipe.cmmi
-url = http://nodejs.org/dist/node-v0.4.12.tar.gz
-md5sum = a6375eaa43db5356bf443e25b828ae16
-configure-options =
-  --openssl-includes=${openssl:location}/include
-  --openssl-libpath=${openssl:location}/lib
-environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
-  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-
 [npm]
 # Node.js Package Manager
 # Deprecated. Included in node >= 0.6.3.

component/openssh/buildout.cfg

@@ -16,13 +16,13 @@ parts =
 [openssh]
 recipe = slapos.recipe.cmmi
 shared = true
-md5sum = 68ba883aff6958297432e5877e9a0fe2
+md5sum = 8ce5f390958baeeab635aafd0ef41453
 location = @@LOCATION@@
-url = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.7p1.tar.gz
+url = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-8.8p1.tar.gz
 patch-binary = ${patch:location}/bin/patch
 patch-options = -p1
 patches =
-  ${:_profile_base_location_}/no_create_privsep_path.patch#f341dc11d73df6f43c7ae1fa47b8c003
+  ${:_profile_base_location_}/no_create_privsep_path.patch#6ab983d16c9b4caf111c737dcad6ec9b
 environment = 
   CPPFLAGS=-I${zlib:location}/include -I${openssl-1.0:location}/include
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl-1.0:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib

component/openssh/no_create_privsep_path.patch

@@ -14,7 +14,7 @@ diff --git a/Makefile.in b/Makefile.in
 index 04e1c8e5..9bd5d01b 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -329,7 +329,6 @@ install-files:
+@@ -391,7 +391,6 @@ install-files:
  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
  	$(MKDIR_P) $(DESTDIR)$(libexecdir)

component/pysvn-python/buildout.cfg

@@ -11,10 +11,9 @@ parts =
 recipe = zc.recipe.egg:custom
 egg =
   pysvn
-find-links = http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.10.tar.gz
+find-links = https://sourceforge.net/projects/pysvn/files/pysvn/V1.9.15/pysvn-1.9.15.tar.gz/download
 patches =
-  ${:_profile_base_location_}/pysvn-1.7.10-inc_lib_dir.patch#08371129e0d0a215fb7f7811a860a89c
-  ${:_profile_base_location_}/pysvn-issue-179.patch#bd3f9629f95f0f749c5a5e93c797ee2b
+  ${:_profile_base_location_}/pysvn-1.9.15-inc_lib_dir.patch#c16eb88a862d4676c0ea2827f51b991a
 patch-options = -p1
 patch-binary = ${patch:location}/bin/patch
 include-dirs =

component/pysvn-python/pysvn-1.7.10-inc_lib_dir.patch → component/pysvn-python/pysvn-1.9.15-inc_lib_dir.patch

-diff -ur pysvn-1.7.10.orig/setup.py pysvn-1.7.10/setup.py
---- pysvn-1.7.10.orig/setup.py	2010-12-30 13:26:51.000000000 +0100
-+++ pysvn-1.7.10/setup.py	2015-08-14 10:29:25.562686564 +0200
-@@ -19,6 +19,10 @@
+diff --git a/setup.py b/setup.py
+index e5ce838..e2b95f8 100644
+--- a/setup.py
++++ b/setup.py
+@@ -40,9 +40,16 @@ import distutils.sysconfig
+ import platform
+ import shutil
+ import sys
++import subprocess
  import os
  import os.path
- import setuptools.command.bdist_egg
++import setuptools.command.bdist_egg
+ from setuptools.command.build_ext import build_ext
 +try:
 +  from ConfigParser import ConfigParser
 +except ImportError:
 +  from configparser import ConfigParser
++
  
  pysvn_version_info = {}
  f = open( 'Builder/version.info', 'r' )
-@@ -27,13 +28,26 @@
-     pysvn_version_info[ key ] = value
+@@ -77,6 +84,13 @@ class BuildExtensions(build_ext):
+             super( BuildExtensions, self ).build_extension( ext )
  
- def run(self):
-+    cfg = ConfigParser()
-+    cfg.read('setup.cfg')
-+    kw = {}
-+    for key in ('include-dirs', 'library-dirs'):
-+        if cfg.has_option('build_ext', key):
-+            kw[key] = cfg.get('build_ext', key)
+     def _build_pysvn( self, ext ):
++        cfg = ConfigParser()
++        cfg.read('setup.cfg')
++        kw = {}
++        for key in ('include-dirs', 'library-dirs'):
++            if cfg.has_option('build_ext', key):
++                kw[key] = cfg.get('build_ext', key)
 +
-     # Generate metadata first
-     self.run_command("egg_info")
-     os.chdir('Source')
--    os.system(sys.executable + ' setup.py configure')
-+    os.system(sys.executable + ' setup.py configure --include-dirs=%(include-dirs)s --library-dirs=%(library-dirs)s' % kw)
-     os.system('make clean')
-     os.system('make')
--    os.system('make egg DISTDIR="%s"' % os.path.abspath(os.path.join('..', self.dist_dir)))
-+    os.system('rm -rf dist; mkdir -p dist/EGG-INFO')
-+    os.system('cp -rvf pysvn dist')
-+    os.system('cp -rvf ../pysvn.egg-info/* dist/EGG-INFO')
-+    os.system('find dist/pysvn -type f | sed s:dist/:: > dist/EGG-INFO/SOURCES.txt')
-+    setuptools.command.bdist_egg.make_zipfile(
-+        self.egg_output, 'dist', verbose=self.verbose,
-+        dry_run=self.dry_run, mode=self.gen_header())
-     os.chdir('..')              # Go back in parent directory
-     # Add to 'Distribution.dist_files' so that the "upload" command works
-     getattr( self.distribution, 'dist_files', [] ).append(
-diff -ur pysvn-1.7.10.orig/Source/setup_configure.py pysvn-1.7.10/Source/setup_configure.py
---- pysvn-1.7.10.orig/Source/setup_configure.py	2014-11-09 11:55:47.000000000 +0100
-+++ pysvn-1.7.10/Source/setup_configure.py	2015-08-17 10:41:05.781767086 +0200
-@@ -54,6 +54,8 @@
- class Options:
+         dest_dir = os.path.join( os.path.abspath( self.build_lib ), 'pysvn' )
+ 
+         # Generate metadata first
+@@ -91,9 +105,13 @@ class BuildExtensions(build_ext):
+         # Invoke the build system. This will generate the __init__.py and
+         # .so that we'll package.
+         os.chdir( 'Source' )
+-        os.system( sys.executable + ' setup.py configure' )
+-        os.system( 'make clean' )
+-        os.system( 'make' )
++        subprocess.check_call(sys.executable + ' setup.py configure --include-dirs=%(include-dirs)s --library-dirs=%(library-dirs)s' % kw, shell=True)
++        subprocess.check_call('make clean', shell=True)
++        subprocess.check_call('make', shell=True)
++        subprocess.check_call('rm -rf dist; mkdir -p dist/EGG-INFO', shell=True)
++        subprocess.check_call('cp -rvf pysvn dist', shell=True)
++        subprocess.check_call('cp -rvf ../pysvn.egg-info/* dist/EGG-INFO', shell=True)
++        subprocess.check_call('find dist/pysvn -type f | sed s:dist/:: > dist/EGG-INFO/SOURCES.txt', shell=True)
+ 
+         # Copy the built files to the destination pysvn/ directory.
+         self.mkpath( dest_dir )
+diff --git a/Source/setup_configure.py b/Source/setup_configure.py
+index 2bf8ca1..7037f8f 100644
+--- a/Source/setup_configure.py
++++ b/Source/setup_configure.py
+@@ -55,6 +55,8 @@ class Options:
      all_options_info = {
          '--arch':               (2, '<arch>'),
+         '--distro-dir':         (2, '<dir>'),
 +        '--library-dirs':       (1, '<dir>:<dir>:...'),
 +        '--include-dirs':       (1, '<dir>:<dir>:...'),
          '--apr-inc-dir':        (1, '<dir>'),
          '--apu-inc-dir':        (1, '<dir>'),
          '--apr-lib-dir':        (1, '<dir>'),
-@@ -511,12 +513,16 @@
+@@ -542,12 +544,16 @@ class Compiler:
          raise last_exception
  
      def find_svn_bin( self ):
@@ -70,28 +80,28 @@ diff -ur pysvn-1.7.10.orig/Source/setup_configure.py pysvn-1.7.10/Source/setup_c
 +            return ''
  
      def find_svn_lib( self ):
-         folder = self.find_dir(
-@@ -589,8 +595,8 @@
+         last_exception = None
+@@ -633,8 +639,8 @@ class Compiler:
          # override the base_dir_list from the command line kw
          svn_root_dir = None
  
 -        if self.options.hasOption( kw ):
 -            base_dir_list = [self.options.getOption( kw )]
 +        if kw and self.options.hasOption( kw ):
-+            base_dir_list = self.options.getOption( kw ) + base_dir_list
++            base_dir_list = [self.options.getOption( kw )] + base_dir_list
+ 
+         debug( '__find_dir base_dir_list=%r' % (base_dir_list,) )
  
-         elif( self.options.hasOption( '--svn-root-dir' )
-         and svn_root_suffix is not None ):
-@@ -604,7 +610,7 @@
+@@ -644,7 +650,7 @@ class Compiler:
              if self.verbose:
                  print( 'Info: Checking for %s in %s' % (name, full_check_file) )
              if os.path.exists( full_check_file ):
 -                return os.path.abspath( dirname )
 +                return dirname
  
-         raise SetupError( 'cannot find %s %s - use %s' % (name, check_file, kw) )
+         raise SetupError( 'Cannot find %s %s - use %s' % (name, check_file, kw) )
  
-@@ -629,6 +635,17 @@
+@@ -669,6 +675,17 @@ class Compiler:
      def getSvnVersion( self ):
          return self.__svn_version_tuple
  
@@ -109,33 +119,42 @@ diff -ur pysvn-1.7.10.orig/Source/setup_configure.py pysvn-1.7.10/Source/setup_c
  
  class Win32CompilerMSVC90(Compiler):
      def __init__( self, setup ):
-@@ -1093,7 +1110,7 @@
-                         '%(PYCXX)s/Src',
-                         '/usr/share/python%s/CXX' % distutils.sysconfig.get_python_version() # typical Linux
+@@ -1185,6 +1202,7 @@ class UnixCompilerGCC(CompilerGCC):
+         CompilerGCC.__init__( self, setup )
+ 
+         self._find_paths_pycxx_dir = [
++                        '../Import/pycxx-7.1.5',
+                         distutils.sysconfig.get_python_inc(), # typical Linux
+                         '/usr/include'
+                         ]
+@@ -1194,7 +1212,7 @@ class UnixCompilerGCC(CompilerGCC):
+                         '/usr/src/CXX'
                          ]
+ 
 -        self._find_paths_svn_inc = [
 +        self._find_paths_svn_inc = self._include_dirs() + [
                          '/usr/include/subversion-1',            # typical Linux
                          '/usr/local/include/subversion-1',      # typical *BSD
                          '/usr/pkg/include/subversion-1',        # netbsd
-@@ -1103,14 +1120,14 @@
-                         '/usr/local/bin',                        # typical *BSD
-                         '/usr/pkg/bin',                                # netbsd
+@@ -1204,7 +1222,7 @@ class UnixCompilerGCC(CompilerGCC):
+                         '/usr/local/bin',                       # typical *BSD
+                         '/usr/pkg/bin',                         # netbsd
                          ]
 -        self._find_paths_svn_lib = [
 +        self._find_paths_svn_lib = self._library_dirs() + [
                          '/usr/lib64',                           # typical 64bit Linux
                          '/usr/lib',                             # typical Linux
                          '/usr/local/lib64',                     # typical 64bit Linux
-                         '/usr/local/lib',                       # typical *BSD
+@@ -1212,7 +1230,7 @@ class UnixCompilerGCC(CompilerGCC):
                          '/usr/pkg/lib',                         # netbsd
+                         '/usr/lib/x86_64-linux-gnu',            # debian/unbuntu
                          ]
 -        self._find_paths_apr_inc = [
 +        self._find_paths_apr_inc = self._include_dirs() + [
                          '/usr/include/apr-1',                   # typical Linux
+                         '/usr/include/apr-1.0',                 # typical Linux
                          '/usr/local/apr/include/apr-1',         # Mac OS X www.metissian.com
-                         '/usr/pkg/include/apr-1',               # netbsd
-@@ -1120,7 +1137,7 @@
+@@ -1223,7 +1241,7 @@ class UnixCompilerGCC(CompilerGCC):
                          '/usr/local/include/apache2',           # alternate *BSD
                          ]
          self._find_paths_apr_util_inc = self._find_paths_apr_inc
@@ -144,7 +163,7 @@ diff -ur pysvn-1.7.10.orig/Source/setup_configure.py pysvn-1.7.10/Source/setup_c
                          '/usr/lib64',                           # typical 64bit Linux
                          '/usr/lib',                             # typical Linux
                          '/usr/local/lib64',                     # typical 64bit Linux
-@@ -1186,6 +1203,8 @@
+@@ -1310,6 +1328,8 @@ class LinuxCompilerGCC(UnixCompilerGCC):
          if not self.setup.options.hasOption( '--norpath' ):
              py_ld_libs.extend( [
                      '-Wl,--rpath',

component/pysvn-python/pysvn-issue-179.patch

-http://pysvn.tigris.org/ds/viewMessage.do?dsForumId=1334&dsMessageId=3094617
-
-diff -ur pysvn-1.7.10.orig/Source/pysvn_svnenv.cpp pysvn-1.7.10/Source/pysvn_svnenv.cpp
---- pysvn-1.7.10.orig/Source/pysvn_svnenv.cpp	2010-11-20 13:02:37.000000000 +0100
-+++ pysvn-1.7.10/Source/pysvn_svnenv.cpp	2015-08-17 17:39:50.491209720 +0200
-@@ -292,8 +292,8 @@
-     if( accept_permanently )
-     {
-         new_cred->may_save = 1;
--        new_cred->accepted_failures = accepted_failures;
-     }
-+    new_cred->accepted_failures = accepted_failures;
- 
-     *cred = new_cred;
- 

component/python-2.7/buildout.cfg

@@ -33,11 +33,8 @@ package_version = 2.7.18
 package_version_suffix =
 md5sum = fd6cc8ec0a78c44036f825e739f36e5a
 
-# This is actually the default setting for prefix, but we can't use it in
-# other settings in this part if we don't set it explicitly here.
-prefix = @@LOCATION@@
 version = 2.7
-executable = ${:prefix}/bin/python${:version}
+executable = @@LOCATION@@/bin/python${:version}
 
 patch-options = -p1
 patches =
@@ -61,11 +58,11 @@ make-targets = make profile-opt && make install
 # recent RedHat would otherwise mangle them, either failing ('python' is
 # ambiguous and 'python2' is not supported anymore) or replacing with
 # something that's really wrong (/usr/bin/python...).
-post-install = cd '${:prefix}' &&
+post-install = cd '%(prefix)s' &&
   find -executable -type f -print0 |
   xargs -0 grep -I -m 1 '' |
   sed -n 's,:#! */usr/bin/env \+python2\?$,,p' |
-  xargs -d '\n' sed -i '1s,.*,#!${:executable},'
+  xargs -d '\n' sed -i '1s,.*,#!%(executable)s,'
 
 # the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,
 # which would otherwise load the system libmagic.so with ctypes

component/python3/buildout.cfg

@@ -42,6 +42,7 @@ configure-options =
   --with-openssl=${openssl:location}
 # Profiled build:
   --enable-optimizations
+pre-build = printf '*disabled*\nnis\n' >> Modules/Setup.local
 pre-install = mkdir profile-opt
 
 # the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,

component/serf/buildout.cfg

@@ -10,12 +10,22 @@ extends =
 [serf]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://archive.apache.org/dist/serf/serf-1.2.1.tar.bz2
-md5sum = 4f8e76c9c6567aee1d66aba49f76a58b
-configure-options =
-  --with-apr=${apr:location}
-  --with-apr-util=${apr-util:location}
-  --with-openssl=${openssl-1.0:location}
-environment =
-  CFLAGS=-I${zlib:location}/include -I${libuuid:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
+url = https://archive.apache.org/dist/serf/serf-1.3.9.tar.bz2
+md5sum = 370a6340ff20366ab088012cd13f2b57
+scons-command =
+  python ${scons:location}/scons.py \
+  APR="${apr:location}" \
+  APU="${apr-util:location}" \
+  OPENSSL="${openssl:location}" \
+  PREFIX=@@LOCATION@@ \
+  CFLAGS="-I${zlib:location}/include -I${libuuid:location}/include" \
+  LINKFLAGS="-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib"
+configure-command = :
+make-binary = ${:scons-command}
+
+[scons]
+recipe = slapos.recipe.build:download-unpacked
+shared = true
+url = https://prdownloads.sourceforge.net/scons/scons-local-2.3.0.tar.gz
+md5sum = d262e6c6da620488d2226fabc8aabf09
+strip-top-level-dir = false

component/subversion/buildout.cfg

@@ -15,26 +15,25 @@ extends =
   ../sqlite3/buildout.cfg
   ../zlib/buildout.cfg
   ../swig/buildout.cfg
+  ../lz4/buildout.cfg
 parts =
   subversion
 
 [subversion]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://apache.mirrors.tds.net/subversion/subversion-1.8.14.tar.bz2
-md5sum = fe476ba26d6835eba4393780ea907361
-# Patch available thanks to gentoo developpers
-# https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-vcs/subversion/files/subversion-fix-parallel-build-support-for-perl-bindings.patch
-patches =
-  ${:_profile_base_location_}/subversion-fix-parallel-build-support-for-perl-bindings.patch#fd69f4c932b4882ed98c59eb102be64a
+url = https://downloads.apache.org/subversion/subversion-1.14.1.tar.bz2
+md5sum = 2eccc2c7451397e01a13682600af9563
 configure-options =
   --disable-static
   --with-apr=${apr:location}
   --with-apr-util=${apr-util:location}
   --with-serf=yes
   --without-apxs
+  --with-utf8proc=internal
   --with-zlib=${zlib:location}
   --with-sqlite=${sqlite3:location}
+  --with-lz4=${lz4:location}
   --without-berkeley-db
   --without-sasl
   --without-apr_memcache
@@ -53,9 +52,9 @@ configure-options =
 make-targets = install -j1
 environment =
   PATH=${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl-1.0:location}/lib/pkgconfig:${serf:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${serf:location}/lib/pkgconfig
   CPPFLAGS=-I${libexpat:location}/include -I${libuuid:location}/include
-  LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib
+  LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${serf:location}/lib -Wl,-rpath=${lz4:location}/lib
 
 [subversion-1.9]
 recipe = hexagonit.recipe.cmmi

component/subversion/subversion-fix-parallel-build-support-for-perl-bindings.patch

---- Makefile.in	2011-07-16 13:50:53.000000000 +0200
-+++ Makefile.in.new	2012-03-11 12:13:57.000000000 +0100
-@@ -732,7 +732,7 @@
- extraclean-swig-headers: clean-swig-headers
- 	$(EXTRACLEAN_SWIG_HEADERS)
- 
--$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in
-+$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in libsvn_swig_perl
- 	./config.status subversion/bindings/swig/perl/native/Makefile.PL
- 
- $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL

setup.py

@@ -162,7 +162,6 @@ setup(name=name,
           'slapconfiguration.serialised = slapos.recipe.slapconfiguration:Serialised',
           'slapconfiguration.jsondump = slapos.recipe.slapconfiguration:JsonDump',
           'slapcontainer = slapos.recipe.container:Recipe',
-          'softwaretype = slapos.recipe.softwaretype:Recipe', # BBB
           'sphinx= slapos.recipe.sphinx:Recipe',
           'squid = slapos.recipe.squid:Recipe',
           'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',

software/jstestnode/buildout.hash.cfg

@@ -27,4 +27,4 @@ md5sum = 98faa5ad8cfb23a11d97a459078a1d05
 
 [template-runTestSuite]
 filename = runTestSuite.in
-md5sum = 3e2fbde4b6a1cc202b5fd2a0f14413fd
+md5sum = 9d82f8afa0de8ec2b9c4f32e058fb2bc

software/jstestnode/runTestSuite.in

@@ -69,7 +69,7 @@ def main():
     target = test_runner.get('target', 'firefox')
     if target == 'node':
       # Execute NodeJS tests
-      result_string = check_output(['${nodejs-output:node}', '${jio-repository.git:location}/test/node.js'],
+      result_string = check_output(['${nodejs:location}/bin/node', '${jio-repository.git:location}/test/node.js'],
                                    cwd='${jio-repository.git:location}',
                                    env={'CI': 'true'})
       result_dict = json.loads(result_string)

software/jstestnode/software.cfg

@@ -32,9 +32,6 @@ parts =
 [nodejs]
 <= nodejs-8.6.0
 
-[nodejs-output]
-<= nodejs-8.6.0-output
-
 [eggs]
 recipe = zc.recipe.egg
 eggs =
@@ -54,7 +51,11 @@ develop = true
 [renderjs-install]
 recipe = plone.recipe.command
 stop-on-error = true
-command = cd ${renderjs-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:${bzip2:location}/bin/:$PATH ${nodejs-output:npm} install . && PATH=${git:location}/bin/:${nodejs:location}/bin/:${bzip2:location}/bin/:$PATH ./node_modules/grunt-cli/bin/grunt
+command = set -e
+  cd ${renderjs-repository.git:location}
+  PATH=${git:location}/bin:${nodejs:location}/bin:${bzip2:location}/bin:$PATH
+  npm install .
+  ./node_modules/grunt-cli/bin/grunt
 update-command = ${:command}
 
 [jio-repository.git]
@@ -67,7 +68,11 @@ develop = true
 [jio-install]
 recipe = plone.recipe.command
 stop-on-error = true
-command = cd ${jio-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ${nodejs:location}/bin/npm install jslint@0.9.2 jison@0.4.16 git://github.com/qunitjs/node-qunit.git#v0.9.3 sinon@1.7.3 && PATH=${curl:location}/bin/:${nodejs:location}/bin/:$PATH make
+command = set -e
+  cd ${jio-repository.git:location}
+  PATH=${git:location}/bin:${nodejs:location}/bin:$PATH
+  ${nodejs:location}/bin/npm install jslint@0.9.2 jison@0.4.16 git://github.com/qunitjs/node-qunit.git#v0.9.3 sinon@1.7.3
+  make
 update-command = ${:command}
 
 [rsvp-repository.git]
@@ -80,7 +85,10 @@ develop = true
 [rsvp-install]
 recipe = plone.recipe.command
 stop-on-error = true
-command = cd ${rsvp-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ${nodejs:location}/bin/npm install .
+command = set -e
+  cd ${rsvp-repository.git:location}
+  PATH=${git:location}/bin:${nodejs:location}/bin:$PATH
+  npm install .
 update-command = ${:command}
 
 [uritemplate-repository.git]
@@ -93,7 +101,10 @@ develop = true
 [uritemplate-install]
 recipe = plone.recipe.command
 stop-on-error = true
-command = cd ${uritemplate-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ${nodejs:location}/bin/npm install .
+command = set -e
+  cd ${uritemplate-repository.git:location}
+  PATH=${git:location}/bin:${nodejs:location}/bin:$PATH
+  npm install .
 update-command = ${:command}
 
 [macro-template]

software/kvm/software.cfg

@@ -13,7 +13,6 @@ extends =
   ../../component/numpy/buildout.cfg
   ../../component/gzip/buildout.cfg
   ../../stack/slapos.cfg
-  ../../component/nodejs/buildout.cfg
   ../../stack/resilient/buildout.cfg
   buildout.hash.cfg
 
@@ -57,38 +56,6 @@ eggs =
 scripts =
   websockify
 
-[http-proxy]
-# https://github.com/nodejitsu/node-http-proxy
-recipe = slapos.recipe.build:download-unpacked
-shared = true
-#XXX-Cedric : use upstream when merged
-url = https://nodeload.github.com/desaintmartin/node-http-proxy/zipball/20120621
-md5sum = 20204d0b29c2cef26e1c91e99eedca6b
-
-[proxy-by-url]
-# https://github.com/dominictarr/proxy-by-url
-recipe = slapos.recipe.build:download-unpacked
-shared = true
-#XXX-Cedric : use upstream when merged
-url = https://nodeload.github.com/desaintmartin/proxy-by-url/zipball/20120621
-md5sum = c2609948aa708581f93b981b23880314
-
-[npm-modules]
-recipe = plone.recipe.command
-destination = ${buildout:parts-directory}/${:_buildout_section_name_}
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command =
-  export HOME=${:location};
-  rm -fr ${:destination} &&
-  mkdir -p ${:destination} &&
-  cd ${:destination} &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install colors@0.6.0-1 &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install socket.io@0.8.7 &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install socket.io-client@0.8.7 &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install optimist@0.3.1 &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install pkginfo@0.2.3
-
-
 # Create all templates that will be used to deploy instances
 [download-base]
 recipe = hexagonit.recipe.download

software/proftpd/test/test.py

@@ -31,6 +31,7 @@ from urllib.parse import urlparse, parse_qs
 import tempfile
 import io
 import subprocess
+import time
 from http.server import BaseHTTPRequestHandler
 import logging
 
@@ -152,7 +153,12 @@ class TestSFTPOperations(ProFTPdTestCase):
 
       with self.assertRaises(IOError):
         sftp.sftp_client.putfo(ErrorFile(), "destination")
+
     # no half uploaded file is kept
+    for _ in range(10):
+      if not os.listdir(self.upload_dir):
+        break
+      time.sleep(0.1)
     self.assertEqual([], os.listdir(self.upload_dir))
 
   def test_user_cannot_escape_home(self):

software/slapos-in-partition/README.rst

-XXX TODO

software/slapos-in-partition/common.cfg

-[buildout]
-extends =
-  ../../component/apache/buildout.cfg
-  ../../component/bash/buildout.cfg
-  ../../component/dcron/buildout.cfg
-  ../../component/dropbear/buildout.cfg
-  ../../component/gzip/buildout.cfg
-  ../../component/logrotate/buildout.cfg
-  ../../stack/slapos.cfg
-
-parts =
-  instance-profile
-  slapos-cookbook
-  eggs
-
-# Add hosting location of testing version of slapos.core
-find-links +=
-  http://www.nexedi.org/static/packages/source/slapos.core-testing/
-
-[environment]
-recipe = collective.recipe.environment
-
-
-[instance-profile]
-# 3 advantages of using jinja2 for ALL templates:
-# 1/ Explicit scope (pythonic style, we explicitely list what we want to be in the scope)
-# 2/ No troubles between $ and $$ (more simple)
-# 3/ We can explicitely define the path of executables (i.e
-#    in software, define httpd-executable = ${apache:location}/bin/httpd
-#    and in instance, just use httpd-executable without bother where it is actually
-#    (location can change inside of the component, from bin to sbin for example).
-recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/instance.cfg.jinja2
-rendered = ${buildout:directory}/instance.cfg
-#md5sum = 4861be4a581686feef9f9edea865d7ee
-mode = 0644
-context =
-    key bin_directory buildout:bin-directory
-    key develop_eggs_directory buildout:develop-eggs-directory
-    key eggs_directory buildout:eggs-directory
-    key path environment:PATH
-    raw httpd_executable ${apache:location}/bin/httpd
-    raw bash_executable ${bash:location}/bin/bash
-    raw dcron_executable ${dcron:location}/sbin/crond
-    raw dropbear_executable ${dropbear:location}/sbin/dropbear
-    raw dropbearkey_executable ${dropbear:location}/bin/dropbearkey
-    raw gzip_executable ${gzip:location}/bin/gzip
-    raw gunzip_executable ${gzip:location}/bin/gunzip
-    raw logrotate_executable ${logrotate:location}/usr/sbin/logrotate
-    raw slapos_configuration_file_template_path ${slapos-configuration-file-template:target}
-    raw httpd_configuration_file_template_path ${httpd-configuration-file-template:target}
-
-[slapos-configuration-file-template]
-# Download the template of slapos.cfg
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/template/slapos.cfg.in
-#md5sum = 
-target = ${buildout:directory}/slapos.cfg.in
-mode = 0644
-
-
-[httpd-configuration-file-template]
-# Download the template of httpd.conf
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/template/httpd.conf.in
-mode = 0644
-#md5sum = 
-#target = ${
-
-[eggs]
-recipe = zc.recipe.egg
-eggs =
-  collective.recipe.template

software/slapos-in-partition/software.cfg

-# Production profile of slapos-in-partition
-# 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
-
-[versions]
-Pygments = 1.6
-collective.recipe.environment = 0.2.0
-collective.recipe.template = 1.10

software/slapos-in-partition/template/httpd.conf.in

-# Apache static configuration
-# Automatically generated
-
-# Basic server configuration
-PidFile "${:pid-file}"
-Listen [${:listening-ip}]:${:listening-port}
-ServerAdmin someone@email
-DefaultType text/plain
-TypesConfig conf/mime.types
-AddType application/x-compress .Z
-AddType application/x-gzip .gz .tgz
-
-DocumentRoot "${:document-root}"
-
-# Log configuration
-ErrorLog "${:error-log}"
-LogLevel warn
-LogFormat "%h %{REMOTE_USER}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %{REMOTE_USER}i %l %u %t \"%r\" %>s %b" common
-CustomLog "${:access-log}" common
-
-# Allow cross site scripting
-Header set Access-Control-Allow-Origin "*"
-
-# List of modules
-LoadModule unixd_module modules/mod_unixd.so
-LoadModule access_compat_module modules/mod_access_compat.so
-LoadModule authz_core_module modules/mod_authz_core.so
-LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule log_config_module modules/mod_log_config.so
-LoadModule setenvif_module modules/mod_setenvif.so
-LoadModule version_module modules/mod_version.so
-LoadModule proxy_module modules/mod_proxy.so
-LoadModule proxy_http_module modules/mod_proxy_http.so
-LoadModule mime_module modules/mod_mime.so
-LoadModule negotiation_module modules/mod_negotiation.so
-LoadModule rewrite_module modules/mod_rewrite.so
-LoadModule headers_module modules/mod_headers.so
-LoadModule dir_module modules/mod_dir.so
-LoadModule alias_module modules/mod_alias.so
-LoadModule ssl_module modules/mod_ssl.so
-LoadModule autoindex_module modules/mod_autoindex.so
-
-<Directory />
-    Options Indexes FollowSymLinks
-    IndexOptions FancyIndexing
-    order allow,deny
-    Allow from All
-</Directory>

software/slapos-in-partition/template/slapos.cfg.in

-[slapos]
-software_root = ${:software-root}
-instance_root = ${:instance-root}
-master_url = ${:master-url}
-
-key_file = ${:computer-key-file}
-cert_file = ${:computer-certificate-file}
-certificate_repository_path = ${:certificate-repository-path}
-
-computer_id = ${:computer-id}
-maximal_delay = 0
-
-# Don't check if we are using root
-root_check = false
-
-[slapformat]
-alter_user = false
-alter_network = false
-input_definition_file = ${:computer-definition-file}
-computer_xml = ${:computer-xml}
-partition_amount = ${:partition-amount}
-create_tap = false

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

-[buildout]
-parts =
-  publish-connection-informations
-  request-slave-instance
-  check-connection-informations-promise
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[directories]
-recipe = slapos.cookbook:mkdirectory
-bin = $${buildout:directory}/bin
-etc = $${buildout:directory}/etc
-scripts = $${:etc}/run
-services = $${:etc}/service
-promises = $${:etc}/promise
-
-[slap-configuration]
-recipe = slapos.cookbook:slapconfiguration.serialised
-computer = $${slap-connection:computer-id}
-partition = $${slap-connection:partition-id}
-url = $${slap-connection:server-url}
-key = $${slap-connection:key-file}
-cert = $${slap-connection:cert-file}
-
-[request-test-instance]
-# Deploy a dummy instance
-<= slap-connection
-recipe = slapos.cookbook:request
-name = Test Root Instance
-software-url = $${slap-connection:software-release-url}
-software-type = test
-return = foo slave-instance-list
-
-[request-slave-instance]
-# Deploy a dummy instance
-<= slap-connection
-recipe = slapos.cookbook:request
-name = Test Root Instance - Slave
-software-url = $${slap-connection:software-release-url}
-software-type = test
-slave = true
-sla-instance_guid = $${request-test-instance:instance-guid}
-return = foo
-
-[publish-connection-informations]
-recipe = slapos.cookbook:publish
-note = test-instance-guid should be equal to XXX, test-instance-state should be equal to started, test-instance-slave-instance-list should be NOT empty, and root-instance-slave-instance-list SHOULD be empty, slave-instance-parameter should NOT be empty.
-test-instance-guid = $${request-test-instance:instance-guid}
-test-instance-state = $${request-test-instance:instance-state}
-test-instance-slave-instance-list = $${request-test-instance:connection-slave-instance-list}
-root-instance-slave-instance-list = $${slap-configuration:slave-instance-list}
-slave-instance-parameter = $${request-slave-instance:connection-foo}
-
-# Create a file containing connection parameters
-# Then create a promise that will check content of this file
-[dump-connection-informations]
-<= publish-connection-informations
-recipe = slapos.cookbook:jsondump
-json-output = $${buildout:directory}/connection-parameters.json
-
-[check-connection-informations-promise]
-recipe = collective.recipe.template
-input = ${promise-template:output}
-output = $${directories:promises}/checkparameters
-mode = 700

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

-[buildout]
-parts =
-  publish-connection-informations
-  publish-slave-information
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[slap-configuration]
-recipe = slapos.cookbook:slapconfiguration
-computer = $${slap-connection:computer-id}
-partition = $${slap-connection:partition-id}
-url = $${slap-connection:server-url}
-key = $${slap-connection:key-file}
-cert = $${slap-connection:cert-file}
-
-[publish-connection-informations]
-recipe = slapos.cookbook:publish
-foo = bar
-slave-instance-list = $${slap-configuration:slave-instance-list}
-
-[publish-slave-information]
-recipe = slapos.cookbook:publish
-# XXX hardcoded
--slave-reference = slappart0_Test Root Instance - Slave
-foo = I am slave instance, and I am deployed!

software/test-slave-instance-deployment/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 = ${instance-default-profile:output}
-test = ${instance-test-profile:output}
-
-[slap-connection]
-# part to migrate to new - separated words
-computer-id = $${slap_connection:computer_id}
-partition-id = $${slap_connection:partition_id}
-server-url = $${slap_connection:server_url}
-software-release-url = $${slap_connection:software_release_url}
-key-file = $${slap_connection:key_file}
-cert-file = $${slap_connection:cert_file}

software/test-slave-instance-deployment/parameter-check-promise.py.in

-#!${buildout:executable}
-import sys
-import os
-import json
-
-json_file = '$${dump-connection-informations:json-output}'
-connection_parameter_list = json.loads(open(json_file, 'r').read())
-# XXX list all problems before exit
-# XXX: factor in a clean dict loop
-test_instance_guid = connection_parameter_list['test-instance-guid']
-if not test_instance_guid == 'slappart1':
-  print 'Bad test-instance-guid connection parameter: %s' % test_instance_guid
-  sys.exit(1)
-test_instance_state = connection_parameter_list['test-instance-state']
-if not test_instance_state == 'started':
-  print 'Bad test-instance-state connection parameter: %s instead of started' % test_instance_state
-  sys.exit(1)
-test_instance_slave_instance_list = connection_parameter_list['test-instance-slave-instance-list']
-if test_instance_slave_instance_list == []:
-  print 'test-instance-slave-instance-list connection parameter is empty.'
-  sys.exit(1)
-root_instance_slave_instance_list = connection_parameter_list['root-instance-slave-instance-list']
-if root_instance_slave_instance_list != []:
-  print 'root-instance-slave-instance-list connection parameter is not empty.'
-  sys.exit(1)
-slave_instance_parameter = connection_parameter_list['slave-instance-parameter']
-if slave_instance_parameter != 'I am slave instance, and I am deployed!':
-  print 'parameter slave-instance-parameter is not correct.'
-  sys.exit(1)

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 =
-  ${: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 = https://lab.nexedi.com/nexedi/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
-output = ${buildout:directory}/instance.cfg
-mode = 0644
-
-[instance-default-profile]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-default.cfg
-output = ${buildout:directory}/instance-default.cfg
-mode = 0644
-
-[instance-test-profile]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-test.cfg
-output = ${buildout:directory}/instance-test.cfg
-mode = 0644
-
-[promise-template]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/parameter-check-promise.py.in
-output = ${buildout:directory}/parameter-check-promise.py
-mode = 0644
-
-[collective-egg]
-recipe = zc.recipe.egg
-eggs = collective.recipe.template
-
-[versions]
-collective.recipe.template = 1.11
-plone.recipe.command = 1.1
-slapos.recipe.build = 0.28
-
-# Replicate slapos stack, but without shacache to not have to compile the entire world for a simple test.
-[buildout]
-# Explicitly disable download-cache
-download-cache =
-
-# Separate from site eggs
-allowed-eggs-from-site-packages =
-include-site-packages = false
-exec-sitecustomize = false
-
-# Add location for modified non-official slapos.buildout
-find-links +=
-  http://www.nexedi.org/static/packages/source/slapos.buildout/
-  http://www.nexedi.org/static/packages/source/
-  http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
-
-# Use only quite well working sites.
-allow-hosts +=
-  *.googlecode.com
-  *.nexedi.org
-  *.python.org
-  *.sourceforge.net
-  alastairs-place.net
-  bitbucket.org
-  dist.repoze.org
-  effbot.org
-  github.com
-  launchpad.net
-  peak.telecommunity.com
-  sourceforge.net
-  www.dabeaz.com
-  www.owlfish.com
-
-# XXX: Workaround of SlapOS limitation
-# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
-# development / fast switching environment for whole software
-unzip = true
-
-# Define where is defined what version of eggs we should use
-versions = versions
-
-# Define networkcache with shacache.org
-networkcache-section = networkcache
-
-# Install slapos.cookbook containing all officials recipes
-[slapos-cookbook]
-recipe = zc.recipe.egg
-eggs =
-  ${lxml-python:egg}
-  slapos.cookbook
-
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-013
-# zc.recipe.egg 2.x is for Buildout 2
-zc.recipe.egg = 1.3.2
-# Use own version of h.r.download to be able to open xz-like archives
-hexagonit.recipe.download = 1.7nxd002
-# Use pinned version of setuptools. Other versions work, but changing
-# version makes buildout recompile everything. Developers' nightmare.
-setuptools = 0.9.8
-# Official egg of prettytable has permission problems in EGG-INFO.
-prettytable = 0.7.3-nxd001
-
-[networkcache]
-download-cache-url = http://download.shacache.org
-download-dir-url = http://dir.shacache.org