Merge branch 'master' into slaprunner-paas

Conflicts:
	software/slaprunner/software.cfg

component/accords/buildout.cfg

+[buildout]
+extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../libtool/buildout.cfg
+  ../git/buildout.cfg
+  ../openssl/buildout.cfg
+  ../libuuid/buildout.cfg
+
+parts = accords
+
+[accords-source]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.gitorious.ow2.org/ow2-compatibleone/accords-platform.git
+
+[accords]
+# Part of Compatible One project
+# http://gitorious.ow2.org/ow2-compatibleone/accords-platform
+recipe = hexagonit.recipe.cmmi
+#url = http://gitorious.ow2.org/ow2-compatibleone/accords-platform/archive-tarball/master
+path = ${accords-source:location}/
+#md5sum = 
+# Replaces autogen.sh
+configure-command =
+  ./clean
+  libtoolize -c -f
+  aclocal -I ${libtool:location}/share/aclocal
+  automake -c -a -f --add-missing
+  autoreconf --install
+  ./configure
+configure-options =
+  --with-ssl=${openssl:location}
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+environment =
+  CPPFLAGS =-I${libuuid:location}/include -I${openssl:location}/include
+  LDFLAGS =-Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
+  LIBTOOL=libtool
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:%(PATH)s
+
+# Accords makefile does not install necessary scripts. Let's copy it
+[accords-scripts]
+recipe = plone.recipe.command
+requires = ${accords:location}
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+origin = ${accords-source:location}/scripts
+destination = ${:location}
+command = ([ -e ${:origin}/co-broker ] && [ ! -e ${:destination}/co-broker ] && mkdir ${:destination} && cp -r ${:origin} ${:destination})

component/apache-php/buildout.cfg

@@ -21,9 +21,6 @@ extends =
 [apache-php]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = slapos.recipe.cmmi
-depends =
-  ${mariadb:version}
-  ${libpng:so_version}
 url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2
 md5sum = 5c7b614242ae12e9cacca21c8ab84818
 configure-options =
@@ -70,9 +67,6 @@ environment =
 [apache-php-postgres]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = slapos.recipe.cmmi
-depends =
-   ${postgresql:url}
-   ${libpng:so_version}
 url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2
 md5sum = 5c7b614242ae12e9cacca21c8ab84818
 configure-options =

component/apache/buildout.cfg

@@ -17,24 +17,21 @@ extends =
 
 [apr]
 recipe = hexagonit.recipe.download
-version = 1.5.1
-url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-${:version}.tar.bz2
-md5sum = 5486180ec5a23efb5cae6d4292b300ab
+version = 1.5.0
+md5sum = cc93bd2c12d0d037f68e21cc6385dc31
+url = https://archive.apache.org/dist/apr/apr-${:version}.tar.bz2
 
 [apr-util]
 recipe = hexagonit.recipe.download
 version = 1.5.3
-url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-util-${:version}.tar.bz2
+url = https://archive.apache.org/dist/apr/apr-util-${:version}.tar.bz2
 md5sum = 6f3417691c7a27090f36e7cf4d94b36e
 
 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
-depends =
-  ${gdbm:version}
 version = 2.4.10
-revision = 1
-url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
+url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
 md5sum = 44543dff14a4ebc1e9e2d86780507156
 configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure
 configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
@@ -103,10 +100,6 @@ patch-options = -p0
 # http://www.apachelounge.com/viewtopic.php?p=20551
 patches =
   ${:_profile_base_location_}/mod_antiloris-apache-2.4.patch#4f074f035d3b37f3f3e71cd9616440f3
-depends =
-  ${apache:version}
-  ${apache:revision}
-  ${gdbm:version}
 configure-command = ${apache:location}/bin/apxs
 configure-options = -c mod_antiloris.c
 make-binary = ${:configure-command}
@@ -117,7 +110,7 @@ make-targets =
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
 version = 2.2.27
-url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
+url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
 md5sum = 8faef0decf3fa7e69b2568eb2105a3d8
 patch-options = -p1
 configure-options = --disable-static
@@ -179,8 +172,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/project/mod-antiloris/mod_antiloris-0.4.tar.bz2
 md5sum = 66862bf10e9be3a023e475604a28a0b4
-depends =
-  ${apache-2.2:version}
 configure-command = ${apache-2.2:location}/bin/apxs
 configure-options = -c mod_antiloris.c
 make-binary = ${:configure-command}

component/aspell/buildout.cfg

@@ -16,7 +16,6 @@ stop-on-error = yes
 
 [aspell]
 recipe = slapos.recipe.cmmi
-revision = 1
 url = http://ftp.gnu.org/gnu/aspell/aspell-0.60.6.1.tar.gz
 md5sum = e66a9c9af6a60dc46134fdacf6ce97d7
 environment =
@@ -29,6 +28,3 @@ recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-7.1-0.tar.bz2
 md5sum = beba5e8f3afd3ed1644653bb685b2dfb
 configure-command = ./configure --vars ASPELL=${aspell:location}/bin/aspell PREZIP=${aspell:location}/bin/prezip-bin
-depends =
-  ${aspell:url}
-  ${aspell:revision}

component/bash/buildout.cfg

@@ -2,7 +2,15 @@
 parts =
   bash
 
+extends =
+  ../ncurses/buildout.cfg
+
 [bash]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnu.org/gnu/bash/bash-4.2.tar.gz
-md5sum = 3fb927c7c33022f1c327f14a81c0d4b0
+url = http://ftp.gnu.org/gnu/bash/bash-4.3.tar.gz
+md5sum = 81348932d5da294953e15d4814c74dd1
+configure-options =
+  --with-curses
+environment =
+  CPPFLAGS=-I${ncurses:location}/include
+  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib

component/binutils/buildout.cfg

@@ -2,7 +2,15 @@
 parts =
   binutils
 
+extends =
+  ../bison/buildout.cfg
+  ../zlib/buildout.cfg
+
 [binutils]
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/binutils/binutils-2.21.1.tar.bz2
 md5sum = bde820eac53fa3a8d8696667418557ad
+environment =
+  PATH=${bison:location}/bin:%(PATH)s
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/cloudooo/buildout.cfg

@@ -5,14 +5,9 @@ extends =
 parts =
   cloudooo
 
-develop +=
-  ${:parts-directory}/cloudooo-repository
-
-[cloudooo-check-recipe]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/cloudooo.egg-link
+[cloudooo-develop]
+recipe = zc.recipe.egg:develop
+setup = ${cloudooo-repository:location}
 
 [cloudooo-repository]
 recipe = slapos.recipe.build:gitclone
@@ -22,7 +17,7 @@ git-executable = ${git:location}/bin/git
 
 [cloudooo]
 recipe = zc.recipe.egg
-extra-paths = ${cloudooo-repository:location}
+dependency = ${cloudooo-develop:recipe}
 eggs =
   ${lxml-python:egg}
   PasteScript
@@ -39,4 +34,3 @@ scripts =
   paster=cloudooo_paster
   runCloudoooUnitTest
   runCloudoooTestSuite
-ugly-depend-on = ${cloudooo-repository:recipe} ${cloudooo-repository:repository} ${cloudooo-check-recipe:command}

component/coreutils/buildout.cfg

@@ -6,8 +6,8 @@ parts =
 
 [coreutils]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.21.tar.xz
-md5sum = 065ba41828644eca5dd8163446de5d64
+url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz
+md5sum = abed135279f87ad6762ce57ff6d89c41
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --enable-install-program=tr,basename,uname,cat,cp,ls
 environment =

component/cups/buildout.cfg

@@ -9,8 +9,8 @@ extends =
 # for now we build and install library and header files only.
 [cups]
 recipe = slapos.recipe.cmmi
-url = http://www.cups.org/software/1.7.1/cups-1.7.1-source.tar.bz2
-md5sum = 55277c40fd4b7183dc3671d39c5c42b7
+url = http://www.cups.org/software/1.7.4/cups-1.7.4-source.tar.bz2
+md5sum = 1a2295c2b2d2f422db2e50f40ed2fb99
 configure-options =
   --disable-static
   --disable-dbus

component/curl/buildout.cfg

@@ -12,8 +12,8 @@ parts =
 
 [curl]
 recipe = slapos.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.37.0.tar.bz2
