Update Release Candidate

component/golang/buildout.cfg

@@ -53,6 +53,15 @@ md5sum = d15dfb264105c5e84fbe33f4a4aa5021
 environment-extra =
   GOROOT_BOOTSTRAP=${golang14:location}
 
+[golang1.11]
+<= golang-common
+url = https://dl.google.com/go/go1.11.4.src.tar.gz
+md5sum = a77697673215be465d1b583680ef2318
+
+# go1.11 needs go1.4 to bootstrap
+environment-extra =
+  GOROOT_BOOTSTRAP=${golang14:location}
+
 
 # ---- infrastructure to build Go workspaces / projects ----
 

component/helloweb/buildout.cfg

@@ -4,6 +4,7 @@ extends =
   ../git/buildout.cfg
   ../ruby/buildout.cfg
   ../golang/buildout.cfg
+  gowork.cfg
 
 parts =
   helloweb-python
@@ -11,20 +12,40 @@ parts =
   helloweb-go
 
 
-# repository with examples
-[helloweb-repository]
-recipe  = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-repository = https://lab.nexedi.com/nexedi/helloweb.git
-revision = 39fd89a35718c3b4828296efcd9a45b6c9bbd13b
-location = ${buildout:parts-directory}/helloweb
+# helloweb.git repository with examples.
+#
+# We clone it via golang infrastructure into a Go workspace.
+# Via gowork helloweb/go is not only cloned, but also built and installed into gowork/bin.
+#
+# Another option would be to use slapos.recipe.build:gitclone and handle
+# cloning+building manually. However to be able to use third-party Go packages
+# we need gowork support, and other languages can use helloweb repository from
+# under gowork as well.
+[gowork]
+install =
+    lab.nexedi.com/nexedi/helloweb/go/...
+
+golang  = ${golang1.11:location}
+
+
+# -*- go -*-
+[helloweb-go]
+# we already have gowork/bin/helloweb with helloweb Go build.
+# Add bin/helloweb-go that runs go version of helloweb without any environment preset needed.
+recipe  = collective.recipe.template
+output  = ${buildout:bin-directory}/${:_buildout_section_name_}
+mode    = 0755
+input   = inline:
+    #!/bin/sh
+    . ${gowork:env.sh}
+    exec helloweb "$@"
 
 
 # -*- python -*-
 [helloweb-egg]
 recipe  = zc.recipe.egg:develop
 egg     = helloweb
-setup   = ${helloweb-repository:location}/python/
+setup   = ${gowork:src}/lab.nexedi.com/nexedi/helloweb/python/
 
 [helloweb-python]
 recipe  = zc.recipe.egg:scripts
@@ -47,10 +68,10 @@ scripts = helloweb=helloweb-python
 [bundler]
 # rubygemsrecipe with fixed url and this way pinned rubygems version
 recipe  = rubygemsrecipe
-url     = https://rubygems.org/rubygems/rubygems-2.4.8.zip
+url     = https://rubygems.org/rubygems/rubygems-2.5.2.zip
 ruby-location = ${ruby2.1:location}
 ruby-executable = ${:ruby-location}/bin/ruby
-gems    = bundler==1.10.6
+gems    = bundler==1.11.2
 
 # bin installed here
 bundle  = ${buildout:bin-directory}/bundle
@@ -66,7 +87,7 @@ environment =
 
 [helloweb-ruby-bundle]
 recipe  = slapos.recipe.cmmi
-path    = ${helloweb-repository:location}/ruby/
+path    = ${gowork:src}/lab.nexedi.com/nexedi/helloweb/ruby/
 
 configure-command = :
 make-binary =
@@ -84,15 +105,3 @@ input   = inline:
     exec ${bundler:bundle} exec sh -c 'helloweb.rb "$@"' ${:_buildout_section_name_} "$@"
 
 
-# -*- go -*-
-[helloweb-go]
-recipe  = slapos.recipe.cmmi
-path    = ${helloweb-repository:location}/go/
-
-go      = ${golang19:location}/bin/go
-configure-command = :
-make-binary =
-make-targets= cd ${:path} &&
-     ${:go} build
-        -o ${buildout:bin-directory}/${:_buildout_section_name_}
-        helloweb.go

component/helloweb/gowork.cfg

