diff --git a/component/percona-toolkit/buildout.cfg b/component/percona-toolkit/buildout.cfg index 95ecf2d040fc60d3ad7342a9958b96c4f030277c..ef68fbaadc36cc1ba7556c7d2642321f900001eb 100644 --- a/component/percona-toolkit/buildout.cfg +++ b/component/percona-toolkit/buildout.cfg @@ -10,8 +10,8 @@ parts = recipe = slapos.recipe.cmmi depends = ${perl:version} -version = 2.2.6 +version = 2.2.7 url = http://www.percona.com/redir/downloads/percona-toolkit/${:version}/percona-toolkit-${:version}.tar.gz -md5sum = 2a008bccc3b62b5362d01a03c916e88d +md5sum = 7514af32e0edff70c4934da2e5e36303 configure-command = ${perl:location}/bin/perl Makefile.PL diff --git a/component/slapos/buildout.cfg b/component/slapos/buildout.cfg index 8f5fb126cc201ce8daba852844dd64b2e0d745e4..080891407cb3cd36831ba14ef400d8bc10763211 100644 --- a/component/slapos/buildout.cfg +++ b/component/slapos/buildout.cfg @@ -1,28 +1,14 @@ # This file is used to install SlapOS Node itself. - [buildout] extends = + ../../stack/slapos.cfg ../../stack/shacache-client.cfg - ../bison/buildout.cfg - ../bzip2/buildout.cfg ../gdbm/buildout.cfg ../gettext/buildout.cfg - ../glib/buildout.cfg - ../libxml2/buildout.cfg - ../libxslt/buildout.cfg - ../lxml-python/buildout.cfg ../m4/buildout.cfg - ../ncurses/buildout.cfg - ../openssl/buildout.cfg - ../pkgconfig/buildout.cfg - ../popt/buildout.cfg ../python-2.7/buildout.cfg - ../python-cffi/buildout.cfg - ../python-cryptography/buildout.cfg - ../readline/buildout.cfg ../sqlite3/buildout.cfg ../swig/buildout.cfg - ../zlib/buildout.cfg ../patch/buildout.cfg parts = @@ -31,22 +17,7 @@ parts = sh-environment py -find-links = - http://www.nexedi.org/static/packages/source/slapos.buildout/ - http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/ - -versions = versions -allow-hosts = - *.googlecode.com - *.nexedi.org - *.python.org - alastairs-place.net - code.google.com - github.com - peak.telecommunity.com - -unzip = true # separate from system python include-site-packages = false @@ -89,12 +60,26 @@ input = inline: export PS1="[SlapOS env Active] $PS1" output = ${buildout:directory}/environment.sh +############################################## +# Included locally in order to permit we build +# packages offline. +############################################### +[python-openssl] +recipe = zc.recipe.egg:custom +egg = pyOpenSSL +include-dirs = + ${openssl:location}/include/ +library-dirs = + ${openssl:location}/lib/ +rpath = + ${openssl:location}/lib/ + +############################################# + [slapos] recipe = z3c.recipe.scripts eggs = - ${python-cffi:egg} - ${python-cryptography:egg} - pyOpenSSL + ${python-openssl:egg} slapos.libnetworkcache zc.buildout ${lxml-python:egg} @@ -130,35 +115,28 @@ interpreter = py scripts = py [versions] -# Use our own buildout version -zc.buildout = 1.6.0-dev-SlapOS-012 +# Use setuptools-1.x for python 2.4/2.5 support +setuptools = 1.4.2 -# Force to use zc.recipe.egg 1.x -zc.recipe.egg = 1.3.2 +# pyOpenSSL 0.14 uses cryptograpic which is +# incompatible with slapos package generation. +pyOpenSSL = 0.13.1 -# Use own version of h.r.download to be able to open archives not supported by python2.x: .xz -hexagonit.recipe.download = 1.7nxd002 - -slapos.core = 1.0.3 -Jinja2 = 2.7.1 -MarkupSafe = 0.18 -Pygments = 1.6 +Jinja2 = 2.7.2 +MarkupSafe = 0.19 Werkzeug = 0.9.4 -buildout-versions = 1.7 -cffi = 0.8.1 cmd2 = 0.6.7 -collective.recipe.template = 1.10 -cryptography = 0.2.1 +collective.recipe.template = 1.11 itsdangerous = 0.23 -lxml = 3.2.3 +lxml = 3.3.3 meld3 = 0.6.10 netaddr = 0.7.10 prettytable = 0.7.2 -pyOpenSSL = 0.14 pyparsing = 2.0.1 -setuptools = 1.1.6 +six = 1.5.2 +slapos.core = 1.0.3 slapos.libnetworkcache = 0.13.4 -slapos.recipe.cmmi = 0.1.1 +slapos.recipe.cmmi = 0.2 xml-marshaller = 0.9.7 z3c.recipe.scripts = 1.0.1 @@ -168,23 +146,19 @@ Flask = 0.10.1 # Required by: # slapos.core==1.0.3 -bpython = 0.12 +cliff = 1.5.2 # Required by: # slapos.core==1.0.3 -cliff = 1.4.5 - -# Required by: -# slapos.core==1.0.3 -ipython = 1.1.0 +netifaces = 0.8 # Required by: # slapos.core==1.0.3 -netifaces = 0.8 +requests = 2.2.1 # Required by: -# slapos.core==1.0.3 -requests = 2.1.0 +# cliff==1.5.2 +stevedore = 0.14.1 # Required by: # slapos.core==1.0.3 @@ -192,4 +166,4 @@ supervisor = 3.0 # Required by: # slapos.core==1.0.3 -zope.interface = 4.0.5 +zope.interface = 4.1.0 diff --git a/component/stunnel/buildout.cfg b/component/stunnel/buildout.cfg index 6d7a3b58d7f3e41516ae656f4c456e2232e73b66..87e75641f4b884265c902f8120707b5e47cbb4a2 100644 --- a/component/stunnel/buildout.cfg +++ b/component/stunnel/buildout.cfg @@ -10,8 +10,8 @@ recipe = slapos.recipe.cmmi [stunnel-4] recipe = slapos.recipe.cmmi -url = https://www.stunnel.org/downloads/stunnel-4.56.tar.gz -md5sum = ac4c4a30bd7a55b6687cbd62d864054c +url = https://www.stunnel.org/downloads/stunnel-5.00.tar.gz +md5sum = 4f00fd0faf99e3c9cf258a19dd83d14a pre-configure-hook = ${:_profile_base_location_}/stunnel-4-hooks.py#5b099b386c34c5b8d0664c0292ba322a:pre_configure_hook configure-options = --enable-ipv6 diff --git a/software/erp5testnode/software.cfg b/software/erp5testnode/software.cfg index a7e0219bda9b755f631b02bd43fe91c94c2f596e..4c61139bbaf8c71d26a038b4c3a594f808252544 100644 --- a/software/erp5testnode/software.cfg +++ b/software/erp5testnode/software.cfg @@ -5,9 +5,6 @@ find-links += http://dist.repoze.org extends = ../../stack/slapos.cfg - ../../component/python-2.7/buildout.cfg - ../../component/python-cffi/buildout.cfg - ../../component/python-cryptography/buildout.cfg ../../component/git/buildout.cfg ../../component/lxml-python/buildout.cfg ../../component/zip/buildout.cfg diff --git a/software/seleniumrunner/software.cfg b/software/seleniumrunner/software.cfg index 7b59d4a7a77cdc0e86df1c4e1a750869c5a3284a..705d174979e87b4dcfda32bc0abff7f61e8be3f9 100644 --- a/software/seleniumrunner/software.cfg +++ b/software/seleniumrunner/software.cfg @@ -4,9 +4,6 @@ extensions = buildout-versions extends = ../../component/xorg/buildout.cfg ../../component/lxml-python/buildout.cfg - ../../component/python-2.7/buildout.cfg - ../../component/python-cffi/buildout.cfg - ../../component/python-cryptography/buildout.cfg ../../component/firefox/buildout.cfg ../../component/dash/buildout.cfg ../../stack/shacache-client.cfg diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index 7814edfc7ccec84a85f86a60d34867935f084762..d31189676c5ee221a87558e5296ffe1db88d654b 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -624,9 +624,10 @@ zope.app.testing = 3.8.1 # Pinned versions Flask = 0.10.1 GitPython = 0.3.2.RC1 +MarkupSafe = 0.19 MySQL-python = 1.2.5 PIL = 1.1.7 -PyXML = 0.8.5 +Paste = 1.7.5.1 Products.CMFActionIcons = 2.1.3 Products.DCWorkflowGraph = 0.4.1 Products.ExternalEditor = 1.1.0 @@ -637,14 +638,18 @@ Products.PluginRegistry = 1.3 Products.TIDStorage = 5.4.9 Products.ZSQLMethods = 2.13.4 PyPDF2 = 1.20 +PyXML = 0.8.5 +Pympler = 0.3.1 StructuredText = 2.11.1 WSGIUtils = 0.7 Werkzeug = 0.9.4 apache-libcloud = 0.14.1 +astroid = 1.0.1 async = 0.6.1 atomize = 0.2.0 chardet = 2.2.1 cliff = 1.5.2 +cmd2 = 0.6.7 csp-eventlet = 0.7.0 ecdsa = 0.10 elementtree = 1.2.7-20070827-preview @@ -660,24 +665,33 @@ gitdb = 0.5.4 greenlet = 0.4.2 hexagonit.recipe.cmmi = 2.0 http-parser = 0.8.3 +httplib2 = 0.8 iniparse = 0.4 inotifyx = 0.2.0-1 ipdb = 0.8 ipython = 1.2.1 itsdangerous = 0.23 -logilab_common = 0.61.0 +lock-file = 2.0 +logilab-common = 0.61.0 meld3 = 0.6.10 +minitage = 2.0.67 minitage.core = 2.0.57 +minitage.paste = 1.4.6 minitage.recipe.common = 1.90 minitage.recipe.egg = 1.107 netaddr = 0.7.10 netifaces = 0.8-1 +ordereddict = 1.1 paramiko = 1.12.2 plone.recipe.command = 1.1 ply = 3.4 polib = 1.0.4 -psutil = 1.2.1 +pprofile = 1.7.1 +prettytable = 0.7.3-nxd001 +psutil = 2.0.0 pyflakes = 0.7.3 +pylint = 1.1.0 +pyparsing = 2.0.1 python-ldap = 2.4.14 python-magic = 0.4.6 python-memcached = 1.53 @@ -687,12 +701,14 @@ restkit = 4.2.2 rtjp-eventlet = 0.3.2 six = 1.5.2 slapos.recipe.build = 0.12 +slapos.recipe.cmmi = 0.2 slapos.recipe.template = 2.5 slapos.toolbox = 0.39 smmap = 0.8.2 socketpool = 0.5.3 spyne = 2.10.10 stevedore = 0.14.1 +suds = 0.4 supervisor = 3.0 threadframe = 0.2 timerserver = 2.0.2 @@ -704,4 +720,3 @@ xupdate-processor = 0.4 zope.app.debug = 3.4.1 zope.app.dependable = 3.5.1 zope.app.form = 4.0.2 -pylint = 1.1.0