-md5sum = 7dda0cc2e4136f78d5801ac347be696b
+url = http://curl.haxx.se/download/curl-7.37.1.tar.bz2
+md5sum = 95c627abcf6494f5abe55effe7cd6a57
 configure-options =
   --disable-static
   --disable-ldap

component/dropbear/buildout.cfg

@@ -5,41 +5,13 @@
 ########################################################
 
 [buildout]
-extends = 
+extends =
   ../zlib/buildout.cfg
   ../coreutils/buildout.cfg
 
 parts =
   dropbear-output
 
-[dropbear-userspace-patch]
-recipe = hexagonit.recipe.download
-md5sum = 3d934c2c90e8c57536a4fa2cf8ad216d
-url = ${:_profile_base_location_}/${:filename}
-filename = userspace.patch
-download-only = true
-
-[dropbear-ipv6-patch]
-recipe = hexagonit.recipe.download
-md5sum = b30dd58d68829a80eee69188134382ef
-url = ${:_profile_base_location_}/${:filename}
-filename = ipv6-support.patch
-download-only = true
-
-[dropbear-no-shell-check-patch]
-recipe = hexagonit.recipe.download
-md5sum = bb2ac410bd4cb2b07c23bfcc712e45f7
-url = ${:_profile_base_location_}/${:filename}
-filename = no-shell-checking.patch
-download-only = true
-
-[dropbear-static_build_fix.patch]
-recipe = hexagonit.recipe.download
-md5sum = 6e0ccc1949dfa31b4bc3951b9bb6472e
-url = ${:_profile_base_location_}/${:filename}
-filename = dropbear-0.53.1-static_build_fix.patch
-download-only = true
-
 [dropbear]
 recipe = slapos.recipe.cmmi
 md5sum = 0284ea239083f04c8b874e08e1aca243
@@ -57,10 +29,10 @@ environment =
   LDFLAGS =-Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib
 
 patches=
-  ${dropbear-userspace-patch:location}/${dropbear-userspace-patch:filename}
-  ${dropbear-ipv6-patch:location}/${dropbear-ipv6-patch:filename}
-  ${dropbear-no-shell-check-patch:location}/${dropbear-no-shell-check-patch:filename}
-  ${dropbear-static_build_fix.patch:location}/${dropbear-static_build_fix.patch:filename}
+  ${:_profile_base_location_}/userspace.patch#3d934c2c90e8c57536a4fa2cf8ad216d
+  ${:_profile_base_location_}/ipv6-support.patch#b30dd58d68829a80eee69188134382ef
+  ${:_profile_base_location_}/no-shell-checking.patch#bb2ac410bd4cb2b07c23bfcc712e45f7
+  ${:_profile_base_location_}/dropbear-0.53.1-static_build_fix.patch#6e0ccc1949dfa31b4bc3951b9bb6472e
 
 patch-options=
   -p1

component/ffmpeg/buildout.cfg

@@ -33,8 +33,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
 md5sum = 292ab65cedd5021d6b7ddd117e07cd8e
-depends =
-  ${libpng:so_version}
 patches =
   ${:_profile_base_location_}/libtheora-png_sizeof.patch#eaa1454081b50f05b59495a12f52b0d5
 

component/file/buildout.cfg

@@ -8,8 +8,8 @@ extends =
 
 [file]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.astron.com/pub/file/file-5.18.tar.gz
-md5sum = d420d8f2990cd344673acfbf8d76ff5a
+url = ftp://ftp.astron.com/pub/file/file-5.19.tar.gz
+md5sum = e3526f59023f3f7d1ffa4d541335edab
 configure-options =
   --disable-static
 environment =

component/firefox/buildout.cfg

@@ -26,12 +26,12 @@ depends =
   ${liberation-fonts:location}
   ${ipaex-fonts:location}
 
-version = 30.0
+version = 31.0
 
 # MD5SUMs are available at :
 # https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${:version}/MD5SUMS
-x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 469be1f0aaf537f16e17c324bb5baa6b
-x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 a4979b84a7d68f77d4109282a468f041
+x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 a9b7f88599df4009195936e82a41f34a
+x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 b3e5b0a77086fadd2fa0ee9cda5f70c9
 
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')

component/freetype/buildout.cfg

@@ -16,8 +16,6 @@ recipe = slapos.recipe.cmmi
 url = http://download.savannah.gnu.org/releases/freetype/freetype-2.5.3.tar.bz2
 md5sum = d6b60f06bfc046e43ab2a6cbfd171d65
 pkg_config_depends = ${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
-depends =
-  ${libpng:so_version}
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-options =
   --disable-static

component/gcc/buildout.cfg

@@ -14,116 +14,99 @@ recipe = slapos.recipe.cmmi
 url = http://www.mpfr.org/mpfr-3.0.1/mpfr-3.0.1.tar.bz2
 md5sum = bfbecb2eacb6d48432ead5cfc3f7390a
 configure-options =
-  --with-gmp=${gmp:location}
+  --with-gmp=${gmp-4:location}
   --disable-static
 environment =
-  LDFLAGS=-Wl,-rpath=${gmp:location}/lib
+  LDFLAGS=-Wl,-rpath=${gmp-4:location}/lib
 
 [mpc]
 recipe = slapos.recipe.cmmi
 url = http://www.multiprecision.org/mpc/download/mpc-0.9.tar.gz
 md5sum = 0d6acab8d214bd7d1fbbc593e83dd00d
 configure-options =
-  --with-gmp=${gmp:location}
+  --with-gmp=${gmp-4:location}
   --with-mpfr=${mpfr:location}
   --disable-static
 environment =
-  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp:location}/lib
+  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp-4:location}/lib
 
 [ppl]
 recipe = slapos.recipe.cmmi
-# we should use version 0.10.x for gcc-4.5
-url = http://bugseng.com/products/ppl/download/ftp/releases/0.10.2/ppl-0.10.2.tar.bz2
-md5sum = 5667111f53150618b0fa522ffc53fc3e
+# we should use version 0.11.x for gcc-4.7
+url = http://bugseng.com/external/ppl/download/ftp/releases/0.11/ppl-0.11.tar.bz2
+md5sum = c414abd2ecaf1f1f48949c78d383ee1a
+patches =
+  ${:_profile_base_location_}/ppl-0.11-gcc-4.9.patch#09e00eefba5f8e6e77a9c9c611fccc64
+
 configure-options =
-  --with-libgmp-prefix=${gmp:location}
-  --with-libgmpxx-prefix=${gmp:location}
+  --with-gmp=${gmp-4:location}
+  --with-gmp-prefix=${gmp-4:location}
   --disable-static
 environment =
   PATH=${m4:location}/bin:%(PATH)s
-  LDFLAGS=-Wl,-rpath=${gmp:location}/lib
+  LDFLAGS=-Wl,-rpath=${gmp-4:location}/lib
+  CXXFLAGS=-fpermissive
+
 
 [cloog-ppl]
 recipe = slapos.recipe.cmmi
-url = ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.9.tar.gz
-md5sum = 806e001d1b1a6b130069ff6274900af5
+url = ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-0.16.1.tar.gz
+md5sum = 947123350d1ff6dcb4b0774947ac015a
 configure-options =
-  --with-gmp=${gmp:location}
+  --with-gmp-prefix=${gmp-4:location}
   --with-ppl=${ppl:location}
   --disable-static
 environment =
   PATH=${m4:location}/bin:%(PATH)s
-  LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${ppl:location}/lib
-
-[gcc-download]
-hack-revision = ${gcc-interconnection-workaround:hack-revision}
-recipe = hexagonit.recipe.download
-url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-4.5.3.tar.bz2
-md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
-strip-top-level-dir = True
-destination = ${gcc-source:location}
+  LDFLAGS=-Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${ppl:location}/lib
 
-[gcc-source]
-hack-revision = ${gcc-interconnection-workaround:hack-revision}
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-
-[gcc-multiarch.patch]
-recipe = hexagonit.recipe.download
-md5sum = 819e6735270c8a432b0512b49f40219f
-url = ${:_profile_base_location_}/${:filename}
-filename = ${:_buildout_section_name_}
-download-only = true
+[gcc-common]
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnu.org/gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2
+md5sum = 4c696da46297de6ae77a82797d2abe28
+# make install does not work when several core are used
+make-targets = install -j1
 
 [gcc]
