Merge 'gdal' into erp5-cluster

component/babeld/buildout.cfg

+[buildout]
+extends =
+  ../../stack/slapos.cfg 
+
+parts = babeld
+
+[babeld]
+recipe = slapos.recipe.cmmi
+url = https://softinst51707.host.vifib.net/public/babel-nxd.tar.gz 
+md5sum = 5b4391addf42956a84f9ca2bb1cfd1f9
+configure-command =
+  echo "No configure.."
+
+make-targets = 
+  install PREFIX=${buildout:parts-directory}/${:_buildout_section_name_} 

component/bison/buildout.cfg

 [buildout]
 extends =
   ../m4/buildout.cfg
+  ../xz-utils/buildout.cfg
 parts =
   bison
 
 [bison]
-patch-options = -p1
-patches =
-  ${:_profile_base_location_}/bison-drop.gets.patch#ac06cbaa298ac686d0b0c04bc03e6ad8
-
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/bison/bison-2.5.tar.bz2
-md5sum = 9dba20116b13fc61a0846b0058fbe004
+url = http://ftp.gnu.org/gnu/bison/bison-3.0.2.tar.xz
+md5sum = 146be9ff9fbd27497f0bf2286a5a2082
 environment =
   M4=${m4:location}/bin/m4
+  PATH=${xz-utils:location}/bin:%(PATH)s

component/dbus/buildout.cfg

@@ -10,8 +10,8 @@ parts =
 
 [dbus]
 recipe = slapos.recipe.cmmi
-url = http://dbus.freedesktop.org/releases/dbus/dbus-1.8.12.tar.gz
-md5sum = 0ca23fc84c09cb3d29b9c27811ff4475
+url = http://dbus.freedesktop.org/releases/dbus/dbus-1.8.14.tar.gz
+md5sum = dfb810eda8780cf9debf7169b3ca5fe1
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-options =
   --disable-static

component/file/buildout.cfg

@@ -8,8 +8,8 @@ extends =
 
 [file]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.astron.com/pub/file/file-5.20.tar.gz
-md5sum = 5d5e13eb3e0e13839da869a31790faf2
+url = ftp://ftp.astron.com/pub/file/file-5.21.tar.gz
+md5sum = 549fe96e09041eabece9de2bb28ef923
 configure-options =
   --disable-static
 environment =

component/freetype/buildout.cfg

@@ -13,8 +13,8 @@ parts =
 
 [freetype]
 recipe = slapos.recipe.cmmi
