Commit 98489598 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Merge remote-tracking branch 'origin/master' into erp5testnode

parents ea709bac f6946c0a
...@@ -11,8 +11,8 @@ parts = ...@@ -11,8 +11,8 @@ parts =
[curl] [curl]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://curl.haxx.se/download/curl-7.35.0.tar.bz2 url = http://curl.haxx.se/download/curl-7.36.0.tar.bz2
md5sum = c18fbdd031adb0529ae09fce399f2d10 md5sum = e6d1f9d1b59da5062109ffe14e0569a4
configure-options = configure-options =
--disable-static --disable-static
--disable-ldap --disable-ldap
......
...@@ -7,14 +7,15 @@ extends = ...@@ -7,14 +7,15 @@ extends =
../gettext/buildout.cfg ../gettext/buildout.cfg
../libexpat/buildout.cfg ../libexpat/buildout.cfg
../openssl/buildout.cfg ../openssl/buildout.cfg
../xz-utils/buildout.cfg
../zlib/buildout.cfg ../zlib/buildout.cfg
parts = parts =
git git
[git] [git]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://git-core.googlecode.com/files/git-1.8.5.3.tar.gz url = https://www.kernel.org/pub/software/scm/git/git-1.9.2.tar.xz
md5sum = 57b966065882f83ef5879620a1e329ca md5sum = 437c32078b5b5b229f1c10f6474eae78
configure-options = configure-options =
--with-curl=${curl:location} --with-curl=${curl:location}
--with-openssl=${openssl:location} --with-openssl=${openssl:location}
...@@ -24,7 +25,7 @@ configure-options = ...@@ -24,7 +25,7 @@ configure-options =
--without-tcltk --without-tcltk
environment = environment =
NO_PERL=y NO_PERL=y
PATH=${curl:location}/bin:${gettext:location}/bin:%(PATH)s PATH=${curl:location}/bin:${gettext:location}/bin:${xz-utils:location}/bin:%(PATH)s
CPPFLAGS=-I${zlib:location}/include CPPFLAGS=-I${zlib:location}/include
LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib
......
Description: CVE-2013-6369
Patch by upstream
--- jbigkit-2.0.orig/libjbig/jbig.c
+++ jbigkit-2.0/libjbig/jbig.c
@@ -1747,7 +1747,7 @@ void jbg_int2dppriv(unsigned char *dptab
#define FILL_TABLE1(offset, len, trans) \
for (i = 0; i < len; i++) { \
k = 0; \
- for (j = 0; j < 8; j++) \
+ for (j = 0; i >> j; j++) \
k |= ((i >> j) & 1) << trans[j]; \
dptable[(i + offset) >> 2] |= \
(internal[k + offset] & 3) << ((3 - (i&3)) << 1); \
@@ -1778,7 +1778,7 @@ void jbg_dppriv2int(char *internal, cons
#define FILL_TABLE2(offset, len, trans) \
for (i = 0; i < len; i++) { \
k = 0; \
- for (j = 0; j < 8; j++) \
+ for (j = 0; i >> j; j++) \
k |= ((i >> j) & 1) << trans[j]; \
internal[k + offset] = \
(dptable[(i + offset) >> 2] >> ((3 - (i & 3)) << 1)) & 3; \
@@ -2583,6 +2583,7 @@ int jbg_dec_in(struct jbg_dec_state *s,
unsigned long x, y;
unsigned long is[3], ie[3];
size_t dummy_cnt;
+ unsigned char *dppriv;
if (!cnt) cnt = &dummy_cnt;
*cnt = 0;
@@ -2720,13 +2721,16 @@ int jbg_dec_in(struct jbg_dec_state *s,
(s->options & (JBG_DPON | JBG_DPPRIV | JBG_DPLAST)) ==
(JBG_DPON | JBG_DPPRIV)) {
assert(s->bie_len >= 20);
+ if (!s->dppriv || s->dppriv == jbg_dptable)
+ s->dppriv = (char *) checked_malloc(1728, sizeof(char));
while (s->bie_len < 20 + 1728 && *cnt < len)
- s->buffer[s->bie_len++ - 20] = data[(*cnt)++];
+ s->dppriv[s->bie_len++ - 20] = data[(*cnt)++];
if (s->bie_len < 20 + 1728)
return JBG_EAGAIN;
- if (!s->dppriv || s->dppriv == jbg_dptable)
- s->dppriv = (char *) checked_malloc(1728, sizeof(char));
- jbg_dppriv2int(s->dppriv, s->buffer);
+ dppriv = s->dppriv;
+ s->dppriv = (char *) checked_malloc(6912, sizeof(char));
+ jbg_dppriv2int(s->dppriv, dppriv);
+ checked_free(dppriv);
}
/*
...@@ -12,6 +12,7 @@ patch-options = ...@@ -12,6 +12,7 @@ patch-options =
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/jbigkit/files/jbigkit-2.0-build.patch?revision=1.1 # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/jbigkit/files/jbigkit-2.0-build.patch?revision=1.1
patches = patches =
${:_profile_base_location_}/jbigkit-2.0-build.patch#e974958e9331735c07478e9c2dde8795 ${:_profile_base_location_}/jbigkit-2.0-build.patch#e974958e9331735c07478e9c2dde8795
${:_profile_base_location_}/CVE-2013-6369.patch#cc44c27df4ae7fc3cbdcf75b426a2fdd
configure-command = true configure-command = true
make-targets = lib pbm make-targets = lib pbm
post-make-hook = ${:_profile_base_location_}/jbigkit-hooks.py#f1edb4ddd212d2d100d7ea8b2e42d21f:post_make_hook post-make-hook = ${:_profile_base_location_}/jbigkit-hooks.py#f1edb4ddd212d2d100d7ea8b2e42d21f:post_make_hook
...@@ -12,11 +12,11 @@ find-links = ...@@ -12,11 +12,11 @@ find-links =
[libreoffice-bin] [libreoffice-bin]
recipe = slapos.recipe.build recipe = slapos.recipe.build
# here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64). # here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
version = 4.2.1.1 version = 4.2.3.3
url = http://downloadarchive.documentfoundation.org/libreoffice/old/${:version}/rpm/%s/LibreOffice_${:version}_Linux_%s_rpm.tar.gz url = http://downloadarchive.documentfoundation.org/libreoffice/old/${:version}/rpm/%s/LibreOffice_${:version}_Linux_%s_rpm.tar.gz
# supported architectures md5sums # supported architectures md5sums
md5sum_x86 = 55f1bb4384b27d12df17185d22c238d3 md5sum_x86 = 2744ff6f5bd2bca773d6fec8b0558a5f
md5sum_x86-64 = 77140164da124c2f6e1eac3cad117542 md5sum_x86-64 = 25f1315fa6a22aefde116302a4146e46
# where office code can be found? # where office code can be found?
officedir = libreoffice4.2 officedir = libreoffice4.2
......
...@@ -125,15 +125,15 @@ pyOpenSSL = 0.13.1 ...@@ -125,15 +125,15 @@ pyOpenSSL = 0.13.1
Jinja2 = 2.7.2 Jinja2 = 2.7.2
MarkupSafe = 0.19 MarkupSafe = 0.19
Werkzeug = 0.9.4 Werkzeug = 0.9.4
buildout-versions = 1.7
cmd2 = 0.6.7 cmd2 = 0.6.7
collective.recipe.template = 1.11 collective.recipe.template = 1.11
itsdangerous = 0.24 itsdangerous = 0.24
lxml = 3.3.4 lxml = 3.3.4
meld3 = 0.6.10 meld3 = 1.0.0
mr.developer = 1.30 mr.developer = 1.30
netaddr = 0.7.11 netaddr = 0.7.11
prettytable = 0.7.3-nxd001 pyparsing = 2.0.2
pyparsing = 2.0.1
six = 1.6.1 six = 1.6.1
slapos.core = 1.0.4 slapos.core = 1.0.4
slapos.libnetworkcache = 0.14.1 slapos.libnetworkcache = 0.14.1
...@@ -142,26 +142,26 @@ stevedore = 0.15 ...@@ -142,26 +142,26 @@ stevedore = 0.15
xml-marshaller = 0.9.7 xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1 z3c.recipe.scripts = 1.0.1
#Required by: # Required by:
#slapos.core 1.0.3 # slapos.core==1.0.4
Flask = 0.10.1 Flask = 0.10.1
#Required by: # Required by:
#slapos.core 1.0.3 # slapos.core==1.0.4
cliff = 1.6.1 cliff = 1.6.1
#Required by: # Required by:
#slapos.core 1.0.3 # slapos.core==1.0.4
netifaces = 0.8-1 netifaces = 0.8-1
#Required by: # Required by:
#slapos.core 1.0.3 # slapos.core==1.0.4
requests = 2.2.1 requests = 2.2.1
#Required by: # Required by:
#slapos.core 1.0.3 # slapos.core==1.0.4
supervisor = 3.0 supervisor = 3.0
#Required by: # Required by:
#slapos.core 1.0.3 # slapos.core==1.0.4
zope.interface = 4.1.1 zope.interface = 4.1.1
...@@ -5,8 +5,8 @@ parts = ...@@ -5,8 +5,8 @@ parts =
[sqlite3] [sqlite3]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.sqlite.org/2013/sqlite-autoconf-3080200.tar.gz url = http://www.sqlite.org/2014/sqlite-autoconf-3080403.tar.gz
md5sum = f62206713e6a08d4ccbc60b1fd712a1a md5sum = 0f5459cde43cb269e5120ecd2c671ced
configure-options = configure-options =
--disable-static --disable-static
--enable-readline --enable-readline
......
...@@ -24,6 +24,7 @@ long_query_time = 1 ...@@ -24,6 +24,7 @@ long_query_time = 1
max_allowed_packet = 128M max_allowed_packet = 128M
query_cache_size = 0 query_cache_size = 0
query_cache_type = 0 query_cache_type = 0
innodb_file_per_table = 0
plugin-load = ha_mroonga.so;handlersocket.so plugin-load = ha_mroonga.so;handlersocket.so
......
...@@ -56,7 +56,7 @@ nb_workers = 2 ...@@ -56,7 +56,7 @@ nb_workers = 2
# Network # Network
ip = $${slap-network-information:global-ipv6} ip = $${slap-network-information:global-ipv6}
port = 8080 port = 8081
# Paths # Paths
# Log # Log
......
[buildout] [buildout]
versions = versions
extensions = buildout-versions
extends = extends =
../../stack/slapos.cfg ../../stack/slapos.cfg
../../component/nginx/buildout.cfg ../../component/nginx/buildout.cfg
...@@ -11,22 +6,12 @@ extends = ...@@ -11,22 +6,12 @@ extends =
../../component/dash/buildout.cfg ../../component/dash/buildout.cfg
../../component/tar/buildout.cfg ../../component/tar/buildout.cfg
allow-hosts =
*.nexedi.org
*.python.org
*.sourceforge.net
www.slapos.org
launchpad.net
github.com
alastairs-place.net
www.alittletooquiet.net
parts = parts =
dash dash
tar tar
curl curl
nginx nginx
eggs slapos-cookbook
template template
template_nginx_conf template_nginx_conf
template_downloader template_downloader
...@@ -34,9 +19,6 @@ parts = ...@@ -34,9 +19,6 @@ parts =
template_mime_types template_mime_types
instance_html5as instance_html5as
[eggs]
recipe = z3c.recipe.scripts
eggs = slapos.cookbook
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
...@@ -49,13 +31,13 @@ mode = 0644 ...@@ -49,13 +31,13 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance_html5as.cfg url = ${:_profile_base_location_}/instance_html5as.cfg
output = ${buildout:directory}/template_html5as.cfg output = ${buildout:directory}/template_html5as.cfg
md5sum = 579eceb768e8d25fb53338fc4fac6944 md5sum = 41cb6178f760238ca276854873ef9364
mode = 0644 mode = 0644
[template_nginx_conf] [template_nginx_conf]
recipe = slapos.recipe.download recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/nginx_conf.in url = ${:_profile_base_location_}/templates/nginx_conf.in
md5sum = 0ae1fb1c777c332d76f680c681a4f48a md5sum = 61dc4c82bf48563228ce4dea6c5c6319
filename = nginx_conf.in filename = nginx_conf.in
mode = 0644 mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
...@@ -71,7 +53,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_} ...@@ -71,7 +53,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
[template_downloader] [template_downloader]
recipe = slapos.recipe.download recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/downloader.in url = ${:_profile_base_location_}/templates/downloader.in
md5sum = 7b374a03f4086fcae47491d449da1f09 md5sum = 9779e2db6c73d282f802b3407b390ede
filename = downloader.in filename = downloader.in
mode = 0644 mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
...@@ -85,81 +67,120 @@ mode = 0644 ...@@ -85,81 +67,120 @@ mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
[versions] [versions]
zc.buildout = 1.6.0-dev-SlapOS-006
Jinja2 = 2.6 Jinja2 = 2.6
Pygments = 1.5
Werkzeug = 0.8.3 Werkzeug = 0.8.3
apache-libcloud = 0.12.3
async = 0.6.1
buildout-versions = 1.7 buildout-versions = 1.7
docutils = 0.9.1 gitdb = 0.5.4
hexagonit.recipe.cmmi = 1.6 hexagonit.recipe.cmmi = 2.0
ipython = 0.13 meld3 = 0.6.10
meld3 = 0.6.8 pycrypto = 2.6
slapos.cookbook = 0.61 rdiff-backup = 1.0.5
slapos.recipe.build = 0.11.6
slapos.recipe.cmmi = 0.1.1
slapos.recipe.template = 2.4.2 slapos.recipe.template = 2.4.2
slapos.recipe.download = 1.0.dev-r4053 slapos.toolbox = 0.34.0
smmap = 0.8.2
z3c.recipe.scripts = 1.0.1 z3c.recipe.scripts = 1.0.1
cliff = 1.4.4
cmd2 = 0.6.5.1
prettytable = 0.7.2
requests = 1.2.3
slapos.cookbook = 0.82
cffi = 0.8.2
cryptography = 0.3
plone.recipe.command = 1.1
pyOpenSSL = 0.14
six = 1.6.1
# Required by:
# cffi==0.8.2
pycparser = 2.10
# Required by:
# slapos.cookbook==0.82
lock-file = 2.0
# Required by: # Required by:
# slapos.core==0.28.2 # slapos.core==0.35.1
# slapos.toolbox==0.34.0
Flask = 0.9 Flask = 0.9
# Required by: # Required by:
# slapos.cookbook==0.61 # slapos.toolbox==0.34.0
PyXML = 0.8.4 GitPython = 0.3.2.RC1
# Required by: # Required by:
# netaddr==0.7.7 # slapos.toolbox==0.34.0
Sphinx = 1.1.3 atomize = 0.1.1
# Required by: # Required by:
# slapos.cookbook==0.61 # slapos.toolbox==0.34.0
feedparser = 5.1.3
# Required by:
# slapos.cookbook==0.82
inotifyx = 0.2.0 inotifyx = 0.2.0
# Required by: # Required by:
# slapos.cookbook==0.61 # slapos.cookbook==0.82
# slapos.core==0.28.2 # slapos.core==0.35.1
# xml-marshaller==0.9.7 # xml-marshaller==0.9.7
lxml = 2.3.5 lxml = 3.1.2
# Required by: # Required by:
# slapos.cookbook==0.61 # slapos.cookbook==0.82
netaddr = 0.7.7 netaddr = 0.7.10
# Required by: # Required by:
# slapos.core==0.28.2 # slapos.core==0.35.1
netifaces = 0.8 netifaces = 0.8
# Required by: # Required by:
# slapos.cookbook==0.61 # slapos.toolbox==0.34.0
# slapos.core==0.28.2 paramiko = 1.10.1
# zc.buildout==1.6.0-dev-SlapOS-006
# zc.recipe.egg==1.3.2
setuptools = 0.6c12dev-r88846
# Required by: # Required by:
# slapos.cookbook==0.61 # slapos.toolbox==0.34.0
slapos.core = 0.28.2 psutil = 0.7.0
# Required by: # Required by:
# slapos.core==0.28.2 # slapos.core==0.35.1
supervisor = 3.0a12 pyflakes = 0.7
# Required by: # Required by:
# slapos.cookbook==0.61 # slapos.cookbook==0.82
xml-marshaller = 0.9.7 pytz = 2013b
# Required by:
# slapos.cookbook==0.82
# slapos.core==0.35.1
# slapos.toolbox==0.34.0
# zc.buildout==1.6.0-dev-SlapOS-010
# zc.recipe.egg==1.3.2
setuptools = 0.6c12dev-r88846
# Required by: # Required by:
# slapos.cookbook==0.61 # slapos.cookbook==0.82
zc.recipe.egg = 1.3.2 # slapos.toolbox==0.34.0
slapos.core = 0.35.1
# Required by: # Required by:
# slapos.core==0.28.2 # slapos.core==0.35.1
zope.interface = 4.0.1 supervisor = 3.0b1
# Required by: # Required by:
# hexagonit.recipe.cmmi==1.6 # slapos.core==0.35.1
hexagonit.recipe.download = 1.6nxd002 unittest2 = 0.5.1
# Required by:
# slapos.cookbook==0.82
# slapos.toolbox==0.34.0
xml-marshaller = 0.9.7
# Required by:
# slapos.core==0.35.1
zope.interface = 4.0.5
[networkcache] [networkcache]
# signature certificates of the following uploaders. # signature certificates of the following uploaders.
# Łukasz Nowak # Łukasz Nowak
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
rm -r {{ param_html5as['docroot'] }}/* rm -r {{ param_html5as['docroot'] }}/*
# Download and extract website tarball into docroot directory # Download and extract website tarball into docroot directory
exec {{ param_html5as['path_curl'] }} -s {{ download_url }} | {{ param_html5as['path_tar'] }} -z -x -C {{ param_html5as['docroot'] }} exec {{ param_html5as['path_curl'] }} -ks {{ download_url }} | {{ param_html5as['path_tar'] }} -z -x -C {{ param_html5as['docroot'] }}
...@@ -13,6 +13,7 @@ events { ...@@ -13,6 +13,7 @@ events {
http { http {
include {{ param_html5as['path_mime_types'] }}; include {{ param_html5as['path_mime_types'] }};
default_type application/octet-stream; default_type application/octet-stream;
types_hash_bucket_size 64;
access_log {{ param_html5as['path_access_log'] }} combined; access_log {{ param_html5as['path_access_log'] }} combined;
index index.html; index index.html;
......
...@@ -92,17 +92,67 @@ develop += ...@@ -92,17 +92,67 @@ develop +=
${:parts-directory}/cloudooo ${:parts-directory}/cloudooo
[versions] [versions]
Jinja2 = 2.7.2
MarkupSafe = 0.21
Paste = 1.7.5.1 Paste = 1.7.5.1
PasteDeploy = 1.5.2
PasteScript = 1.7.5 PasteScript = 1.7.5
WSGIUtils = 0.7 WSGIUtils = 0.7
argparse = 1.1 Werkzeug = 0.9.4
buildout-versions = 1.7 buildout-versions = 1.7
erp5.util = 0.4.37 cffi = 0.8.2
cliff = 1.6.1
cmd2 = 0.6.7
cryptography = 0.3
inotifyx = 0.2.0-1
itsdangerous = 0.24
lxml = 3.3.4 lxml = 3.3.4
meld3 = 1.0.0
mr.developer = 1.30
netaddr = 0.7.11
netifaces = 0.8-1
plone.recipe.command = 1.1 plone.recipe.command = 1.1
psutil = 2.0.0 psutil = 2.1.0
pyOpenSSL = 0.14
pyparsing = 2.0.2
python-magic = 0.4.6 python-magic = 0.4.6
pytz = 2014.2
rdiff-backup = 1.0.5
requests = 2.2.1
six = 1.6.1
slapos.core = 1.0.4
slapos.recipe.build = 0.12 slapos.recipe.build = 0.12
slapos.recipe.cmmi = 0.2 slapos.recipe.cmmi = 0.2
slapos.recipe.template = 2.5
stevedore = 0.15
supervisor = 3.0
xml-marshaller = 0.9.7
# Required by:
# slapos.core==1.0.4
Flask = 0.10.1
# Required by:
# PasteScript==1.7.5
# cloudooo==1.2.5-dev
PasteDeploy = 1.5.2
# Required by:
# cloudooo==1.2.5-dev
argparse = 1.1
# Required by:
# cloudooo==1.2.5-dev
erp5.util = 0.4.38
# Required by:
# slapos.cookbook==0.85
lock-file = 2.0
# Required by:
# cffi==0.8.2
pycparser = 2.10
# Required by:
# cloudooo==1.2.5-dev
# slapos.core==1.0.4
zope.interface = 4.1.1 zope.interface = 4.1.1
...@@ -445,6 +445,7 @@ eggs = ...@@ -445,6 +445,7 @@ eggs =
elementtree elementtree
erp5diff erp5diff
inotifyx inotifyx
interval
ipdb ipdb
Jinja2 Jinja2
mechanize mechanize
...@@ -571,7 +572,7 @@ PasteDeploy = 1.5.2 ...@@ -571,7 +572,7 @@ PasteDeploy = 1.5.2
Pygments = 1.6 Pygments = 1.6
argparse = 1.2.1 argparse = 1.2.1
coverage = 3.7.1 coverage = 3.7.1
lxml = 3.3.4 lxml = 3.3.5
mr.developer = 1.30 mr.developer = 1.30
setuptools = 2.2 setuptools = 2.2
...@@ -622,10 +623,9 @@ zope.app.testing = 3.8.1 ...@@ -622,10 +623,9 @@ 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 MarkupSafe = 0.21
MySQL-python = 1.2.5 MySQL-python = 1.2.5
PIL = 1.1.7 PIL = 1.1.7
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
...@@ -635,24 +635,25 @@ Products.MimetypesRegistry = 2.0.5 ...@@ -635,24 +635,25 @@ Products.MimetypesRegistry = 2.0.5
Products.PluginRegistry = 1.3 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.21
PyXML = 0.8.5 PyXML = 0.8.5
Pympler = 0.3.1 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 astroid = 1.1.0
async = 0.6.1 async = 0.6.1
atomize = 0.2.0 atomize = 0.2.0
buildout-versions = 1.7
chardet = 2.2.1 chardet = 2.2.1
cliff = 1.6.0 cliff = 1.6.1
cmd2 = 0.6.7 cmd2 = 0.6.7
csp-eventlet = 0.7.0 csp-eventlet = 0.7.0
ecdsa = 0.11 ecdsa = 0.11
elementtree = 1.2.7-20070827-preview elementtree = 1.2.7-20070827-preview
erp5.recipe.cmmiforcei686 = 0.1.3 erp5.recipe.cmmiforcei686 = 0.1.3
erp5.util = 0.4.37 erp5.util = 0.4.38
erp5diff = 0.8.1.5 erp5diff = 0.8.1.5
eventlet = 0.14.0 eventlet = 0.14.0
feedparser = 5.1.3 feedparser = 5.1.3
...@@ -663,15 +664,17 @@ gitdb = 0.5.4 ...@@ -663,15 +664,17 @@ 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 httplib2 = 0.9
iniparse = 0.4 iniparse = 0.4
interval = 1.0.0
inotifyx = 0.2.0-1 inotifyx = 0.2.0-1
interval = 1.0.0
ipdb = 0.8 ipdb = 0.8
ipython = 2.0.0 ipython = 2.0.0
itsdangerous = 0.24 itsdangerous = 0.24
lock-file = 2.0 lock-file = 2.0
logilab-common = 0.61.0 logilab-common = 0.61.0
meld3 = 0.6.10 meld3 = 1.0.0
minitage = 2.0.67 minitage = 2.0.67
minitage.core = 2.0.57 minitage.core = 2.0.57
minitage.paste = 1.4.6 minitage.paste = 1.4.6
...@@ -685,11 +688,10 @@ plone.recipe.command = 1.1 ...@@ -685,11 +688,10 @@ plone.recipe.command = 1.1
ply = 3.4 ply = 3.4
polib = 1.0.4 polib = 1.0.4
pprofile = 1.7.1 pprofile = 1.7.1
prettytable = 0.7.3-nxd001 psutil = 2.1.0
psutil = 2.0.0
pyflakes = 0.8.1 pyflakes = 0.8.1
pylint = 1.1.0 pylint = 1.2.0
pyparsing = 2.0.1 pyparsing = 2.0.2
python-ldap = 2.4.15 python-ldap = 2.4.15
python-magic = 0.4.6 python-magic = 0.4.6
python-memcached = 1.53 python-memcached = 1.53
......
...@@ -13,7 +13,6 @@ download-cache = ...@@ -13,7 +13,6 @@ download-cache =
# Generate list of automatically chosen eggs version # Generate list of automatically chosen eggs version
extensions += extensions +=
buildout-versions buildout-versions
buildout.dumppickedversions
mr.developer mr.developer
# Use shacache and lxml # Use shacache and lxml
......
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