+# Code generated by gowork-snapshot; DO NOT EDIT.
+
+# list of go git repositories to fetch
+[gowork.goinstall]
+depends_gitfetch  =
+    ${go_lab.nexedi.com_nexedi_helloweb:recipe}
+
+
+[go_lab.nexedi.com_nexedi_helloweb]
+<= go-git-package
+go.importpath = lab.nexedi.com/nexedi/helloweb
+repository    = https://lab.nexedi.com/nexedi/helloweb.git
+revision      = 8bfedac656

component/ruby/buildout.cfg

@@ -20,8 +20,8 @@ configure-options =
   --with-out-ext=tk,tk/tkutil,win32,win32ole
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s
-  CPPFLAGS=-I${gdbm:location}/include -I${libffi:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${openssl:location}/include -I${readline:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${gdbm:location}/lib -L${libffi:location}/lib -L${libyaml:location}/lib -L${ncurses:location}/lib -L${openssl:location}/lib -L${readline:location}/lib -L${zlib:location}/lib -Wl,-rpath=${gdbm:location}/lib  -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${zlib:location}/lib
+  CPPFLAGS=-I${gdbm:location}/include -I${libffi:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${openssl-1.0:location}/include -I${readline:location}/include -I${zlib:location}/include
+  LDFLAGS=-L${gdbm:location}/lib -L${libffi:location}/lib -L${libyaml:location}/lib -L${ncurses:location}/lib -L${openssl-1.0:location}/lib -L${readline:location}/lib -L${zlib:location}/lib -Wl,-rpath=${gdbm:location}/lib  -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${zlib:location}/lib
   PKG_CONFIG_PATH=${libyaml:location}/lib/
 
 

software/agent/software.cfg

@@ -43,7 +43,6 @@ eggs =
 
 
 [versions]
-apache-libcloud = 0.18.0
 ecdsa = 0.13
 erp5.util = 0.4.51
 gitdb = 0.6.4

software/apache-frontend/software.cfg

@@ -3,7 +3,6 @@ extends = common.cfg
 
 [versions]
 PyRSS2Gen = 1.1
-apache-libcloud = 0.19.0
 cns.recipe.symlink = 0.2.3
 ecdsa = 0.13
 gitdb = 0.6.4
@@ -13,7 +12,6 @@ rdiff-backup = 1.0.5+SlapOSPatched001
 slapos.recipe.template = 4.3
 smmap = 0.9.0
 numpy = 1.11.2
-pyasn1 = 0.2.3
 
 websockify = 0.8.0
 

software/backupserver/software.cfg

@@ -123,7 +123,6 @@ gunicorn = 19.1.1
 plone.recipe.command = 1.1
 slapos.recipe.template = 2.4.2
 PyRSS2Gen = 1.1
-apache-libcloud = 2.3.0
 gitdb2 = 2.0.5
 smmap2 = 2.0.5
 

software/caddy-frontend/software.cfg

@@ -4,7 +4,6 @@ extends = common.cfg
 [versions]
 validators = 0.12.2
 PyRSS2Gen = 1.1
-apache-libcloud = 0.19.0
 cns.recipe.symlink = 0.2.3
 ecdsa = 0.13
 gitdb = 0.6.4
@@ -14,6 +13,5 @@ rdiff-backup = 1.0.5+SlapOSPatched001
 slapos.recipe.template = 4.3
 smmap = 0.9.0
 numpy = 1.11.2
-pyasn1 = 0.2.3
 
 websockify = 0.8.0

software/erp5testnode/software.cfg

@@ -67,7 +67,6 @@ dnspython = 1.15.0
 PyXML = 0.8.5
 WebOb = 1.8.2
 WebTest = 2.0.30
-apache-libcloud = 2.3.0
 gitdb2 = 2.0.4
 smmap2 = 2.0.4
 waitress = 1.1.0

software/helloworld/software.cfg

@@ -38,3 +38,8 @@ mode = 0644
 extensions = jinja2.ext.do
 context =
   section buildout  buildout
+
+# Pin versions of eggs used that are not already pinned by stack/slapos.cfg
+[versions]
+slapos.recipe.template = 4.3
+rubygemsrecipe  = 0.2.2+slapos001

software/helloworld/test/README.md

+Tests for HelloWorld software release

software/helloworld/test/setup.py

+##############################################################################
+#
+# Copyright (c) 2019 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from setuptools import setup, find_packages
+
+version = '0.0.1.dev0'
+name = 'slapos.test.helloworld'
+long_description = open("README.md").read()
+
+setup(name=name,
+      version=version,
+      description="Test for SlapOS' helloworld",
+      long_description=long_description,
+      long_description_content_type='text/markdown',
+      maintainer="Nexedi",
+      maintainer_email="info@nexedi.com",
+      url="https://lab.nexedi.com/nexedi/slapos",
+      packages=find_packages(),
+      install_requires=[
+        'slapos.core',
+        'slapos.libnetworkcache',
+        'erp5.util',
+        'requests',
+        ],
+      zip_safe=True,
+      test_suite='test',
+    )

software/helloworld/test/test.py

+##############################################################################
+#
+# Copyright (c) 2019 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import os
+import requests
+import utils
+
+# for development: debugging logs and install Ctrl+C handler
+if os.environ.get('SLAPOS_TEST_DEBUG'):
+  import logging
+  logging.basicConfig(level=logging.DEBUG)
+  import unittest
+  unittest.installHandler()
+
+
+class HelloWorldTestCase(utils.SlapOSInstanceTestCase):
+  # to be defined by subclasses
+  name = None
+  kind = None
+
+  @classmethod
+  def getSoftwareURLList(cls):
+    return (os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..', 'software.cfg')),)
+
+  @classmethod
+  def getInstanceParameterDict(cls):
+    return {"name": cls.name}
+
+
+class HTTPRequestTestMixin(object):
+  """Test that the service url.${kind} responds Hello ${name}
+  """
+  def test_get(self):
+    url = self.computer_partition.getConnectionParameterDict()['url.{}'.format(
+        self.kind)]
+    response = requests.get(url)
+    self.assertEqual(requests.codes['OK'], response.status_code)
+    self.assertTrue(
+        response.text.startswith("Hello {}".format(self.name)), response.text)
+
+
+class TestPython(HelloWorldTestCase, HTTPRequestTestMixin):
+  name = "Python"
+  kind = "python"
+
+
+class TestRuby(HelloWorldTestCase, HTTPRequestTestMixin):
+  name = "Ruby"
+  kind = "ruby"
+
+
+class TestGolang(HelloWorldTestCase, HTTPRequestTestMixin):
+  name = "Go"
+  kind = "go"

software/html5as/software.cfg

@@ -67,7 +67,6 @@ mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [versions]
-apache-libcloud = 0.12.3
 async = 0.6.1
 gitdb = 0.5.4
 pycrypto = 2.6

software/htmlvalidatorserver/software.cfg

@@ -55,7 +55,6 @@ gunicorn = 19.1.1
 plone.recipe.command = 1.1
 slapos.recipe.template = 2.4.2
 inotifyx = 0.2.2
-apache-libcloud = 2.2.1
 gitdb2 = 2.0.3
 smmap2 = 2.0.3
 

software/kvm/instance-kvm.cfg.jinja2

@@ -475,9 +475,10 @@ ipv4-network-info =
 {% endif %}
 
 ipv6-network-info =
-{% if use_tap == 'true' and slap_configuration.get('tap-ipv6-addr', '') != "" -%}
+{% if use_tap == 'true' and slap_configuration.get('tap-ipv6-addr', '') != "" %}
   Use these configurations below to configure IPv6 on interface {{ iface }} in your VM.
   IFACE={{ iface }}
+  ip link set dev $IFACE up
   ${network-config-ipv6:ipv6-add-address}
   ${network-config-ipv6:ipv6-add-default-route}
 {% if enable_http == 'true' %}

software/kvm/software.cfg

@@ -99,7 +99,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = b4a95f8398dac8de58254899b4545439
+md5sum = 93ffbb44a88f4fb0d7fd458bc67a6b22
 download-only = true
 on-update = true
 
@@ -256,7 +256,6 @@ context =
 websockify = 0.5.1
 
 erp5.util = 0.4.51
-apache-libcloud = 1.1.0
 collective.recipe.environment = 0.2.0
 gitdb = 0.6.4
 pycurl = 7.43.0

software/monitor/software.cfg

@@ -95,7 +95,6 @@ erp5.util = 0.4.51
 passlib = 1.7.1
 GitPython = 2.1.9
 lockfile = 0.12.2
-apache-libcloud = 2.3.0
 feedparser = 5.2.1
 atomize = 0.2.0
 gitdb2 = 2.0.3

software/neoppod/software-common.cfg

@@ -125,7 +125,6 @@ md5sum = 87d18c7021e4d43756813a83c9da5e97
 [versions]
 BTrees = 4.4.1
 ZODB = 4.4.5
-apache-libcloud = 1.5.0
 coverage = 4.5.1
 ecdsa = 0.13
 gitdb2 = 2.0.0
@@ -143,7 +142,6 @@ zodbpickle = 0.6.0
 zodbtools = 0.0.0.dev4
 cython-zstd = 0.2
 python-dateutil = 2.7.3
-pyasn1 = 0.4.3
 
 # Required by:
 # zodbtools==0.0.0dev4

software/neotest/software.cfg

@@ -120,7 +120,6 @@ revision= v0.11-15-gf785ac079b
 
 # ping eggs versions
 [versions]
-pyasn1 = 0.3.7
 ZODB3 = 3.11.0
 numpy = 1.14.2
 zope.testing = 4.6.2

software/nginx-push-stream/software.cfg

@@ -47,8 +47,6 @@ mode = 0644
 [versions]
 slapos.recipe.template = 4.3
 erp5.util = 0.4.51
-apache-libcloud = 2.2.1
 inotifyx = 0.2.2
 gitdb2 = 2.0.3
-pyasn1 = 0.4.2
 smmap2 = 2.0.3

software/powerdns/software.cfg

@@ -71,7 +71,6 @@ erp5.util = 0.4.53
 passlib = 1.7.1
 GitPython = 2.1.11
 lockfile = 0.12.2
-apache-libcloud = 2.3.0
 feedparser = 5.2.1
 atomize = 0.2.0
 gitdb2 = 2.0.4

software/proftpd/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 8ed5b4a7940db47ccb386c2f4e3e7273
 
 [instance-default]
 filename = instance-default.cfg.in
-md5sum = e2e67390753ec63babcc8d4ce9fc6230
+md5sum = 4cba10d2e9fc4b17c73c78bde0bcb86c
 
 [proftpd-config-file]
 filename = proftpd-config-file.cfg.in

software/proftpd/instance-default.cfg.in

@@ -90,23 +90,10 @@ port = ${proftpd:sftp-port}
 # command line to add a user, invoke with:
 #   ftpasswd --name=bob
 # to prompt for password, or --stdin to read password from stdin
-recipe = slapos.recipe.template:jinja2
-mode = 0700
-extensions = jinja2.ext.do
-rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
-wrapper-path = ${:rendered}
-# XXX: to workaround bug that pw-uid and gr-gir slapos.cookbook:userinfo cannot
-# be used in a buildout part (as they are returned as int and not strings), we
-# use slapos.recipe.template:jinja2 and not a simple slapos.cookbook:wrapper,
-# because only the former is compatible with userinfo.
-# Because we are already in a jinja template, we have to escape jinja template
-# with {% raw %} / {% endraw %}
-template = inline:
-  #!/bin/bash
-  {{ perl_bin }} {{ ftpasswd_bin }} --passwd --home=${proftpd:data-dir} --shell=/bin/false --uid={% raw %}{{ pw_uid }} --gid={{ gr_gid }}{% endraw %} --file ${auth-user-file:output} $@
-context =
-  key pw_uid proftpd-userinfo:pw-uid
-  key gr_gid proftpd-userinfo:gr-gid
+recipe = slapos.cookbook:wrapper
+wrapper-path =${buildout:bin-directory}/${:_buildout_section_name_}
+command-line =
+  {{ perl_bin }} {{ ftpasswd_bin }} --passwd --home=${proftpd:data-dir} --shell=/bin/false --uid=${proftpd-userinfo:pw-uid} --gid=${proftpd-userinfo:gr-gid}  --file ${auth-user-file:output}
 
 [auth-user-file]
 recipe = plone.recipe.command

software/re6stnet/software.cfg

@@ -110,7 +110,6 @@ md5sum = 0bf4f2c03e06b55c6c6cc55fa33e65d6
 
 [versions]
 re6stnet = 0.501
-apache-libcloud = 0.17.0
 ecdsa = 0.13
 gitdb = 0.6.4
 plone.recipe.command = 1.1
@@ -122,10 +121,6 @@ dnspython = 1.15.0
 erp5.util = 0.4.51
 passlib = 1.7.1
 
-# Required by:
-# apache-libcloud==0.17.0
-backports.ssl-match-hostname = 3.4.0.2
-
 # Required by:
 # re6stnet===0-413.gbec6b3c.dirty
 miniupnpc = 1.9

software/slapos-sr-testing/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = b98a93c66e1875bbbfc7e08ee0efc502
+md5sum = 30f0e0c5b88b518047197f251f0aea8d

software/slapos-sr-testing/instance.cfg

@@ -28,7 +28,7 @@ bin = $${buildout:directory}/bin
 working-dir = $${buildout:directory}/tmp
 
 [test-list]
-path_list = ${slapos.test.caddy-frontend-setup:setup},${slapos.test.erp5-setup:setup},${slapos.test.kvm-setup:setup},${slapos.test.monitor-setup:setup},${slapos.test.plantuml-setup:setup},${slapos.test.powerdns-setup:setup},${slapos.test.proftpd-setup:setup},${slapos.test.re6stnet-setup:setup},${slapos.test.seleniumserver-setup:setup},${slapos.test.slaprunner-setup:setup}
+path_list = ${slapos.test.caddy-frontend-setup:setup},${slapos.test.erp5-setup:setup},${slapos.test.kvm-setup:setup},${slapos.test.monitor-setup:setup},${slapos.test.plantuml-setup:setup},${slapos.test.powerdns-setup:setup},${slapos.test.proftpd-setup:setup},${slapos.test.re6stnet-setup:setup},${slapos.test.seleniumserver-setup:setup},${slapos.test.slaprunner-setup:setup},${slapos.test.helloworld-setup:setup}
 
 [slapos-test-runner]
 recipe = slapos.cookbook:wrapper

software/slapos-sr-testing/software.cfg

@@ -71,6 +71,11 @@ setup = ${slapos-repository:location}/software/seleniumserver/test/
 egg = slapos.test.slaprunner
 setup = ${slapos-repository:location}/software/slaprunner/test/
 
+[slapos.test.helloworld-setup]
+<= setup-develop-egg
+egg = slapos.test.helloworld
+setup = ${slapos-repository:location}/software/helloworld/test/
+
 [erp5.util-setup]
 <= setup-develop-egg
 egg = erp5.util[testnode]
@@ -141,7 +146,6 @@ httplib2 = 0.11.3
 image = 1.5.25
 paramiko = 2.4.2
 plantuml = 0.1.1
-pyasn1 = 0.4.4
 pysftp = 0.2.9
 requests-toolbelt = 0.8.0
 selenium = 3.141.0

software/slapos-testing/software.cfg

@@ -187,7 +187,6 @@ Pygments = 2.1.3
 slapos.recipe.template = 4.3
 
 # All depencies should be pinned.
-apache-libcloud = 2.3.0
 bcrypt = 3.1.4
 dnspython = 1.15.0
 funcsigs = 1.0.2
@@ -196,7 +195,6 @@ httmock = 1.2.6
 manuel = 1.9.0
 mock = 2.0.0
 pem = 18.1.0
-pyasn1 = 0.4.3
 pycurl = 7.43.0.2
 pyflakes = 2.0.0
 smmap2 = 2.0.4

software/slaprunner/software.cfg

@@ -154,7 +154,6 @@ eggs +=
 
 [versions]
 Flask-Auth = 0.85
-apache-libcloud = 1.2.1
 cns.recipe.symlink = 0.2.3
 futures = 3.0.5
 gitdb = 0.6.4

software/unstable/MediaWiki/software.cfg

@@ -55,7 +55,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/b2evolution/software.cfg

@@ -40,7 +40,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/cmsmadesimple/software.cfg

@@ -39,7 +39,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/coppermine/software.cfg

@@ -50,7 +50,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/dotclear/software.cfg

@@ -50,7 +50,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/dotproject/software.cfg

@@ -50,7 +50,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/eSKUeL/software.cfg

@@ -39,7 +39,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/ezpublish/software.cfg

@@ -39,7 +39,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/magento/software.cfg

@@ -38,7 +38,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/net2ftp/software.cfg

@@ -63,7 +63,6 @@ eggs =
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/openX/software.cfg

@@ -39,7 +39,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/os-commerce/software.cfg

@@ -40,7 +40,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/phpbb/software.cfg

@@ -42,7 +42,6 @@ eggs =
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/phpmyadmin/software.cfg

@@ -50,7 +50,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/phpnuke/software.cfg

@@ -51,7 +51,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/pimcore/software.cfg

@@ -39,7 +39,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/piwigo/software.cfg

@@ -51,7 +51,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/piwik/software.cfg

@@ -41,7 +41,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/prestashop/software.cfg

@@ -42,7 +42,6 @@ eggs =
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/punbb/software.cfg

@@ -50,7 +50,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/simpleMachineForum/software.cfg

@@ -40,7 +40,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/spip/software.cfg

@@ -39,7 +39,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/statusnet/software.cfg

@@ -39,7 +39,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/sugar-crm/software.cfg

@@ -39,7 +39,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/tiki/software.cfg

@@ -39,7 +39,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/trac-svn/software.cfg

@@ -171,7 +171,6 @@ Genshi = 0.7
 MySQL-python = 1.2.4
 Pygments = 1.6
 Trac = 1.0.1
-apache-libcloud = 0.12.4
 async = 0.6.1
 collective.recipe.cmd = 0.6
 docutils = 0.10

software/unstable/xoops/software.cfg

@@ -40,7 +40,6 @@ eggs = ${instance-recipe:egg}
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/zencart/software.cfg

@@ -52,7 +52,6 @@ eggs =
 Jinja2 = 2.6
 MySQL-python = 1.2.3
 Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7

software/unstable/zimbra-kvm/software.cfg

@@ -5,7 +5,6 @@ extends = common.cfg
 numpy = 1.6.2
 Jinja2 = 2.6
 Werkzeug = 0.8.3
-apache-libcloud = 0.12.1
 async = 0.6.1
 buildout-versions = 1.7
 gitdb = 0.5.4

stack/boinc/buildout.cfg

@@ -66,7 +66,6 @@ app-list = {}
 
 [versions]
 pycrypto = 2.6
-apache-libcloud = 0.12.4
 async = 0.6.1
 gitdb = 0.5.4
 mysqlclient = 1.3.12

stack/caucase/buildout.cfg

@@ -88,7 +88,6 @@ context =
 
 [versions]
 Flask-User = 0.6.19
-apache-libcloud = 2.1.0
 bcrypt = 3.1.3
 caucase = 0.1.4
 futures = 3.1.1
@@ -142,10 +141,6 @@ blinker = 1.4
 # caucase==0.1.4
 pem = 17.1.0
 
-# Required by:
-# caucase==0.1.4
-pyasn1 = 0.2.3
-
 # Required by:
 # caucase==0.1.4
 pyasn1-modules = 0.0.9

stack/erp5/buildout.cfg

@@ -708,7 +708,6 @@ objgraph = 3.1.0
 ply = 3.10
 polib = 1.0.8
 pprofile = 2.0.1
-pyasn1 = 0.2.3
 pyasn1-modules = 0.0.8
 pycountry = 17.1.8
 pycrypto = 2.6.1

stack/lamp.cfg

@@ -39,7 +39,6 @@ keep-compile-dir = false
 
 [versions]
 # Generated automatically by buildout-versions
-apache-libcloud = 0.9.1
 async = 0.6.1
 gitdb = 0.5.4
 mysqlclient = 1.3.12

stack/lamp/buildout.cfg

@@ -182,7 +182,6 @@ eggs =
   slapos.toolbox[lampconfigure]
 
 [versions]
-apache-libcloud = 0.12.3
 async = 0.6.1
 gitdb = 0.5.4
 mysqlclient = 1.3.12

stack/lapp/buildout.cfg

@@ -181,7 +181,6 @@ eggs =
   slapos.toolbox
 
 [versions]
-apache-libcloud = 0.12.1
 async = 0.6.1
 cp.recipe.cmd = 0.4
 gitdb = 0.5.4

stack/monitor/buildout.cfg

@@ -119,5 +119,4 @@ depends =
 
 [versions]
 cns.recipe.symlink = 0.2.3
-pyasn1 = 0.3.7
 

stack/slapos.cfg

@@ -169,6 +169,10 @@ smmap2 = 2.0.5
 # slapos.toolbox==0.81
 PyRSS2Gen = 1.1
 
+# Required by:
+# slapos.toolbox==0.81
+apache-libcloud = 2.4.0
+
 # Required by:
 # slapos.toolbox==0.81
 atomize = 0.2.0
@@ -230,6 +234,10 @@ packaging = 16.8
 # slapos.toolbox==0.81
 passlib = 1.7.1
 
+# Required by:
+# slapos.toolbox==0.81
+pyasn1 = 0.4.5
+
 # Required by:
 # cffi==1.9.1
 pycparser = 2.17