-url = http://download.savannah.gnu.org/releases/freetype/freetype-2.5.3.tar.bz2
-md5sum = d6b60f06bfc046e43ab2a6cbfd171d65
+url = http://download.savannah.gnu.org/releases/freetype/freetype-2.5.4.tar.bz2
+md5sum = 438585445a2f1f71c77590155fd96616
 pkg_config_depends = ${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-options =

component/gdal/buildout.cfg

+[buildout]
+extends =
+  ../numpy/buildout.cfg
+  ../curl/buildout.cfg
+  ../giflib/buildout.cfg
+  ../jasper/buildout.cfg
+  ../libexpat/buildout.cfg
+  ../pcre/buildout.cfg
+  ../sqlite3/buildout.cfg
+  ../webp/buildout.cfg
+
+parts =
+  gdal-python
+
+[gdal]
+recipe = slapos.recipe.cmmi
+version = 1.11.1
+url = http://download.osgeo.org/gdal/${:version}/gdal-${:version}.tar.xz
+md5sum = 2e126d7c6605691d38f3e71b945f5c73
+configure-options =
+  --with-curl=${curl:location}/bin/curl-config
+  --with-expat=${libexpat:location}
+  --with-gif=${giflib:location}
+  --with-jasper=${jasper:location}
+  --with-jpeg=${libjpeg:location}
+  --with-libtiff=${libtiff:location}
+  --with-libz=${zlib:location}
+  --with-png=${libpng:location}
+  --with-sqlite3=${sqlite3:location}
+  --with-wepb=${webp:location}
+  --with-xml2=${libxml2:location}/bin/xml2-config
+environment =
+  CPPFLAGS=-I${pcre:location}/include
+  LDFLAGS=-L${pcre:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib -Wl,-rpath=${curl:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${giflib:location}/lib -Wl,-rpath=${jasper:location}/lib -Wl,-rpath=${jbigkit:location}/lib -Wl,-rpath=${libjpeg:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${libtiff:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${webp:location}/lib -Wl,-rpath=${zlib:location}/lib
+
+[gdal-python]
+recipe = zc.recipe.egg:custom
+egg = GDAL ==${gdal:version}
+setup-eggs = ${numpy:egg}
+rpath = ${:library-dirs}
+include-dirs =
+  ${gdal:location}/include
+library-dirs =
+  ${gdal:location}/lib
+environment = gdal-python-env
+
+[gdal-python-env]
+PATH = ${gdal:location}/bin:%(PATH)s

component/gettext/buildout.cfg

@@ -2,16 +2,16 @@
 parts =
   gettext
 extends =
-  ../ncurses/buildout.cfg
   ../libxml2/buildout.cfg
+  ../lunzip/buildout.cfg
+  ../ncurses/buildout.cfg
   ../perl/buildout.cfg
   ../zlib/buildout.cfg
-  ../xz-utils/buildout.cfg
 
 [gettext]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.3.tar.xz
-md5sum = 092c3f460553ceb4a638ff81d36434c4
+url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.4.tar.lz
+md5sum = 3e2c6f64efbffd97520ec3b998682c6b
 
 configure-options =
   --disable-static
@@ -29,6 +29,6 @@ configure-options =
   --without-xz
 
 environment =
-  PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${lunzip:location}/bin:%(PATH)s
   CPPFLAGS=-I${libxml2:location}/include -I${zlib:location}/include -I${ncurses:location}/include
   LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib

component/git/buildout.cfg

@@ -16,8 +16,8 @@ parts =
 
 [git]
 recipe = slapos.recipe.cmmi
-url = https://www.kernel.org/pub/software/scm/git/git-2.1.0.tar.xz
-md5sum = 47b1f55d9a16be112f7ae2c778a9b30c
+url = https://www.kernel.org/pub/software/scm/git/git-2.2.1.tar.xz
+md5sum = 43e01f9d96ba8c11611e0eef0d9f9f28
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}

component/groonga/buildout.cfg

@@ -6,13 +6,14 @@ parts =
   groonga
 
 extends =
+  ../libstemmer/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
 
 [groonga]
 recipe = slapos.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-4.0.8.tar.gz
-md5sum = 8c8d63bd5cf676acecca3698e2ae0601
+url = http://packages.groonga.org/source/groonga/groonga-4.0.9.tar.gz
+md5sum = ab6c15de7764ba5028b5037cc22368e8
 # temporary patch to respect more tokens in natural language mode.
 patches =
   ${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b
@@ -23,10 +24,14 @@ configure-options =
   --disable-benchmark
   --disable-document
   --disable-groonga-httpd
+  --with-libstemmer
+  --with-libstemmer-include=${libstemmer:location}/include
+  --with-libstemmer-lib=${libstemmer:location}/lib
   --without-mecab
+  --without-kytea
 environment =
-  CPPFLAGS =-I${zlib:location}/include
-  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib
+  CPPFLAGS=-I${libstemmer:location}/include -I${zlib:location}/include
+  LDFLAGS=-Wl,-rpath=${libstemmer:location}/lib -L${libstemmer:location}/lib -Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib
 
 [groonga-normalizer-mysql]
 recipe = slapos.recipe.cmmi

component/haproxy/buildout.cfg

@@ -11,8 +11,8 @@ parts = haproxy
 
 [haproxy]
 recipe = slapos.recipe.cmmi
-url = http://www.haproxy.org/download/1.5/src/haproxy-1.5.9.tar.gz
-md5sum = b7672bb6a8aa188a655b418f3c96f65c
+url = http://www.haproxy.org/download/1.5/src/haproxy-1.5.10.tar.gz
+md5sum = 5631457ea1f84b3c0d8e5bc8015ed329
 configure-command = true
 # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
 # otherwise use "generic".

component/libffi/buildout.cfg

@@ -4,9 +4,9 @@ parts =
 
 [libffi]
 recipe = slapos.recipe.cmmi
-version = 3.1
+version = 3.2.1
 url = ftp://sourceware.org/pub/libffi/libffi-${:version}.tar.gz
-md5sum = f5898b29bbfd70502831a212d9249d10
+md5sum = 83b89587607e3eb65c70d361f13bab43
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 patch-options = -p1
 patches =

component/libpng/buildout.cfg

@@ -18,15 +18,15 @@ environment =
 
 [libpng12]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.2.51.tar.xz
-md5sum = 4efba67fa5aa2b785c6fcec2cc3e90c9
+url = http://download.sourceforge.net/libpng/libpng-1.2.52.tar.xz
+md5sum = 49d5c71929bf69a172147c47b9309fbe
 
 [libpng15]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.19.tar.xz
-md5sum = 1e2afb372b9979b2133829ee8136f30f
+url = http://download.sourceforge.net/libpng/libpng-1.5.21.tar.xz
+md5sum = 22eaa2e90352fcd153bed0cdecf542cb
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.6.14.tar.xz
-md5sum = aefd9fda2178acab908707737174a0cd
+url = http://download.sourceforge.net/libpng/libpng-1.6.16.tar.xz
+md5sum = 23b7286b5d4a86de950fd2ffc5cac742

component/libstemmer/buildout.cfg

+# libstemmer
+# http://snowball.tartarus.org/
+
+[libstemmer]
+recipe = slapos.recipe.cmmi
+url = http://snowball.tartarus.org/dist/libstemmer_c.tgz
+md5sum = 6f32f8f81cd6fa0150333ab540af5e27
+patch-options = -p0
+patches =
+  ${:_profile_base_location_}/libstemmer.Makefile.patch#f337bfe457ecf00d3297043a153d402a
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+configure-command = true
+make-options = DESTDIR=${:location}
+

component/libstemmer/libstemmer.Makefile.patch

+--- Makefile.orig	2014-12-29 15:39:57.433970435 +0100
++++ Makefile	2014-12-29 15:54:42.115248445 +0100
+@@ -1,9 +1,19 @@
+ include mkinc.mak
+-CFLAGS=-Iinclude
+-all: libstemmer.o stemwords
+-libstemmer.o: $(snowball_sources:.c=.o)
+-	$(AR) -cru $@ $^
+-stemwords: examples/stemwords.o libstemmer.o
+-	$(CC) -o $@ $^
++CFLAGS+=-Iinclude -fPIC
++DESTDIR=/usr/local
++all: libstemmer.so libstemmer.a stemwords
++libstemmer.so: $(snowball_sources:.c=.o)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.0d -o $@.0d.0.0 $^
++	ln -s $@.0d.0.0 $@.0d
++	ln -s $@.0d.0.0 $@
++libstemmer.a: $(snowball_sources:.c=.o)
++	$(AR) -crs $@ $^
++stemwords: examples/stemwords.o libstemmer.so
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ clean:
+-	rm -f stemwords *.o src_c/*.o runtime/*.o libstemmer/*.o
++	rm -f stemwords libstemmer.so* libstemmer.a *.o src_c/*.o runtime/*.o libstemmer/*.o
++install: all
++	mkdir -p $(DESTDIR)/include
++	mkdir -p $(DESTDIR)/lib
++	cp -a include/*.h $(DESTDIR)/include/
++	cp -a libstemmer.* $(DESTDIR)/lib/

component/libxml2/buildout.cfg

@@ -11,8 +11,8 @@ parts =
 
 [libxml2]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.9.1.tar.gz
-md5sum = 9c0cfef285d5c4a5c80d00904ddab380
+url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.9.2.tar.gz
+md5sum = 9e6a9aca9d155737868b3dc5fd82f788
 configure-options =
   --disable-static
   --without-python

component/lunzip/buildout.cfg

+[buildout]
+parts =
+  lunzip
+
+[lunzip]
+recipe = slapos.recipe.cmmi
+url = http://download.savannah.gnu.org/releases/lunzip/lunzip-1.6.tar.gz
+md5sum = 5e6ad4fe91f235be64227bc9930986fe
+configure-options =
+  --disable-static

component/manpy/buildout.cfg

+[buildout]
+extends =
+  ../scipy/buildout.cfg
+  ../rpy2/buildout.cfg
+  ../git/buildout.cfg
+
+parts = 
+  manpy
+
+[dream-repository.git]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/dream.git
+branch = master
+git-executable = ${git:location}/bin/git
+develop = true
+
+[dream-build]
+; use a develop egg to easily develop and because dream already exist on pypi
+; https://pypi.python.org/pypi/dream
+recipe = zc.recipe.egg:develop
+setup = ${dream-repository.git:location}
+
+[manpy-env]
+<= numpy-env
+
+[manpy]
+dependency = ${dream-build:setup}
+recipe = zc.recipe.egg:script
+eggs = dream
+environment = manpy-env
+setup-eggs =
+  ${scipy:egg}
+  ${rpy2:egg}
+initialization =
+  # rpy2 needs R in $PATH
+  import os
+  os.environ['PATH'] = '${r-language:location}/bin' + os.pathsep + os.environ.get('PATH', '')

component/mariadb/buildout.cfg

@@ -58,8 +58,8 @@ environment =
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
 # http://mroonga.github.com/
 recipe = slapos.recipe.cmmi
-url = http://packages.groonga.org/source/mroonga/mroonga-4.08.tar.gz
-md5sum = 3c5da803a332f48fa1d21163c04954e4
+url = http://packages.groonga.org/source/mroonga/mroonga-4.09.tar.gz
+md5sum = 426a572672d8fda3319bb63a7496cd3e
 configure-command = mkdir fake_mariadb_source && ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql && ./configure
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}

component/openssl/buildout.cfg

@@ -16,8 +16,8 @@ parts =
 
 [openssl]
 recipe = slapos.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.1j.tar.gz
-md5sum = f7175c9cd3c39bb1907ac8bba9df8ed3
+url = https://www.openssl.org/source/openssl-1.0.1k.tar.gz
+md5sum = d4f002bd22a56881340105028842ae1f
 patch-binary = ${patch:location}/bin/patch
 patches =
   ${:_profile_base_location_}/openssl-nodoc.patch#b4887a7b4e18402447bc6227d2493b92

component/python-cliff/buildout.cfg

+[buildout]
+
+[python-cliff]
+recipe = zc.recipe.egg:custom
+egg = cliff
+setup-eggs = ${python-cliff-prep:eggs}
+
+[python-cliff-prep]
+recipe = zc.recipe.egg
+eggs =
+  pbr
+

component/python-cryptography/buildout.cfg

@@ -22,5 +22,6 @@ CPATH = ${openssl:location}/include
 recipe = zc.recipe.egg
 eggs =
   ${python-cffi:egg}
+  enum34
   pycparser
   six

component/r-language/buildout.cfg

+[buildout]
+extends =
+  ../readline/buildout.cfg
+  ../gcc/buildout.cfg
+
+parts =
+  gcc-fortran
+  r-language
+
+[r-language]
+recipe = slapos.recipe.cmmi
+url = http://cran.irsn.fr/src/base/R-3/R-3.1.0.tar.gz
+md5sum = a1ee52446bee81820409661e6d114ab1
+configure-options =
+  --with-readline=yes
+  --with-x=no
+  --enable-R-shlib
+environment =
+  CC=${gcc-fortran:location}/bin/gcc
+  F77=${gcc-fortran:location}/bin/gfortran
+  CFLAGS=-I${readline:location}/include -I${ncurses:location}/include
+  LDFLAGS=-L${gcc-fortran:location}/lib64 -Wl,-rpath=${gcc-fortran:location}/lib64 -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${ncurses:location}/lib/ -Wl,-rpath=${ncurses:location}/lib/

component/r-language/software.cfg

+# A minimal software release to test the r-language component (depends on gfortran).
+
+[buildout]
+extends = 
+  ../../stack/slapos.cfg
+  ../../component/gcc/buildout.cfg
+  ../../component/r-language/buildout.cfg
+
+parts =
+  eggs
+  gcc-fortran
+  r-language
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  slapos.cookbook
+

component/re6stnet/buildout.cfg

+[buildout]
+extends =
+  ../../stack/slapos.cfg
+  ../git/buildout.cfg
+  ../babeld/buildout.cfg
+
+develop = 
+  re6stnet-repository
+
+parts = 
+  babeld
+  re6stnet-develop
+  re6stnet
+
+[re6stnet-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/re6stnet.git
+branch = master
+git-executable = ${git:location}/bin/git
+
+[re6stnet-develop]
+recipe = zc.recipe.egg:develop
+setup = ${re6stnet-hack:dir}
+
+[re6stnet-hack]
+recipe = plone.recipe.command
+stop-on-error = true
+dir = ${re6stnet-repository:location}
+command =
+  rm -f "${:dir}/re6stconf.py" && ln -s re6st-conf "${:dir}/re6stconf.py"
+  rm -f "${:dir}/re6stregister.py" && ln -s re6st-conf "${:dir}/re6stregister.py"
+  rm -f "${:dir}/re6stnet.py" && ln -s re6st-conf "${:dir}/re6stnet.py"
+
+update-command = ${:command}
+
+[environment]
+# Note: For now original PATH is appended to the end, as not all tools are
+#       provided by SlapOS
+PATH=${babeld:location}/bin:${bzip2:location}/bin:${gettext:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${libxslt:location}/bin:${ncurses:location}/bin:${openssl:location}/bin:${pkgconfig:location}/bin:${python2.7:location}/bin:${readline:location}/bin:${sqlite3:location}/bin::${buildout:bin-directory}:${xz-utils:location}/bin:$PATH
+
+[re6stnet]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  ${python-cffi:egg}
+  ${python-cryptography:egg}
+  pyOpenSSL
+  re6stnet
+
+script =
+  re6stnet
+  re6st-conf
+  re6st-registry
+
+initialization =
+  import os
+  os.environ['PATH'] = os.path.expandvars('${environment:PATH}')
+
+entry-points =
+  re6stnet=re6stnet:main
+  re6st-conf=re6stconf:main
+  re6st-registry=re6stregistry:main
+

component/rpy2/buildout.cfg

+[buildout]
+extends =
+  ../r-language/buildout.cfg
+
+# rpy2 needs R in $PATH
+# to use rpy2 you need a wrapper that sets ${r-language:location}/bin in PATH
+# see ../manpy/buildout.cfg as an example
+
+[rpy2_env]
+PATH = ${r-language:location}/bin/:%(PATH)s
+CFLAGS = -I${readline:location}/include
+LDFLAGS = -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${r-language:location}/lib/R/lib -Wl,-rpath=${r-language:location}/lib/R/lib
+
+[rpy2]
+recipe = zc.recipe.egg:custom
+environment = rpy2_env
+egg = rpy2

component/scikit-learn/buildout.cfg

+[buildout]
+extends =
+  ../numpy/buildout.cfg
+
+parts =
+  scikit-learn
+
+[scikit-learn-env]
+<= numpy-env
+
+[scikit-learn]
+recipe = zc.recipe.egg:custom
+egg = scikit-learn
+environment = scikit-learn-env
+setup-eggs = ${numpy:egg}

component/scipy/buildout.cfg

+[buildout]
+extends =
+  ../numpy/buildout.cfg
+
+parts =
+  scipy
+
+[scipy-env]
+<= numpy-env
+
+[scipy]
+recipe = zc.recipe.egg:custom
+egg = scipy
+environment = scipy-env
+setup-eggs = ${numpy:egg}

component/sqlite3/buildout.cfg

@@ -5,8 +5,8 @@ parts =
 
 [sqlite3]
 recipe = slapos.recipe.cmmi
-url = http://www.sqlite.org/2014/sqlite-autoconf-3080701.tar.gz
-md5sum = 8ee4541ebb3e5739e7ef5e9046e30063
+url = http://www.sqlite.org/2014/sqlite-autoconf-3080704.tar.gz
+md5sum = 33bb8db0038317ce1b0480ca1185c7ba
 configure-options =
   --disable-static
   --enable-readline

component/wget/buildout.cfg

@@ -10,8 +10,8 @@ parts =
 
 [wget]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/wget/wget-1.16.tar.xz
-md5sum = fe102975ab3a6c049777883f1bb9ad07
+url = http://ftp.gnu.org/gnu/wget/wget-1.16.1.tar.xz
+md5sum = 78942cc0cce0a23e18114d982789e360
 configure-options =
   --enable-ipv6
   --enable-opie

component/xz-utils/buildout.cfg

@@ -4,7 +4,7 @@ parts =
 
 [xz-utils]
 recipe = slapos.recipe.cmmi
-url = http://tukaani.org/xz/xz-5.0.5.tar.bz2
-md5sum = db44efe0d53ac4317627624b98c63da0
+url = http://tukaani.org/xz/xz-5.2.0.tar.bz2
+md5sum = 867cc8611760240ebf3440bd6e170bb9
 configure-options =
   --disable-static

software/apache-frontend/software.cfg

@@ -30,4 +30,4 @@ feedparser = 5.1.3
 
 # Required by:
 # slapos.toolbox==0.40.2
-paramiko = 1.15.1
+paramiko = 1.15.2

software/dream/instance.cfg

@@ -8,6 +8,7 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
+# parameters
 [instance-parameter]
 recipe = slapos.cookbook:slapconfiguration
 computer = $${slap_connection:computer_id}
@@ -15,16 +16,18 @@ partition = $${slap_connection:partition_id}
 url = $${slap_connection:server_url}
 key = $${slap_connection:key_file}
 cert = $${slap_connection:cert_file}
+[dream_platform_parameter]
+port = 8080
+host = $${instance-parameter:ipv6-random}
 
-port = 5000
-host = $${slap-network-information:local-ipv4}
-
+# service
 [dream_platform]
 recipe = slapos.cookbook:wrapper
-command-line = ${buildout:bin-directory}/dream_platform --host $${instance-parameter:host} --port $${instance-parameter:port}
+command-line = ${buildout:bin-directory}/dream_platform --host $${dream_platform_parameter:host} --port $${dream_platform_parameter:port} --log $${directory:log}/dream_platform.log
 wrapper-path = $${directory:service}/dream_platform
 parameters-extra = true
 
+# CLI
 [dream_simulation]
 recipe = slapos.cookbook:wrapper
 command-line = ${buildout:bin-directory}/dream_simulation
@@ -43,8 +46,5 @@ log = $${:var}/log
 
 [publish-connection-parameter]
 recipe = slapos.cookbook:publishurl
-url = http://$${instance-parameter:host}:$${instance-parameter:port}
+url = http://[$${dream_platform_parameter:host}]:$${dream_platform_parameter:port}
 
-; FIXME: how to enable this without "switch" swoftare type ?
-[slap-network-information]
-local-ipv4 = 0.0.0.0

software/dream/software.cfg

 [buildout]
+versions = versions
 extends = 
   ../../stack/slapos.cfg
-  ../../component/numpy/buildout.cfg
-  ../../component/r-language/buildout.cfg
-
-parts +=
-  rpy2
+  ../../component/manpy/buildout.cfg
+parts =
   slapos-cookbook
-  dream-build
-  dream
+  manpy
   instance
 
-[rpy2_env]
-PATH = ${r-language:location}/bin/:%(PATH)s
-
-[rpy2]
-recipe = zc.recipe.egg:custom
-environment = rpy2_env
-egg = rpy2>=2.3,<2.4
-
-[dream-repository.git]
-recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/dream.git
-branch = master
-git-executable = ${git:location}/bin/git
-
-[dream-build]
-; use a develop egg to easily develop and because dream already exist on pypi
-; https://pypi.python.org/pypi/dream
-recipe = zc.recipe.egg:develop
-dependency = ${scipy-build:recipe}
-setup = ${dream-repository.git:location}
-
-[dream]
-recipe = zc.recipe.egg:scripts
-eggs = dream
-initialization =
-  # rpy2 needs R in $PATH
-  import os
-  os.environ['PATH'] = '${r-language:location}/bin' + os.pathsep + os.environ['PATH']
-
 [instance]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/instance.cfg
 
+[versions]
+rpy2 = 2.4.0
+pydot = 1.0.28
+xlrd = 0.9.3
+xlwt = 0.7.5
+pyparsing = 2.0.3
+numpy = 1.9.1
+scipy = 0.13.3
+simpy = 3.0.5
+
+# indirect dependancies
+collective.recipe.template = 1.11
+cp.recipe.cmd = 0.5
+plone.recipe.command = 1.1
+slapos.recipe.template = 2.6
+zope.exceptions = 4.0.7
+zope.testing = 4.1.3
+

software/html5as/software.cfg

@@ -92,4 +92,4 @@ feedparser = 5.1.3
 
 # Required by:
 # slapos.toolbox==0.40.2
-paramiko = 1.15.1
+paramiko = 1.15.2

software/kvm/software.cfg

@@ -44,4 +44,4 @@ numpy = 1.9.0
 
 # Required by:
 # slapos.toolbox==0.40.4
-paramiko = 1.15.1
+paramiko = 1.15.2

software/monitor/software.cfg

@@ -100,4 +100,4 @@ feedparser = 5.1.3
 
 # Required by:
 # slapos.toolbox==0.45.1
-paramiko = 1.15.1
+paramiko = 1.15.2

software/slaprunner/common.cfg

@@ -29,7 +29,6 @@ parts =
   eggs
   instance-runner-import
   instance-runner-export
-  slapos-cookbook
   template-slapos-cfg
 # XXX: we have to manually add this for resilience
   rdiff-backup
@@ -175,42 +174,15 @@ mode = 0644
 [eggs]
 recipe = z3c.recipe.scripts
 eggs =
-  ${lxml-python:egg}
   collective.recipe.environment
   cns.recipe.symlink
   erp5.util
-  hexagonit.recipe.download
-  inotifyx
   lock-file
-  lxml
-  netaddr
   plone.recipe.command
-  pytz
-  slapos.cookbook
-  slapos.libnetworkcache
   slapos.recipe.build
   slapos.toolbox[flask_auth]
-  slapos.core
-  supervisor
-  xml_marshaller
   Gunicorn
-
-# Add slapos.libnetworkcache to path of slapos.core so that slaprunner can build SRs using cache
-[slapos-cookbook]
-eggs =
-  ${lxml-python:egg}
-  slapos.cookbook
-  cliff
-  hexagonit.recipe.download
-  inotifyx
-  netaddr
-  netifaces
-  requests
-  slapos.core
-  supervisor
-  xml_marshaller
-  pytz
-  slapos.libnetworkcache
+  ${slapos-cookbook:eggs}
 
 [extra-eggs]
 recipe = zc.recipe.egg

software/slaprunner/software.cfg

@@ -20,7 +20,7 @@ gunicorn = 19.1.1
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
 slapos.recipe.download = 1.0.dev-r4053
-slapos.toolbox = 0.45.2
+slapos.toolbox = 0.45.3
 smmap = 0.8.3
 z3c.recipe.scripts = 1.0.1
 
@@ -42,4 +42,4 @@ jsonschema = 2.4.0
 
 # Required by:
 # slapos.toolbox==0.45.2
-paramiko = 1.15.1
+paramiko = 1.15.2

stack/boinc/buildout.cfg

@@ -88,4 +88,4 @@ feedparser = 5.1.3
 
 # Required by:
 # slapos.toolbox==0.40.2
-paramiko = 1.15.1
+paramiko = 1.15.2

stack/erp5/buildout.cfg

@@ -638,7 +638,7 @@ zope.app.testing = 3.8.1
 
 # Pinned versions
 MySQL-python = 1.2.5
-Pillow = 2.6.1
+Pillow = 2.7.0
 Products.CMFActionIcons = 2.1.3
 Products.DCWorkflowGraph = 0.4.1
 Products.ExternalEditor = 1.1.0
@@ -647,7 +647,7 @@ Products.LongRequestLogger = 1.1.0
 Products.MimetypesRegistry = 2.0.6
 Products.PluginRegistry = 1.3
 Products.TIDStorage = 5.4.9
-PyPDF2 = 1.23
+PyPDF2 = 1.24
 PyXML = 0.8.5
 Pympler = 0.3.1
 StructuredText = 2.11.1
@@ -660,10 +660,10 @@ csp-eventlet = 0.7.0
 ecdsa = 0.11
 elementtree = 1.2.7-20070827-preview
 erp5diff = 0.8.1.5
-eventlet = 0.15.2
+eventlet = 0.16.0
 five.formlib = 1.0.4
 five.localsitemanager = 2.0.5
-gitdb = 0.6.0
+gitdb = 0.6.1
 greenlet = 0.4.5
 http-parser = 0.8.3
 httplib2 = 0.9
@@ -683,7 +683,7 @@ pprofile = 1.7.2
 pycountry = 1.10
 pyflakes = 0.8.1
 pylint = 1.4.0
-python-ldap = 2.4.17
+python-ldap = 2.4.18
 python-magic = 0.4.6
 python-memcached = 1.53
 qrcode = 5.1
@@ -705,7 +705,7 @@ xfw = 0.10
 
 # Required by:
 # slapos.toolbox==0.45.2
-GitPython = 0.3.2.1
+GitPython = 0.3.3
 
 # Required by:
 # Products.CMFCore==2.2.8
@@ -750,7 +750,7 @@ ordereddict = 1.1
 
 # Required by:
 # slapos.toolbox==0.45.2
-paramiko = 1.15.1
+paramiko = 1.15.2
 
 # Required by:
 # zope.app.testing==3.8.1

stack/lamp.cfg

@@ -63,4 +63,4 @@ feedparser = 5.1.1
 
 # Required by:
 # slapos.toolbox==0.40.2
-paramiko = 1.15.1
+paramiko = 1.15.2

stack/lamp/buildout.cfg

@@ -206,4 +206,4 @@ feedparser = 5.1.3
 
 # Required by:
 # slapos.toolbox==0.40.2
-paramiko = 1.15.1
+paramiko = 1.15.2

stack/lapp/buildout.cfg

@@ -203,7 +203,7 @@ feedparser = 5.1.3
 
 # Required by:
 # slapos.toolbox==0.40.2
-paramiko = 1.15.1
+paramiko = 1.15.2
 
 # Required by:
 # slapos.recipe.maarch==0.4

stack/slapos.cfg

@@ -23,6 +23,7 @@ extends =
   ../component/python-2.7/buildout.cfg
   ../component/lxml-python/buildout.cfg
   ../component/python-cffi/buildout.cfg
+  ../component/python-cliff/buildout.cfg
   ../component/python-cryptography/buildout.cfg
 
 # Separate from site eggs
@@ -84,10 +85,11 @@ recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
   ${python-cffi:egg}
+  ${python-cliff:egg}
   ${python-cryptography:egg}
   pyOpenSSL
   slapos.cookbook
-  cliff
+  slapos.libnetworkcache
   hexagonit.recipe.download
   inotifyx
   netaddr
@@ -103,8 +105,8 @@ eggs =
 zc.buildout = 1.7.1-dev-SlapOS-005
 # Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
 zc.recipe.egg = 1.3.2nxd001
-# Use own version of h.r.download to be able to open xz-like archives
-hexagonit.recipe.download = 1.7nxd002
+# Use own version of h.r.download to be able to open .xz and .lz archives
+hexagonit.recipe.download = 1.7nxd003
 
 Jinja2 = 2.7.3
 MarkupSafe = 0.23
@@ -112,23 +114,28 @@ Werkzeug = 0.9.6
 buildout-versions = 1.7
 cffi = 0.8.6
 cmd2 = 0.6.8
-cryptography = 0.6
+cryptography = 0.7.1
 itsdangerous = 0.24
 lxml = 3.4.1
 meld3 = 1.0.0
 mr.developer = 1.31
+netaddr = 0.7.13
+pbr = 0.10.7
 prettytable = 0.7.2
+psutil = 2.1.3
 pyOpenSSL = 0.14
 pyparsing = 2.0.3
+requests = 2.5.1
 setuptools = 7.0
-six = 1.8.0
 simplejson = 3.6.5
+six = 1.9.0
 slapos.cookbook = 0.87
 slapos.core = 1.3.5
 slapos.libnetworkcache = 0.14.2
-slapos.recipe.build = 0.15
+slapos.recipe.build = 0.16
 slapos.recipe.cmmi = 0.2
 stevedore = 1.1.0
+xml-marshaller = 0.9.7
 
 # Required by:
 # slapos.core==1.3.5
@@ -137,40 +144,35 @@ Flask = 0.10.1
 # Required by:
 # cliff==1.9.0
 # stevedore==1.1.0
-argparse = 1.2.2
+argparse = 1.3.0
 
 # Required by:
 # slapos.core==1.3.5
 cliff = 1.9.0
 
 # Required by:
-# slapos.cookbook==0.87
-inotifyx = 0.2.2
+# cryptography==0.7
+enum34 = 1.0.4
 
 # Required by:
 # slapos.cookbook==0.87
-lock-file = 2.0
+inotifyx = 0.2.2
 
 # Required by:
 # slapos.cookbook==0.87
-netaddr = 0.7.12
+lock-file = 2.0
 
 # Required by:
 # slapos.core==1.3.5
 netifaces = 0.10.4
 
 # Required by:
-# cliff==1.9.0
-# stevedore==1.1.0
-pbr = 0.10.0
-
-# Required by:
-# pbr==0.10.0
-pip = 1.5.6
+# pbr==0.10.7
+pip = 6.0.6
 
 # Required by:
-# slapos.core==1.3.5
-psutil = 2.1.3
+# cryptography==0.7
+pyasn1 = 0.1.7
 
 # Required by:
 # cffi==0.8.6
@@ -180,10 +182,6 @@ pycparser = 2.10
 # slapos.cookbook==0.87
 pytz = 2014.10
 
-# Required by:
-# slapos.core==1.3.5
-requests = 2.5.0
-
 # Required by:
 # slapos.core==1.3.5
 supervisor = 3.1.3
@@ -192,13 +190,9 @@ supervisor = 3.1.3
 # slapos.core==1.3.5
 uritemplate = 0.6
 
-# Required by:
-# slapos.cookbook==0.87
-xml-marshaller = 0.9.7
-
 # Required by:
 # slapos.core==1.3.5
-zope.interface = 4.1.1
+zope.interface = 4.1.2
 
 [networkcache]
 download-cache-url = http://www.shacache.org/shacache