-hack-revision = ${gcc-interconnection-workaround:hack-revision}
-depends =
-  ${gcc-download:location}
-recipe = slapos.recipe.cmmi
-path = ${gcc-source:location}
-md5sum = bb3265edf0fa7543e50cedb93e04e427
-patches =
-  ${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
-patch-options = -p2
-configure-command = make clean \\; make distclean \\; ./configure
+<= gcc-common
 configure-options =
   --disable-bootstrap
-  --enable-languages="c,c++"
   --disable-multilib
-  --with-gmp=${gmp:location}
+  --with-gmp=${gmp-4:location}
   --with-mpfr=${mpfr:location}
   --with-mpc=${mpc:location}
+  --enable-languages="c,c++"
   --with-ppl=${ppl:location}
   --with-cloog=${cloog-ppl:location}
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --enable-cloog-backend=isl
 environment =
-  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${ppl:location}/lib -Wl,-rpath=${cloog-ppl:location}/lib
-# make install does not work when several core are used
-make-targets = install -j1
+  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${ppl:location}/lib -Wl,-rpath=${cloog-ppl:location}/lib
 
 [gcc-minimal]
-recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-core-4.5.4.tar.bz2
-md5sum = ca62e442629a9a7710f5d797bf1b521c
-patches =
-  ${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
-patch-options = -p2
+<= gcc-common
 configure-options =
   --disable-bootstrap
-  --enable-languages=c
   --disable-multilib
-  --with-gmp=${gmp:location}
+  --with-gmp=${gmp-4:location}
   --with-mpfr=${mpfr:location}
   --with-mpc=${mpc:location}
+  --enable-languages=c
   --without-ppl
   --without-cloog
 environment =
-  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib
-# make install does not work when several core are used
-make-targets = install -j1
+  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${mpc:location}/lib
 
-[gcc-interconnection-workaround]
-# gcc parts are interconnected, so buildout is not capable to clean them up
-# until gcc will be simplified by using more robust build recipe (like
-# slapos.recipe.build) each time any of parts which reuses this one gets updated
-# the hack-revision have to be increased
-hack-revision = 2
+[gcc-fortran]
+<= gcc-common
+configure-options =
+  --disable-bootstrap
+  --disable-multilib
+  --with-gmp=${gmp-4:location}
+  --with-mpfr=${mpfr:location}
+  --with-mpc=${mpc:location}
+  --enable-languages="c,c++,fortran"
+  --with-ppl=${ppl:location}
+  --with-cloog=${cloog-ppl:location}
+  --enable-cloog-backend=isl
+environment =
+  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${ppl:location}/lib -Wl,-rpath=${cloog-ppl:location}/lib

component/gcc/ppl-0.11-gcc-4.9.patch

+# HG changeset patch
+# User Bernhard Walle <bernhard@bwalle.de>
+# Date 1399806036 -7200
+#      Sun May 11 13:00:36 2014 +0200
+# Node ID 5632a171e7c1dc4c0fb5c7a8352afb4188cd29d5
+# Parent  e35fa03cd2043496839aa5fa3a1a3d2d375b5535
+complibs/ppl: Fix build of ppl 0.11.2 with gcc 4.9
+
+  From: Roberto Bagnara <bagnara@cs.unipr.it>
+  Date: Tue, 29 Apr 2014 19:51:43 +0000 (+0200)
+  Subject: Added missing inclusions.  Use std::ptrdiff_t.
+  X-Git-Url: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl%2Fppl.git;a=commitdiff_plain;h=61d4e14dfd9f1121e9b4521dead5728b2424dd7c
+
+  Added missing inclusions.  Use std::ptrdiff_t.
+  (Thanks to Paulo Cesar Pereira de Andrade.)
+
+Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
+
+diff -r e35fa03cd204 -r 5632a171e7c1 patches/ppl/0.11.2/500-ptrdiff_t.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/patches/ppl/0.11.2/500-ptrdiff_t.patch	Sun May 11 13:00:36 2014 +0200
+@@ -0,0 +1,95 @@
++From: Bernhard Walle <bernhard@bwalle.de>
++Subject: Fix compilation with gcc 4.9 (ptrdiff_t errors)
++
++This is a backport of following patch in ppl git
++
++  commit 61d4e14dfd9f1121e9b4521dead5728b2424dd7c
++  Author: Roberto Bagnara <bagnara@cs.unipr.it>
++  Date:   Tue Apr 29 21:51:43 2014 +0200
++
++      Added missing inclusions.  Use std::ptrdiff_t.
++      (Thanks to Paulo Cesar Pereira de Andrade.)
++
++---
++ src/Congruence_System.defs.hh     |    3 ++-
++ src/Constraint_System.defs.hh     |    3 ++-
++ src/Generator_System.defs.hh      |    3 ++-
++ src/Grid_Generator_System.defs.hh |    3 ++-
++ 4 files changed, 8 insertions(+), 4 deletions(-)
++
++--- a/src/Grid_Generator_System.defs.hh
+++++ b/src/Grid_Generator_System.defs.hh
++@@ -30,6 +30,7 @@ site: http://www.cs.unipr.it/ppl/ . */
++ #include "Variables_Set.types.hh"
++ #include "Grid.types.hh"
++ #include <iosfwd>
+++#include <cstddef>
++ 
++ namespace Parma_Polyhedra_Library {
++ 
++@@ -267,7 +268,7 @@ public:
++   class const_iterator
++     : public std::iterator<std::forward_iterator_tag,
++ 			   Grid_Generator,
++-			   ptrdiff_t,
+++			   std::ptrdiff_t,
++ 			   const Grid_Generator*,
++ 			   const Grid_Generator&>,
++       private Generator_System::const_iterator {
++--- a/src/Congruence_System.defs.hh
+++++ b/src/Congruence_System.defs.hh
++@@ -33,6 +33,7 @@ site: http://www.cs.unipr.it/ppl/ . */
++ #include "Grid.types.hh"
++ #include "Grid_Certificate.types.hh"
++ #include <iosfwd>
+++#include <cstddef>
++ 
++ namespace Parma_Polyhedra_Library {
++ 
++@@ -235,7 +236,7 @@ public:
++   class const_iterator
++     : public std::iterator<std::forward_iterator_tag,
++ 			   Congruence,
++-			   ptrdiff_t,
+++			   std::ptrdiff_t,
++ 			   const Congruence*,
++ 			   const Congruence&> {
++   public:
++--- a/src/Constraint_System.defs.hh
+++++ b/src/Constraint_System.defs.hh
++@@ -33,6 +33,7 @@ site: http://www.cs.unipr.it/ppl/ . */
++ #include "Congruence_System.types.hh"
++ #include <iterator>
++ #include <iosfwd>
+++#include <cstddef>
++ 
++ namespace Parma_Polyhedra_Library {
++ 
++@@ -204,7 +205,7 @@ public:
++   class const_iterator
++     : public std::iterator<std::forward_iterator_tag,
++ 			   Constraint,
++-			   ptrdiff_t,
+++			   std::ptrdiff_t,
++ 			   const Constraint*,
++ 			   const Constraint&> {
++   public:
++--- a/src/Generator_System.defs.hh
+++++ b/src/Generator_System.defs.hh
++@@ -33,6 +33,7 @@ site: http://www.cs.unipr.it/ppl/ . */
++ #include "Polyhedron.types.hh"
++ #include "Poly_Con_Relation.defs.hh"
++ #include <iosfwd>
+++#include <cstddef>
++ 
++ namespace Parma_Polyhedra_Library {
++ 
++@@ -250,7 +251,7 @@ public:
++   class const_iterator
++     : public std::iterator<std::forward_iterator_tag,
++ 			   Generator,
++-			   ptrdiff_t,
+++			   std::ptrdiff_t,
++ 			   const Generator*,
++ 			   const Generator&> {
++   public:

component/gettext/buildout.cfg

@@ -10,8 +10,8 @@ extends =
 
 [gettext]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.1.tar.xz
-md5sum = b52987f49bc99fa8b410270d47a9d52b
+url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.2.tar.xz
+md5sum = 1e6a827f5fbd98b3d40bd16b803acc44
 
 configure-options =
   --disable-static

component/ghostscript/buildout.cfg

@@ -11,8 +11,6 @@ parts = ghostscript
 
 [ghostscript-common]
 recipe = slapos.recipe.cmmi
-depends =
-  ${libtiff:version}
 pkg_config_depends = ${libtiff:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}
 configure-options =
   --disable-cups

component/git/buildout.cfg

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

component/glibmm/buildout.cfg

@@ -17,7 +17,7 @@ pkg_config_depends = ${glib:location}/lib/pkgconfig:${libsigc:location}/lib/pkgc
 configure-options =
   --disable-documentation
 environment =
-  PATH=${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:${glib:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
   CPPFLAGS=-I${gettext:location}/include
   LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib

component/gmp/buildout.cfg

 [buildout]
 extends =
   ../m4/buildout.cfg
+  ../xz-utils/buildout.cfg
 
 parts =
   gmp
 
-[gmp]
-recipe = slapos.recipe.cmmi
 # we should use version 4.x for ppl-0.10
+[gmp-4]
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2
 md5sum = dd60683d7057917e34630b4a787932e8
 # GMP does not correctly detect achitecture so it have to be given
@@ -20,4 +21,13 @@ configure-options =
 environment =
   PATH=${m4:location}/bin:%(PATH)s
 
-
+[gmp]
+recipe = slapos.recipe.cmmi
+version = 6.0.0a
+url = ftp://ftp.gmplib.org/pub/gmp-6.0.0/gmp-${:version}.tar.xz
+md5sum = 1e6da4e434553d2811437aa42c7f7c76
+configure-options =
+  --enable-cxx
+  --disable-static
+environment =
+  PATH=${m4:location}/bin:${xz-utils:location}/bin:%(PATH)s

component/gnutls/buildout.cfg

@@ -26,8 +26,8 @@ environment =
 
 [gnutls]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-3.2.15.tar.xz
-md5sum = ec3b06f80e312137386c5d322183ca5a
+url = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-3.2.16.tar.xz
+md5sum = d9a3fb49121b49bc332bfe9c3f49b005
 configure-options =
   --disable-static
   --disable-libdane

component/graphviz/buildout.cfg

@@ -19,8 +19,6 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.36.0.tar.gz
 md5sum = 1f41664dba0c93109ac8b71216bf2b57
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}
 configure-options =
   --with-included-ltdl

component/groonga/buildout.cfg

@@ -11,9 +11,9 @@ extends =
 
 [groonga]
 recipe = slapos.recipe.cmmi
-version = 4.0.3
+version = 4.0.4
 url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz
-md5sum = 6f0cb64c0643fc2dd61df6fc542e17e2
+md5sum = b00411d2efae3ddf03eb1ecb8575177f
 configure-options =
   --disable-static
   --disable-glibtest
@@ -31,8 +31,6 @@ version = 1.0.6
 url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-${:version}.tar.gz
 md5sum = 12740a835cfdf4b0dac66c3f2f152d84
 location = ${groonga:location}
-depends =
-  ${groonga:version}
 configure-options =
   --disable-static
 environment =

component/gtk-2/buildout.cfg

 [buildout]
 extends =
+  ../autoconf/buildout.cfg
+  ../libtool/buildout.cfg
+  ../automake/buildout.cfg
   ../bzip2/buildout.cfg
   ../fontconfig/buildout.cfg
   ../freetype/buildout.cfg
@@ -23,9 +26,12 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://cairographics.org/releases/cairo-1.12.16.tar.xz
 md5sum = a1304edcdc99282f478b995ee5f8f854
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${libpng:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${pixman:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/cairo-fix_gcc4.9_ftbfs.patch#d4c843a655be8f1df548c9492d253359
+pre-configure =
+  autoreconf -vfi
 configure-options =
   --disable-static
   --disable-gtk-doc-html
@@ -35,8 +41,9 @@ configure-options =
   --disable-xcb
   --enable-ft
   --enable-fc
+  --disable-lto
 environment =
-  PATH=${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
@@ -60,8 +67,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/pango/1.36/pango-1.36.1.tar.xz
 md5sum = 9e0d3a1ea395172f8c39ba98a4d2081a
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}
 configure-options =
   --disable-static
@@ -103,8 +108,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.22.tar.xz
 md5sum = 5fbbfb7637bbd571a572a2dae0e736d2
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig
 configure-options =
   --disable-static

component/gtk-2/cairo-fix_gcc4.9_ftbfs.patch

+From c3645d97ebd24c6f7ad850785d585aebc706a11c Mon Sep 17 00:00:00 2001
+From: Bryce Harrington <b.harrington@samsung.com>
+Date: Tue, 08 Jul 2014 20:14:20 +0000
+Subject: configure.ac: Add a --disable-lto configure option
+
+Link-Time Optimization seems to be stable enough with gcc 4.8 and 4.9,
+but has proven to be an issue in the past for many cairo users (webkit,
+efl, ubuntu, opensuse, gentoo, arch...) who carry patches to disable it.
+
+Gentoo's patch[1] adds a --disable-lto option to leave it enabled by
+default but give users the ability to work around lto related build
+problems (c.f. fdo #77060).  Patch appears to have been authored by
+Alexandre Rostovtsev[2].
+
+1: sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/cairo/files/cairo-1.12.16-lto-optional.patch
+2: https://bugs.gentoo.org/show_bug.cgi?id=509552
+
+Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=60852
+Signed-off-by: Bryce Harrington <b.harrington@samsung.com>
+Reviewed-by: Uli Schlachter <psychon@znc.in>
+---
+diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
+index f984eb2..a72d948 100644
+--- a/build/configure.ac.warnings
++++ b/build/configure.ac.warnings
+@@ -38,13 +38,18 @@ dnl options.  Namely, the following:
+ 
+ dnl -flto working really needs a test link, not just a compile
+ 
+-safe_MAYBE_WARN="$MAYBE_WARN"
+-MAYBE_WARN="$MAYBE_WARN -flto"
+-AC_TRY_LINK([],[
++AC_ARG_ENABLE(lto,
++  AS_HELP_STRING([--disable-lto],
++                 [Do not try to use Link-Time Optimization]))
++if test "x$enable_lto" != "xno"; then
++   safe_MAYBE_WARN="$MAYBE_WARN"
++   MAYBE_WARN="$MAYBE_WARN -flto"
++   AC_TRY_LINK([],[
+ 	int main(int argc, char **argv) { return 0; }
+-],[],[
++   ],[],[
+ 	MAYBE_WARN="$safe_MAYBE_WARN"
+-])
++   ])
++fi
+ 
+ MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
+ 
+--
+cgit v0.9.0.2-2-gbebe

component/gtkmm/buildout.cfg

@@ -18,8 +18,6 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://cairographics.org/releases/cairomm-1.11.2.tar.gz
 md5sum = 732a3ff5b57401eb5dfeef795a2a0c52
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}:${libsigc:location}/lib/pkgconfig
 configure-options =
   --disable-static

component/haproxy/buildout.cfg

@@ -11,8 +11,8 @@ parts = haproxy
 
 [haproxy]
 recipe = slapos.recipe.cmmi
-url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.5.1.tar.gz
-md5sum = 49640cf3ddd793a05fbd3394481a1ed4
+url = http://www.haproxy.org/download/1.5/src/haproxy-1.5.3.tar.gz
+md5sum = e999a547d57445d5a5ab7eb6a06df9a1
 configure-command = true
 # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
 # otherwise use "generic".

component/hookbox/buildout.cfg

 [buildout]
 parts =
   hookbox
-find-links =
-  http://www.nexedi.org/static/packages/source/
+
 versions = versions
 
 [versions]

component/icu/buildout.cfg

@@ -9,3 +9,6 @@ url = http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz
 md5sum = ea93970a0275be6b42f56953cd332c17
 configure-command = source/configure
 configure-options = --prefix=${:location}
+
+[icu]
+<= icu4c

component/imagemagick/buildout.cfg

@@ -25,12 +25,8 @@ extends =
 [imagemagick]
 recipe = slapos.recipe.cmmi
 version = 6.8.9-1
-url = http://ftp.vim.org/ImageMagick/ImageMagick-${:version}.tar.xz
+url = http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${:version}.tar.xz
 md5sum = bde038ae05fb20d29cebf88ab9cbdce5
-depends =
-  ${libtiff:version}
-  ${libpng:so_version}
-  ${webp:so_version}
 pkg_config_depends = ${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${xz-utils:location}/lib/pkgconfig
 configure-options =
   --disable-static

component/inkscape/buildout.cfg

@@ -36,8 +36,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://sourceforge.net/projects/inkscape/files/inkscape/0.48.4/inkscape-0.48.4.tar.bz2
 md5sum = 47bd8546e42ba396624eef9eb66b9b6c
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${gtkmm:location}/lib/pkgconfig:${gtkmm:pkg_config_depends}:${gsl:location}/lib/pkgconfig:${popt:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig
 patch-options = -p0
 patches =

component/intltool/buildout.cfg

@@ -12,7 +12,6 @@ recipe = slapos.recipe.cmmi
 url = http://edge.launchpad.net/intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz
 md5sum = d6c91bf06681919ccfdf3624035b75dc
 depends =
-  ${perl:version}
   ${perl-XML-Parser:location}
 environment =
   PATH=${perl:location}/bin:${gettext:location}/bin:${pkgconfig:location}/bin:%(PATH)s

component/jasper/CVE-2011-4516-and-CVE-2011-4517.patch

+Description: Fix for CVE-2011-4516 and CVE-2011-4517
+ This patch fixes a possible denial of service and code execution via
+ heap-based buffer overflows.
+Author: Michael Gilbert <michael.s.gilbert@gmail.com>
+Origin: Patch thanks to Red Hat
+Bug-Debian: http://bugs.debian.org/652649
+
+Index: jasper-1.900.1/src/libjasper/jpc/jpc_cs.c
+===================================================================
+--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c	2011-12-19 09:35:34.186909298 -0500
++++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c	2011-12-19 09:35:51.198909832 -0500
+@@ -744,6 +744,10 @@
+ 		return -1;
+ 	}
+ 	compparms->numrlvls = compparms->numdlvls + 1;
++	if (compparms->numrlvls > JPC_MAXRLVLS) {
++		jpc_cox_destroycompparms(compparms);
++		return -1;
++	}
+ 	if (prtflag) {
+ 		for (i = 0; i < compparms->numrlvls; ++i) {
+ 			if (jpc_getuint8(in, &tmp)) {
+@@ -1331,7 +1335,7 @@
+ 	jpc_crgcomp_t *comp;
+ 	uint_fast16_t compno;
+ 	crg->numcomps = cstate->numcomps;
+-	if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) {
++	if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(jpc_crgcomp_t)))) {
+ 		return -1;
+ 	}
+ 	for (compno = 0, comp = crg->comps; compno < cstate->numcomps;

component/jasper/buildout.cfg

@@ -8,6 +8,11 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip
 md5sum = a342b2b4495b3e1394e161eb5d85d754
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/misc-fixes.patch#1202be8418907dfe58f819f7b47da24f
+  ${:_profile_base_location_}/fix-filename-buffer-overflow.patch#38403f9c82a18547beca16c9c6f4ce7a
+  ${:_profile_base_location_}/CVE-2011-4516-and-CVE-2011-4517.patch#a9676718ed016f66a3c76acf764c9e72
 # jasper configure script is not executable by default
 configure-command =
   /bin/sh ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static --enable-shared --disable-opengl

component/jasper/fix-filename-buffer-overflow.patch

+Description: Filename buffer overflow fix
+ This patch fixes a security hole by a bad buffer size handling.
+Author: Roland Stigge <stigge@antcom.de>
+Bug-Debian: http://bugs.debian.org/645118
+
+--- a/src/libjasper/include/jasper/jas_stream.h
++++ b/src/libjasper/include/jasper/jas_stream.h
+@@ -77,6 +77,7 @@
+ #include <jasper/jas_config.h>
+ 
+ #include <stdio.h>
++#include <limits.h>
+ #if defined(HAVE_FCNTL_H)
+ #include <fcntl.h>
+ #endif
+@@ -99,6 +100,12 @@ extern "C" {
+ #define O_BINARY	0
+ #endif
+ 
++#ifdef PATH_MAX
++#define JAS_PATH_MAX PATH_MAX
++#else
++#define JAS_PATH_MAX 4096
++#endif
++
+ /*
+  * Stream open flags.
+  */
+@@ -251,7 +258,7 @@ typedef struct {
+ typedef struct {
+ 	int fd;
+ 	int flags;
+-	char pathname[L_tmpnam + 1];
++	char pathname[JAS_PATH_MAX + 1];
+ } jas_stream_fileobj_t;
+ 
+ #define	JAS_STREAM_FILEOBJ_DELONCLOSE	0x01

component/kumo/buildout.cfg

@@ -6,28 +6,15 @@ extends =
   ../zlib/buildout.cfg
 
 parts = kumo
-find-links = http://www.nexedi.org/static/packages/source/
-
-[kumo-hooks-download]
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 958a595a02de75624728f8d65e39d800
-recipe = hexagonit.recipe.download
-download-only=true
-filename = kumo-hooks.py
-
-[kumo-ipv6-multiip-patch-download]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-filename = kumofs-0.4.13_ipv6support_multiiplistenfix.patch
-md5sum = 53af9f1f1375940841c589a6cbe11425
-download-only = true
 
 [kumo]
-pre-configure-hook = ${kumo-hooks-download:location}/${kumo-hooks-download:filename}:pre_configure_hook
-recipe = erp5.recipe.cmmiforcei686
+recipe = slapos.recipe.cmmi
 url = https://github.com/downloads/etolabo/kumofs/kumofs-0.4.13.tar.gz
 md5sum = 46148e9536222d0ad2ef36777c55714d
-patches = ${kumo-ipv6-multiip-patch-download:location}/${kumo-ipv6-multiip-patch-download:filename}
+pre-configure-hook = ${:_profile_base_location_}/kumo-hooks.py#958a595a02de75624728f8d65e39d800:pre_configure_hook
+patches =
+  ${:_profile_base_location_}/kumofs-0.4.13_ipv6support_multiiplistenfix.patch#53af9f1f1375940841c589a6cbe11425
+  ${:_profile_base_location_}/kumofs-0.4.13_fix_gcc-4.9_ftbfs.patch#c09e04c620ce11c3fdd4afc3459cd355
 patch-options = -p1
 configure-options =
   --enable-tcadb

component/kumo/kumofs-0.4.13_fix_gcc-4.9_ftbfs.patch

+--- kumofs-0.4.13/src/logic/gateway/mod_store.cc	2010-12-14 12:42:27.000000000 +0900
++++ kumofs-0.4.13/src/logic/gateway/mod_store.cc	2014-07-24 09:56:52.445251606 +0900
+@@ -262,19 +262,19 @@
+ #define GATEWAY_CATCH(NAME, response_type) \
+ catch (msgpack::type_error& e) { \
+ 	LOG_ERROR(#NAME " FAILED: type error"); \
+-	response_type res; \
+-	res.error = 1; \
+-	try { (*callback)(user, res, z); } catch (...) { } \
++	response_type r; \
++	r.error = 1; \
++	try { (*callback)(user, r, z); } catch (...) { } \
+ } catch (std::exception& e) { \
+ 	LOG_WARN(#NAME " FAILED: ",e.what()); \
+-	response_type res; \
+-	res.error = 1; \
+-	try { (*callback)(user, res, z); } catch (...) { } \
++	response_type r; \
++	r.error = 1; \
++	try { (*callback)(user, r, z); } catch (...) { } \
+ } catch (...) { \
+ 	LOG_WARN(#NAME " FAILED: unknown error"); \
+-	response_type res; \
+-	res.error = 1; \
+-	try { (*callback)(user, res, z); } catch (...) { } \
++	response_type r; \
++	r.error = 1; \
++	try { (*callback)(user, r, z); } catch (...) { } \
+ }
+ 
+ 

component/lcms/buildout.cfg

@@ -15,9 +15,6 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/project/lcms/lcms/2.6/lcms2-2.6.tar.gz
 md5sum = f4c08d38ceade4a664ebff7228910a33
-depends =
-  ${libpng:so_version}
-  ${libtiff:version}
 configure-options =
   --disable-static
 environment =

component/leptonica/buildout.cfg

@@ -13,9 +13,6 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://leptonica.googlecode.com/files/leptonica-1.68.tar.gz
 md5sum = 5cd7092f9ff2ca7e3f3e73bfcd556403
-depends =
-  ${libpng:so_version}
-  ${webp:so_version}
 configure-command =
   ./autogen.sh
   ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static

component/libatlas/add-rpath.patch

+--- ATLAS/CONFIG/src/config.c.orig	2014-07-10 18:22:02.000000000 +0200
++++ ATLAS/CONFIG/src/config.c	2014-08-22 13:28:04.990976246 +0200
+@@ -455,10 +455,10 @@
+ 
+    if (OSIsWin(OS))
+       OSextra = "-lgcc";
+-   i = strlen(path) + strlen(libnam) + strlen(OSextra) + 2 + 2 + 1 + 1 + 1;
++   i = strlen(path) * 2 + strlen(libnam) + strlen(OSextra) + 2 + 11 + 2 + 1 + 1 + 1 + 1;
+    sp = malloc(i*sizeof(char));
+    assert(sp);
+-   sprintf(sp, "-L%s -l%s %s", path, libnam, OSextra);
++   sprintf(sp, "-L%s -Wl,-rpath=%s -l%s %s", path, path, libnam, OSextra);
+    return(sp);
+ }
+ 

component/libatlas/buildout.cfg

+[buildout]
+parts =
+  libatlas
+
+[lapack-download]
+recipe = hexagonit.recipe.download
+version = 3.5.0
+filename = lapack-${:version}.tgz
+url = http://www.netlib.org/lapack/${:filename}
+md5sum = b1d3e3e425b2e44a06760ff173104bdf
+download-only = true
+mode = 0644
+
+[libatlas]
+recipe = slapos.recipe.cmmi
+version = 3.10.2
+url = http://downloads.sourceforge.net/project/math-atlas/Stable/${:version}/atlas${:version}.tar.bz2
+md5sum = a4e21f343dec8f22e7415e339f09f6da
+# http://stackoverflow.com/questions/14592401/atlas-install-really-need-to-get-past-cpu-throttle-check
+# http://sourceforge.net/p/math-atlas/support-requests/886/
+patches =
+  ${:_profile_base_location_}/skip-throttle-check.patch#17c8471d67c99fac80ace05273ce0817
+  ${:_profile_base_location_}/add-rpath.patch#44672b68960a14b3fb4970cd1e76f8fe
+patch-options = -p1
+configure-command =
+  mkdir build
+  cd build
+  ../configure
+configure-options =
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --with-netlib-lapack-tarfile=${lapack-download:location}/${lapack-download:filename}
+  --shared
+  -b "$(uname -p | grep -q 64 && echo 64 || echo 32)"
+  -Fa alg '-fPIC'
+make-options =
+  -C build
+environment =
+  PATH=${gcc-fortran:location}/bin:%(PATH)s
+  LD_LIBRARY_PATH=${gcc-fortran:location}/lib:${gcc-fortran:location}/lib64

component/libatlas/skip-throttle-check.patch

+diff --git a/CONFIG/src/probe_arch.c b/CONFIG/src/probe_arch.c
+index 75edef9..f440bf6 100644
+--- a/CONFIG/src/probe_arch.c
++++ b/CONFIG/src/probe_arch.c
+@@ -238,8 +238,7 @@ int main(int nargs, char **args)
+       printf("CPU MHZ=%d\n",
+              ProbeOneInt(OS, asmd, targ, "-m", "CPU MHZ=", &sure));
+    if (flags & Pthrottle)
+-      printf("CPU THROTTLE=%d\n",
+-             ProbeOneInt(OS, asmd, targ, "-t", "CPU THROTTLE=", &sure));
++      printf("CPU THROTTLE=0\n");
+    if (flags & P64)
+    {
+       if (asmd == gas_x86_64)

component/libdmtx/buildout.cfg

@@ -23,9 +23,6 @@ configure-options =
 recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/libdmtx/dmtx-utils-0.7.4.tar.bz2
 md5sum = b132ab9fb1d289869469b8bb4959a08a
-depends =
-  ${libpng:so_version}
-  ${imagemagick:version}
 configure-options =
   --disable-static
 environment =

component/libpng/buildout.cfg

@@ -28,6 +28,5 @@ md5sum = 23fb6a0e9f4dbaab7b34b6fd317a4f2d
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.6.10.tar.xz
-md5sum = 5f414b20f683b1d96b163c89e3eff768
-so_version = 16
+url = http://download.sourceforge.net/libpng/libpng-1.6.12.tar.xz
+md5sum = ee752da8aa75076500e4cf31318e636e

component/libreoffice-bin/buildout.cfg

@@ -6,9 +6,6 @@ extends =
 parts =
   libreoffice-bin
 
-find-links =
-  http://www.nexedi.org/static/packages/source/
-
 [libreoffice-bin]
 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).

component/librsvg/buildout.cfg

@@ -25,8 +25,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.40/librsvg-2.40.2.tar.xz
 md5sum = acdecdb9f08f3bf662a68bf7dafb8b82
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${zlib:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig
 configure-options =
   --disable-static

component/libtasn1/buildout.cfg

@@ -4,8 +4,8 @@ parts =
 
 [libtasn1]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnu.org/gnu/libtasn1/libtasn1-3.6.tar.gz
-md5sum = 6ed38e161e11013054f2a2bb4c4da449
+url = ftp://ftp.gnu.org/gnu/libtasn1/libtasn1-4.0.tar.gz
+md5sum = d3d2d9bce3b6668b9827a9df52635be1
 configure-options =
   --disable-static
   --disable-gtk-doc-html

component/libtiff/CVE-2012-4564.patch

+Index: tiff-4.0.3/tools/ppm2tiff.c
+===================================================================
+--- tiff-4.0.3.orig/tools/ppm2tiff.c	2013-06-23 10:36:50.779629492 -0400
++++ tiff-4.0.3/tools/ppm2tiff.c	2013-06-23 10:36:50.775629494 -0400
+@@ -89,6 +89,7 @@
+ 	int c;
+ 	extern int optind;
+ 	extern char* optarg;
++	tmsize_t scanline_size;
+ 
+ 	if (argc < 2) {
+ 	    fprintf(stderr, "%s: Too few arguments\n", argv[0]);
+@@ -237,8 +238,16 @@
+ 	}
+ 	if (TIFFScanlineSize(out) > linebytes)
+ 		buf = (unsigned char *)_TIFFmalloc(linebytes);
+-	else
+-		buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out));
++	else {
++		scanline_size = TIFFScanlineSize(out);
++		if (scanline_size != 0)
++			buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out));
++		else {
++			fprintf(stderr, "%s: scanline size overflow\n",infile);
++			(void) TIFFClose(out);
++			exit(-2);
++			}
++		}
+ 	if (resolution > 0) {
+ 		TIFFSetField(out, TIFFTAG_XRESOLUTION, resolution);
+ 		TIFFSetField(out, TIFFTAG_YRESOLUTION, resolution);

component/libtiff/CVE-2013-1960.patch

+Index: tiff-4.0.3/tools/tiff2pdf.c
+===================================================================
+--- tiff-4.0.3.orig/tools/tiff2pdf.c	2013-06-23 10:36:50.979629486 -0400
++++ tiff-4.0.3/tools/tiff2pdf.c	2013-06-23 10:36:50.975629486 -0400
+@@ -3341,33 +3341,56 @@
+ 	uint32 height){
+ 
+ 	tsize_t i=0;
+-	uint16 ri =0;
+-	uint16 v_samp=1;
+-	uint16 h_samp=1;
+-	int j=0;
+-	
+-	i++;
+-	
+-	while(i<(*striplength)){
++
++	while (i < *striplength) {
++		tsize_t datalen;
++		uint16 ri;
++		uint16 v_samp;
++		uint16 h_samp;
++		int j;
++		int ncomp;
++
++		/* marker header: one or more FFs */
++		if (strip[i] != 0xff)
++			return(0);
++		i++;
++		while (i < *striplength && strip[i] == 0xff)
++			i++;
++		if (i >= *striplength)
++			return(0);
++		/* SOI is the only pre-SOS marker without a length word */
++		if (strip[i] == 0xd8)
++			datalen = 0;
++		else {
++			if ((*striplength - i) <= 2)
++				return(0);
++			datalen = (strip[i+1] << 8) | strip[i+2];
++			if (datalen < 2 || datalen >= (*striplength - i))
++				return(0);
++		}
+ 		switch( strip[i] ){
+-			case 0xd8:
+-				/* SOI - start of image */
++			case 0xd8:	/* SOI - start of image */
+ 				_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), 2);
+ 				*bufferoffset+=2;
+-				i+=2;
+ 				break;
+-			case 0xc0:
+-			case 0xc1:
+-			case 0xc3:
+-			case 0xc9:
+-			case 0xca:
++			case 0xc0:	/* SOF0 */
++			case 0xc1:	/* SOF1 */
++			case 0xc3:	/* SOF3 */
++			case 0xc9:	/* SOF9 */
++			case 0xca:	/* SOF10 */
+ 				if(no==0){
+-					_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2);
+-					for(j=0;j<buffer[*bufferoffset+9];j++){
+-						if( (buffer[*bufferoffset+11+(2*j)]>>4) > h_samp) 
+-							h_samp = (buffer[*bufferoffset+11+(2*j)]>>4);
+-						if( (buffer[*bufferoffset+11+(2*j)] & 0x0f) > v_samp) 
+-							v_samp = (buffer[*bufferoffset+11+(2*j)] & 0x0f);
++					_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2);
++					ncomp = buffer[*bufferoffset+9];
++					if (ncomp < 1 || ncomp > 4)
++						return(0);
++					v_samp=1;
++					h_samp=1;
++					for(j=0;j<ncomp;j++){
++						uint16 samp = buffer[*bufferoffset+11+(3*j)];
++						if( (samp>>4) > h_samp) 
++							h_samp = (samp>>4);
++						if( (samp & 0x0f) > v_samp) 
++							v_samp = (samp & 0x0f);
+ 					}
+ 					v_samp*=8;
+ 					h_samp*=8;
+@@ -3381,45 +3404,43 @@
+                                           (unsigned char) ((height>>8) & 0xff);
+ 					buffer[*bufferoffset+6]=
+                                             (unsigned char) (height & 0xff);
+-					*bufferoffset+=strip[i+2]+2;
+-					i+=strip[i+2]+2;
+-
++					*bufferoffset+=datalen+2;
++					/* insert a DRI marker */
+ 					buffer[(*bufferoffset)++]=0xff;
+ 					buffer[(*bufferoffset)++]=0xdd;
+ 					buffer[(*bufferoffset)++]=0x00;
+ 					buffer[(*bufferoffset)++]=0x04;
+ 					buffer[(*bufferoffset)++]=(ri >> 8) & 0xff;
+ 					buffer[(*bufferoffset)++]= ri & 0xff;
+-				} else {
+-					i+=strip[i+2]+2;
+ 				}
+ 				break;
+-			case 0xc4:
+-			case 0xdb:
+-				_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2);
+-				*bufferoffset+=strip[i+2]+2;
+-				i+=strip[i+2]+2;
++			case 0xc4: /* DHT */
++			case 0xdb: /* DQT */
++				_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2);
++				*bufferoffset+=datalen+2;
+ 				break;
+-			case 0xda:
++			case 0xda: /* SOS */
+ 				if(no==0){
+-					_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2);
+-					*bufferoffset+=strip[i+2]+2;
+-					i+=strip[i+2]+2;
++					_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2);
++					*bufferoffset+=datalen+2;
+ 				} else {
+ 					buffer[(*bufferoffset)++]=0xff;
+ 					buffer[(*bufferoffset)++]=
+                                             (unsigned char)(0xd0 | ((no-1)%8));
+-					i+=strip[i+2]+2;
+ 				}
+-				_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), (*striplength)-i-1);
+-				*bufferoffset+=(*striplength)-i-1;
++				i += datalen + 1;
++				/* copy remainder of strip */
++				_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i]), *striplength - i);
++				*bufferoffset+= *striplength - i;
+ 				return(1);
+ 			default:
+-				i+=strip[i+2]+2;
++				/* ignore any other marker */
++				break;
+ 		}
++		i += datalen + 1;
+ 	}
+-	
+ 
++	/* failed to find SOS marker */
+ 	return(0);
+ }
+ #endif

component/libtiff/CVE-2013-4231.patch

+Description: Buffer overflow in gif2tiff
+Bug: http://bugzilla.maptools.org/show_bug.cgi?id=2450
+Bug-Debian: http://bugs.debian.org/719303
+
+Index: tiff-4.0.3/tools/gif2tiff.c
+===================================================================
+--- tiff-4.0.3.orig/tools/gif2tiff.c	2013-08-22 11:46:11.960846910 -0400
++++ tiff-4.0.3/tools/gif2tiff.c	2013-08-22 11:46:11.956846910 -0400
+@@ -333,6 +333,8 @@
+     int status = 1;
+ 
+     datasize = getc(infile);
++    if (datasize > 12)
++	return 0;
+     clear = 1 << datasize;
+     eoi = clear + 1;
+     avail = clear + 2;

component/libtiff/CVE-2013-4232.patch

+Description: use after free in tiff2pdf
+Bug: http://bugzilla.maptools.org/show_bug.cgi?id=2449
+Bug-Debian: http://bugs.debian.org/719303
+
+Index: tiff-4.0.3/tools/tiff2pdf.c
+===================================================================
+--- tiff-4.0.3.orig/tools/tiff2pdf.c	2013-08-22 11:46:37.292847242 -0400
++++ tiff-4.0.3/tools/tiff2pdf.c	2013-08-22 11:46:37.292847242 -0400
+@@ -2461,7 +2461,8 @@
+ 					(unsigned long) t2p->tiff_datasize, 
+ 					TIFFFileName(input));
+ 				t2p->t2p_error = T2P_ERR_ERROR;
+-			  _TIFFfree(buffer);
++				_TIFFfree(buffer);
++				return(0);
+ 			} else {
+ 				buffer=samplebuffer;
+ 				t2p->tiff_datasize *= t2p->tiff_samplesperpixel;

component/libtiff/CVE-2013-4244.patch

+Description: OOB write in gif2tiff
+Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=996468
+
+Index: tiff-4.0.3/tools/gif2tiff.c
+===================================================================
+--- tiff-4.0.3.orig/tools/gif2tiff.c	2013-08-24 11:17:13.546447901 -0400
++++ tiff-4.0.3/tools/gif2tiff.c	2013-08-24 11:17:13.546447901 -0400
+@@ -400,6 +400,10 @@
+     }
+ 
+     if (oldcode == -1) {
++        if (code >= clear) {
++            fprintf(stderr, "bad input: code=%d is larger than clear=%d\n",code, clear);
++            return 0;
++        }
+ 	*(*fill)++ = suffix[code];
+ 	firstchar = oldcode = code;
+ 	return 1;

component/libtiff/buildout.cfg

@@ -12,6 +12,14 @@ recipe = slapos.recipe.cmmi
 version = 4.0.3
 url = http://www.imagemagick.org/download/delegates/tiff-${:version}.tar.gz
 md5sum = 051c1068e6a0627f461948c365290410
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/CVE-2012-4564.patch#45667ee618dbe78acce1129706556124
+  ${:_profile_base_location_}/CVE-2013-1960.patch#21a3d119cd3eeadd35ccc355fbd748cf
+  ${:_profile_base_location_}/CVE-2013-1961.patch#bb219740a815b9b47698b83d0ae9f82a
+  ${:_profile_base_location_}/CVE-2013-4231.patch#f6ff024c8df861a6dbb5a0ecd8a0f853
+  ${:_profile_base_location_}/CVE-2013-4232.patch#b439184b3a5f434a3e3235f611b54a89
+  ${:_profile_base_location_}/CVE-2013-4244.patch#2acff059c6156953aadb436b475e5acb
 configure-options =
   --disable-static
   --without-x

component/make/buildout.cfg

@@ -10,18 +10,10 @@ extends =
 # Moreover, vanilla 3.81 does some seg faults, so use Debian patched version.
 <= make3.81-debian
 
-[make-dfsg_3.81-8.2.diff]
-# Debian patch coming from:
-# http://ftp.de.debian.org/debian/pool/main/m/make-dfsg/make-dfsg_3.81-8.2.diff.gz
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:_buildout_section_name_}
-md5sum = fa77bb989a096fafbe7c78582e9415e3
-download-only = true
-
 [make3.81-debian]
 recipe = slapos.recipe.cmmi
 url = http://ftp.de.debian.org/debian/pool/main/m/make-dfsg/make-dfsg_3.81.orig.tar.gz
 md5sum = 7c93b1ab4680eb21c2c13f4f47741e2d
 patches =
-  ${make-dfsg_3.81-8.2.diff:location}/make-dfsg_3.81-8.2.diff
+  ${:_profile_base_location_}/make-dfsg_3.81-8.2.diff#fa77bb989a096fafbe7c78582e9415e3
 patch-options = -p1

component/mariadb/buildout.cfg

@@ -19,10 +19,9 @@ parts =
 
 [mariadb]
 recipe = slapos.recipe.cmmi
-version = 10.0.12
-revision = 1
+version = 10.0.13
 url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
-md5sum = 6e9a7c075526f8f2f83ad8e0933bab2f
+md5sum = 7b2e88864b51d7d0607dc37abb8a0adb
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0
@@ -46,6 +45,7 @@ configure-options =
   -DCMAKE_C_FLAGS="-I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
   -DCMAKE_CXX_FLAGS="-I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
   -DCMAKE_INSTALL_RPATH=${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
+  -DWITHOUT_TOKUDB=true
 environment =
   CMAKE_PROGRAM_PATH=${cmake:location}/bin
   CMAKE_INCLUDE_PATH=${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${readline5:location}/include:${zlib:location}/include
@@ -56,17 +56,13 @@ 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.03.tar.gz
-md5sum = 19ab2721d2d41c234e018a879f392990
+url = http://packages.groonga.org/source/mroonga/mroonga-4.04.tar.gz
+md5sum = a89987dad7b3e1d99014492e6135eec6
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config
   --disable-static
   --disable-document
-depends =
-  ${mariadb:version}
-  ${mariadb:revision}
-  ${groonga-normalizer-mysql:version}
 environment =
   PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${groonga:location}/include/groonga

component/messagepack/buildout.cfg

 [buildout]
 parts = messagepack
-find-links = http://www.nexedi.org/static/packages/source/
 
 [messagepack]
-recipe = erp5.recipe.cmmiforcei686
+recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/project/msgpack/msgpack/cpp/msgpack-0.5.4.tar.gz
 md5sum = 18d96a3178f7cad73c0ca44f6284ae7d
 configure-options =

component/mydumper/buildout.cfg

@@ -15,8 +15,6 @@ parts = mydumper
 # mydumper that works
 [mydumper]
 recipe = slapos.recipe.build
-depends =
-  ${mariadb:version}
 url = https://launchpad.net/mydumper/0.5/0.5.1/+download/mydumper-0.5.1.tar.gz
 md5sum = b4df42dfe23f308ab13eb6ecb73a0d21
 buildout-bin-dir = ${buildout:bin-directory}

component/mysql-python/buildout.cfg

@@ -13,8 +13,6 @@ PATH =${mariadb:location}/bin:%(PATH)s
 [mysql-python]
 recipe = zc.recipe.egg:custom
 egg = MySQL-python
-depends =
-  ${mariadb:version}
 environment = mysql-python-env
 library-dirs =
   ${zlib:location}/lib/

component/nettle/buildout.cfg

@@ -3,24 +3,18 @@ extends =
   ../gmp/buildout.cfg
   ../m4/buildout.cfg
 
-[nettle-lib-location.patch]
-recipe = hexagonit.recipe.download
-download-only = true
-filename = ${:_buildout_section_name_}
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 41dd0ce2a73487929bdc637b75dd62c9
-
 [nettle]
 recipe = slapos.recipe.cmmi
 url = http://www.lysator.liu.se/~nisse/archive/nettle-2.7.1.tar.gz
 md5sum = 003d5147911317931dd453520eb234a5
 patches =
-  ${nettle-lib-location.patch:location}/${nettle-lib-location.patch:filename}
+  ${:_profile_base_location_}/nettle-lib-location.patch#41dd0ce2a73487929bdc637b75dd62c9
 configure-option =
   --disable-static
   --disable-assembler
   --disable-openssl
+  --disable-documentation
 environment =
   PATH=${m4:location}/bin:%(PATH)s
   CPPFLAGS=-I${gmp:location}/include
-  LDFLAGS=-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib
+  LDFLAGS=-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib

component/numpy/buildout.cfg

+[buildout]
+
+extends =
+  ../gcc/buildout.cfg
+  ../libatlas/buildout.cfg
+
+version = versions
+
+[numpy-env]
+PATH = ${gcc-fortran:location}/bin:%(PATH)s
+BLAS = ${libatlas:location}/lib/libcblas.a
+LAPACK = ${libatlas:location}/lib/liblapack.a
+ATLAS = ${libatlas:location}/lib/libatlas.a
+
+[numpy]
+recipe = zc.recipe.egg:custom
+egg = numpy
+# patched version that supports rpath parameter in zc.recipe.egg:custom.
+find-links = http://www.nexedi.org/static/packages/source/numpy-1.8.2nxd001.tar.gz
+environment = numpy-env
+# no need to add libatlas location because they are statically linked.
+rpath =
+  ${gcc-fortran:location}/lib
+  ${gcc-fortran:location}/lib64
+
+[versions]
+# patched version that supports rpath parameter in zc.recipe.egg:custom.
+numpy = 1.8.2nxd001

component/openoffice-bin/buildout.cfg

 [buildout]
 parts =
   openoffice-bin
-find-links =
-  http://www.nexedi.org/static/packages/source/
 
 [openoffice-bin]
 # XXX: This section and recipe have to be reviewed against using

component/openssl/buildout.cfg

@@ -16,10 +16,8 @@ parts =
 
 [openssl]
 recipe = slapos.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.1h.tar.gz
-md5sum = 8d6d684a9430d5cc98a62a5d8fbda8cf
-depends =
-  ${ca-certificates:version}
+url = https://www.openssl.org/source/openssl-1.0.1i.tar.gz
+md5sum = c8dc151a671b9b92ff3e4c118b174972
 patch-binary = ${patch:location}/bin/patch
 patches =
   ${:_profile_base_location_}/openssl-nodoc.patch#b4887a7b4e18402447bc6227d2493b92

component/percona-toolkit/buildout.cfg

@@ -8,10 +8,8 @@ parts =
 
 [percona-toolkit]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
-version = 2.2.8
+version = 2.2.10
 url = http://www.percona.com/redir/downloads/percona-toolkit/${:version}/percona-toolkit-${:version}.tar.gz
-md5sum = c7fe343308898ad7f0c456c8394f2cbf
+md5sum = 9a5f464942c1aafe89a982c031e5e9fa
 configure-command =
   ${perl:location}/bin/perl Makefile.PL

component/perl-Class-Accessor/buildout.cfg

@@ -6,8 +6,6 @@ parts =
 
 [perl-Class-Accessor]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/Class/Class-Accessor-0.34.tar.gz
 md5sum = 0d9640d237a13276145f7e44b4855b89
 configure-command =

component/perl-Config-General/buildout.cfg

@@ -6,8 +6,6 @@ parts =
 
 [perl-Config-General]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/Config/Config-General-2.56.tar.gz
 md5sum = 8cf9dd044d016f27b4dc26077606736d
 configure-command =

component/perl-DBD-MySQL/buildout.cfg

@@ -9,8 +9,7 @@ parts =
 [perl-DBD-MySQL-common]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
-  ${perl-DBI:version}
+  ${perl-DBI:location}
 url = http://www.cpan.org/modules/by-module/DBD/DBD-mysql-4.027.tar.gz
 md5sum = 11fa6449715ba9d3fa5f4ee5ae688d6f
 patches =

component/perl-DBI/buildout.cfg

@@ -6,11 +6,6 @@ parts =
 
 [perl-DBI]
 recipe = slapos.recipe.cmmi
-version = 1.616
-# binary library should be rebuilt when perl is updated.
-depends =
-  ${perl:version}
-  ${perl:revision}
 url = http://www.cpan.org/modules/by-module/DBI/DBI-1.631.tar.gz
 md5sum = 444d3c305e86597e11092b517794a840
 configure-command =

component/perl-Data-Dump/buildout.cfg

@@ -6,8 +6,6 @@ parts =
 
 [perl-Data-Dump]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/Data/Data-Dump-1.22.tar.gz
 md5sum = db211fe64a5cab15b1e86e5b0dc379a4
 configure-command =