Commit 57fff026 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Merge branch 'erp5-component' into erp5

parents c2b5180a e0ae8999
...@@ -10,8 +10,8 @@ parts = ...@@ -10,8 +10,8 @@ parts =
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
depends = depends =
${perl:version} ${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 url = http://www.percona.com/redir/downloads/percona-toolkit/${:version}/percona-toolkit-${:version}.tar.gz
md5sum = 2a008bccc3b62b5362d01a03c916e88d md5sum = 7514af32e0edff70c4934da2e5e36303
configure-command = configure-command =
${perl:location}/bin/perl Makefile.PL ${perl:location}/bin/perl Makefile.PL
# This file is used to install SlapOS Node itself. # This file is used to install SlapOS Node itself.
[buildout] [buildout]
extends = extends =
../../stack/slapos.cfg
../../stack/shacache-client.cfg ../../stack/shacache-client.cfg
../bison/buildout.cfg
../bzip2/buildout.cfg
../gdbm/buildout.cfg ../gdbm/buildout.cfg
../gettext/buildout.cfg ../gettext/buildout.cfg
../glib/buildout.cfg
../libxml2/buildout.cfg
../libxslt/buildout.cfg
../lxml-python/buildout.cfg
../m4/buildout.cfg ../m4/buildout.cfg
../ncurses/buildout.cfg
../openssl/buildout.cfg
../pkgconfig/buildout.cfg
../popt/buildout.cfg
../python-2.7/buildout.cfg ../python-2.7/buildout.cfg
../python-cffi/buildout.cfg
../python-cryptography/buildout.cfg
../readline/buildout.cfg
../sqlite3/buildout.cfg ../sqlite3/buildout.cfg
../swig/buildout.cfg ../swig/buildout.cfg
../zlib/buildout.cfg
../patch/buildout.cfg ../patch/buildout.cfg
parts = parts =
...@@ -31,22 +17,7 @@ parts = ...@@ -31,22 +17,7 @@ parts =
sh-environment sh-environment
py 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 # separate from system python
include-site-packages = false include-site-packages = false
...@@ -89,12 +60,26 @@ input = inline: ...@@ -89,12 +60,26 @@ input = inline:
export PS1="[SlapOS env Active] $PS1" export PS1="[SlapOS env Active] $PS1"
output = ${buildout:directory}/environment.sh 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] [slapos]
recipe = z3c.recipe.scripts recipe = z3c.recipe.scripts
eggs = eggs =
${python-cffi:egg} ${python-openssl:egg}
${python-cryptography:egg}
pyOpenSSL
slapos.libnetworkcache slapos.libnetworkcache
zc.buildout zc.buildout
${lxml-python:egg} ${lxml-python:egg}
...@@ -130,35 +115,28 @@ interpreter = py ...@@ -130,35 +115,28 @@ interpreter = py
scripts = py scripts = py
[versions] [versions]
# Use our own buildout version # Use setuptools-1.x for python 2.4/2.5 support
zc.buildout = 1.6.0-dev-SlapOS-012 setuptools = 1.4.2
# Force to use zc.recipe.egg 1.x # pyOpenSSL 0.14 uses cryptograpic which is
zc.recipe.egg = 1.3.2 # 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 Jinja2 = 2.7.2
hexagonit.recipe.download = 1.7nxd002 MarkupSafe = 0.19
slapos.core = 1.0.3
Jinja2 = 2.7.1
MarkupSafe = 0.18
Pygments = 1.6
Werkzeug = 0.9.4 Werkzeug = 0.9.4
buildout-versions = 1.7
cffi = 0.8.1
cmd2 = 0.6.7 cmd2 = 0.6.7
collective.recipe.template = 1.10 collective.recipe.template = 1.11
cryptography = 0.2.1
itsdangerous = 0.23 itsdangerous = 0.23
lxml = 3.2.3 lxml = 3.3.3
meld3 = 0.6.10 meld3 = 0.6.10
netaddr = 0.7.10 netaddr = 0.7.10
prettytable = 0.7.2 prettytable = 0.7.2
pyOpenSSL = 0.14
pyparsing = 2.0.1 pyparsing = 2.0.1
setuptools = 1.1.6 six = 1.5.2
slapos.core = 1.0.3
slapos.libnetworkcache = 0.13.4 slapos.libnetworkcache = 0.13.4
slapos.recipe.cmmi = 0.1.1 slapos.recipe.cmmi = 0.2
xml-marshaller = 0.9.7 xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1 z3c.recipe.scripts = 1.0.1
...@@ -168,23 +146,19 @@ Flask = 0.10.1 ...@@ -168,23 +146,19 @@ Flask = 0.10.1
# Required by: # Required by:
# slapos.core==1.0.3 # slapos.core==1.0.3
bpython = 0.12 cliff = 1.5.2
# Required by: # Required by:
# slapos.core==1.0.3 # slapos.core==1.0.3
cliff = 1.4.5 netifaces = 0.8
# Required by:
# slapos.core==1.0.3
ipython = 1.1.0
# Required by: # Required by:
# slapos.core==1.0.3 # slapos.core==1.0.3
netifaces = 0.8 requests = 2.2.1
# Required by: # Required by:
# slapos.core==1.0.3 # cliff==1.5.2
requests = 2.1.0 stevedore = 0.14.1
# Required by: # Required by:
# slapos.core==1.0.3 # slapos.core==1.0.3
...@@ -192,4 +166,4 @@ supervisor = 3.0 ...@@ -192,4 +166,4 @@ supervisor = 3.0
# Required by: # Required by:
# slapos.core==1.0.3 # slapos.core==1.0.3
zope.interface = 4.0.5 zope.interface = 4.1.0
...@@ -10,8 +10,8 @@ recipe = slapos.recipe.cmmi ...@@ -10,8 +10,8 @@ recipe = slapos.recipe.cmmi
[stunnel-4] [stunnel-4]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://www.stunnel.org/downloads/stunnel-4.56.tar.gz url = https://www.stunnel.org/downloads/stunnel-5.00.tar.gz
md5sum = ac4c4a30bd7a55b6687cbd62d864054c md5sum = 4f00fd0faf99e3c9cf258a19dd83d14a
pre-configure-hook = ${:_profile_base_location_}/stunnel-4-hooks.py#5b099b386c34c5b8d0664c0292ba322a:pre_configure_hook pre-configure-hook = ${:_profile_base_location_}/stunnel-4-hooks.py#5b099b386c34c5b8d0664c0292ba322a:pre_configure_hook
configure-options = configure-options =
--enable-ipv6 --enable-ipv6
......
...@@ -5,9 +5,6 @@ find-links += http://dist.repoze.org ...@@ -5,9 +5,6 @@ find-links += http://dist.repoze.org
extends = extends =
../../stack/slapos.cfg ../../stack/slapos.cfg
../../component/python-2.7/buildout.cfg
../../component/python-cffi/buildout.cfg
../../component/python-cryptography/buildout.cfg
../../component/git/buildout.cfg ../../component/git/buildout.cfg
../../component/lxml-python/buildout.cfg ../../component/lxml-python/buildout.cfg
../../component/zip/buildout.cfg ../../component/zip/buildout.cfg
......
...@@ -4,9 +4,6 @@ extensions = buildout-versions ...@@ -4,9 +4,6 @@ extensions = buildout-versions
extends = extends =
../../component/xorg/buildout.cfg ../../component/xorg/buildout.cfg
../../component/lxml-python/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/firefox/buildout.cfg
../../component/dash/buildout.cfg ../../component/dash/buildout.cfg
../../stack/shacache-client.cfg ../../stack/shacache-client.cfg
......
...@@ -624,9 +624,10 @@ zope.app.testing = 3.8.1 ...@@ -624,9 +624,10 @@ zope.app.testing = 3.8.1
# Pinned versions # Pinned versions
Flask = 0.10.1 Flask = 0.10.1
GitPython = 0.3.2.RC1 GitPython = 0.3.2.RC1
MarkupSafe = 0.19
MySQL-python = 1.2.5 MySQL-python = 1.2.5
PIL = 1.1.7 PIL = 1.1.7
PyXML = 0.8.5 Paste = 1.7.5.1
Products.CMFActionIcons = 2.1.3 Products.CMFActionIcons = 2.1.3
Products.DCWorkflowGraph = 0.4.1 Products.DCWorkflowGraph = 0.4.1
Products.ExternalEditor = 1.1.0 Products.ExternalEditor = 1.1.0
...@@ -637,14 +638,18 @@ Products.PluginRegistry = 1.3 ...@@ -637,14 +638,18 @@ Products.PluginRegistry = 1.3
Products.TIDStorage = 5.4.9 Products.TIDStorage = 5.4.9
Products.ZSQLMethods = 2.13.4 Products.ZSQLMethods = 2.13.4
PyPDF2 = 1.20 PyPDF2 = 1.20
PyXML = 0.8.5
Pympler = 0.3.1
StructuredText = 2.11.1 StructuredText = 2.11.1
WSGIUtils = 0.7 WSGIUtils = 0.7
Werkzeug = 0.9.4 Werkzeug = 0.9.4
apache-libcloud = 0.14.1 apache-libcloud = 0.14.1
astroid = 1.0.1
async = 0.6.1 async = 0.6.1
atomize = 0.2.0 atomize = 0.2.0
chardet = 2.2.1 chardet = 2.2.1
cliff = 1.5.2 cliff = 1.5.2
cmd2 = 0.6.7
csp-eventlet = 0.7.0 csp-eventlet = 0.7.0
ecdsa = 0.10 ecdsa = 0.10
elementtree = 1.2.7-20070827-preview elementtree = 1.2.7-20070827-preview
...@@ -660,24 +665,33 @@ gitdb = 0.5.4 ...@@ -660,24 +665,33 @@ gitdb = 0.5.4
greenlet = 0.4.2 greenlet = 0.4.2
hexagonit.recipe.cmmi = 2.0 hexagonit.recipe.cmmi = 2.0
http-parser = 0.8.3 http-parser = 0.8.3
httplib2 = 0.8
iniparse = 0.4 iniparse = 0.4
inotifyx = 0.2.0-1 inotifyx = 0.2.0-1
ipdb = 0.8 ipdb = 0.8
ipython = 1.2.1 ipython = 1.2.1
itsdangerous = 0.23 itsdangerous = 0.23
logilab_common = 0.61.0 lock-file = 2.0
logilab-common = 0.61.0
meld3 = 0.6.10 meld3 = 0.6.10
minitage = 2.0.67
minitage.core = 2.0.57 minitage.core = 2.0.57
minitage.paste = 1.4.6
minitage.recipe.common = 1.90 minitage.recipe.common = 1.90
minitage.recipe.egg = 1.107 minitage.recipe.egg = 1.107
netaddr = 0.7.10 netaddr = 0.7.10
netifaces = 0.8-1 netifaces = 0.8-1
ordereddict = 1.1
paramiko = 1.12.2 paramiko = 1.12.2
plone.recipe.command = 1.1 plone.recipe.command = 1.1
ply = 3.4 ply = 3.4
polib = 1.0.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 pyflakes = 0.7.3
pylint = 1.1.0
pyparsing = 2.0.1
python-ldap = 2.4.14 python-ldap = 2.4.14
python-magic = 0.4.6 python-magic = 0.4.6
python-memcached = 1.53 python-memcached = 1.53
...@@ -687,12 +701,14 @@ restkit = 4.2.2 ...@@ -687,12 +701,14 @@ restkit = 4.2.2
rtjp-eventlet = 0.3.2 rtjp-eventlet = 0.3.2
six = 1.5.2 six = 1.5.2
slapos.recipe.build = 0.12 slapos.recipe.build = 0.12
slapos.recipe.cmmi = 0.2
slapos.recipe.template = 2.5 slapos.recipe.template = 2.5
slapos.toolbox = 0.39 slapos.toolbox = 0.39
smmap = 0.8.2 smmap = 0.8.2
socketpool = 0.5.3 socketpool = 0.5.3
spyne = 2.10.10 spyne = 2.10.10
stevedore = 0.14.1 stevedore = 0.14.1
suds = 0.4
supervisor = 3.0 supervisor = 3.0
threadframe = 0.2 threadframe = 0.2
timerserver = 2.0.2 timerserver = 2.0.2
...@@ -704,4 +720,3 @@ xupdate-processor = 0.4 ...@@ -704,4 +720,3 @@ xupdate-processor = 0.4
zope.app.debug = 3.4.1 zope.app.debug = 3.4.1
zope.app.dependable = 3.5.1 zope.app.dependable = 3.5.1
zope.app.form = 4.0.2 zope.app.form = 4.0.2
pylint = 1.1.0
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment