Merge branch 'master' into 1.0

component/bazel/bazel-0.4.3.patch

+diff -N -u -r bazel.orig/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleImplementationFunctions.java bazel/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleImplementationFunctions.java
+--- bazel.orig/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleImplementationFunctions.java	1980-01-01 00:00:00.000000000 +0900
++++ bazel/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleImplementationFunctions.java	2017-01-02 22:19:09.326924214 +0900
+@@ -172,7 +172,7 @@
+       @Param(
+         name = "use_default_shell_env",
+         type = Boolean.class,
+-        defaultValue = "False",
++        defaultValue = "True",
+         named = true,
+         positional = false,
+         doc = "whether the action should use the built in shell environment or not"

component/bazel/buildout.cfg

+[buildout]
+extends =
+  ../gcc/buildout.cfg
+  ../unzip/buildout.cfg
+parts =
+  bazel
+# The bazel binary contains a zip file. It must not be stripped.
+do-not-strip-path = ${buildout:parts-directory}/bazel/bin/bazel
+
+# [jdk]
+# recipe = slapos.recipe.build
+# url = http://download.oracle.com/otn-pub/java/jdk/8u112-b15/jdk-8u112-linux-x64.tar.gz
+# md5sum = de9b7a90f0f5a13cfcaa3b01451d0337
+# location = ${buildout:parts-directory}/${:_buildout_section_name_}
+# java_home = ${:location}/java_home
+# script =
+#   from zc.buildout.download import check_md5sum, ChecksumError
+#   download_dir = tempfile.mkdtemp()
+#   download_path = os.path.join(download_dir, 'jdk.tar.gz')
+#   self.cleanup_list.append(download_dir)
+#   call(['wget', '-q', '-O', download_path, '--header', 'Cookie: oraclelicense=accept-securebackup-cookie', self.options['url']])
+#   if not check_md5sum(download_path, self.options['md5sum']):raise ChecksumError()
+#   extract_dir = self.extract(download_path)
+#   java_home = '%(location)s/java_home'
+#   self.copyTree(os.path.join(extract_dir, 'jdk1.8.0_112'), java_home)
+
+[template-bazel-crosstool]
+recipe = slapos.recipe.template:jinja2
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+mode = 640
+filename = bazel_tools_cpp_CROSSTOOL
+template = ${:_profile_base_location_}/${:filename}.in
+rendered = ${:location}/${:filename}
+cpp_path = ${gcc:location}/bin/cpp
+gcc_path = ${gcc:location}/bin/gcc
+gconv_path = ${gcc:location}/bin/gconv
+include_path = ${gcc:location}/include
+gcc_lib64_path = ${gcc:location}/lib64
+context =
+    key cpp_path template-bazel-crosstool:cpp_path
+    key gcc_path template-bazel-crosstool:gcc_path
+    key gconv_path template-bazel-crosstool:gconv_path
+    key include_path template-bazel-crosstool:include_path
+    key gcc_lib64_path template-bazel-crosstool:gcc_lib64_path
+
+[python2.7]
+# link to gcc libraries to solve GLIBXXX undefined reference error.
+environment =
+  PATH=${patch:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib -Wl,-rpath=${gcc:location}/lib64
+
+
+[bazel]
+recipe = slapos.recipe.build
+url = https://github.com/bazelbuild/bazel/releases/download/0.4.3/bazel-0.4.3-dist.zip
+md5sum = cbd53f6f59915506da8998dab2098921
+patch-binary = ${patch:location}/bin/patch
+patch-file-path = ${:_profile_base_location_}/bazel-0.4.3.patch
+bazel-crosstool-modified-file-path = ${template-bazel-crosstool:rendered}
+unzip-bin = ${unzip:location}/bin
+zip-bin = ${zip:location}/bin
+gcc-bin = ${gcc:location}/bin
+gcc-lib = ${gcc:location}/lib
+gcc-lib64 = ${gcc:location}/lib64
+java_home = PLEASE_INSTALL_JDK8_BY_YOURSELF_AND_SET_THE_PATH
+script =
+  extract_dir = self.extract(self.download(self.options['url'], self.options['md5sum']))
+  crosstool_path = os.path.join(extract_dir, 'tools', 'cpp', 'CROSSTOOL')
+  os.chmod(crosstool_path, 0644)
+  shutil.copy(self.options['bazel-crosstool-modified-file-path'],
+              crosstool_path)
+  target_path = extract_dir+'/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleImplementationFunctions.java'
+  os.chmod(target_path, 0644)
+  call([self.buildout['bazel']['patch-binary'], '-p1', '-d', extract_dir, '-i', self.buildout['bazel']['patch-file-path']])
+  path = ':'.join((
+    self.options['unzip-bin'],
+    self.options['zip-bin'],
+    self.options['gcc-bin'],
+    os.environ['PATH']
+    ))
+  env = {'JAVA_HOME':self.options['java_home'],
+         'PATH':path,
+         'LD_LIBRARY_PATH':':'.join((
+	   self.options['gcc-lib'],
+	   self.options['gcc-lib64'],
+           os.environ.get('LD_LIBRARY_PATH', '')
+           )),
+         'LDFLAGS':'-Wl,-rpath='+self.options['gcc-lib64'],
+         'CC':self.options['gcc-bin']+'/gcc',
+         'CXX':self.options['gcc-bin']+'/g++',
+        }
+  bin_dir = os.path.join(self.options['location'], 'bin')
+  os.makedirs(bin_dir)
+  call(['bash', 'compile.sh', 'compile'], cwd=extract_dir, env=env)
+  shutil.copy(os.path.join(extract_dir, 'output', 'bazel'),
+              os.path.join(bin_dir, 'bazel'))

component/binutils/buildout.cfg

+[buildout]
+parts = binutils
+
+[binutils]
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnu.org/gnu/binutils/binutils-2.27.tar.gz
+md5sum = 41b053ed4fb2c6a8173ef421460fbb28
\ No newline at end of file

component/chromium/buildout.cfg

 [buildout]
+# chromium binary is linking to libudev, that can be provided by
+# component/systemd.  but current component/systemd can be built only
+# with Linux kernel >= 3.7. so libudev is not included in
+# LD_LIBRARY_PATH below intentionally and libudev should be installed
+# in the system.
+
 extends =
+  ../coreutils/buildout.cfg
+  ../cups/buildout.cfg
   ../dbus/buildout.cfg
+  ../findutils/buildout.cfg
   ../fontconfig/buildout.cfg
+  ../gettext/buildout.cfg
   ../glib/buildout.cfg
   ../gtk-2/buildout.cfg
+  ../libexpat/buildout.cfg
+  ../libffi/buildout.cfg
   ../libpng/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../mesa/buildout.cfg
+  ../nspr/buildout.cfg
+  ../nss/buildout.cfg
+  ../pcre/buildout.cfg
+  ../sqlite3/buildout.cfg
   ../xorg/buildout.cfg
+  ../zlib/buildout.cfg
 
-parts = 
+parts =
   chromium
-  
+
 [chromium]
 recipe = slapos.recipe.build
 slapos_promise =
@@ -17,17 +36,20 @@ slapos_promise =
   file:chrome-wrapper
   file:chrome-slapos
 
-#chromium zip files for linux seem to be corrupted : rights are not correctly
-#set (+x) when unzipping using python, but it works when doing "unzip chromium.zip"
-#AND it works when unzipping any other archive with python.
-#Conclusion : Google, please, learn how to make zip files.
-linux_x86 = http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/109696/chrome-linux.zip 8ba6c022849b2a882b6e65163c147eb9
-linux_x86-64 = http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/109696/chrome-linux.zip a3ed3feb285ecfe7c722576db80d5099
-mac_x86-64 = http://commondatastorage.googleapis.com/chromium-browser-continuous/Mac/100142/chrome-mac.zip cb3a76b8a1a93be94df2f500fb621131
+# How to get the revision :
+# stable : https://www.googleapis.com/download/storage/v1/b/chromium-browser-continuous/o/Linux_x64%2FLAST_CHANGE?alt=media
+# snapshot : https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2FLAST_CHANGE?alt=media
+revision_x86 = 382014
+revision_x86-64 = 382014
+revision_mac = 381909
+
+linux_x86 = https://www.googleapis.com/download/storage/v1/b/chromium-browser-continuous/o/Linux%2F${:revision_x86}%2Fchrome-linux.zip?alt=media
+linux_x86-64 = https://www.googleapis.com/download/storage/v1/b/chromium-browser-continuous/o/Linux_x64%2F${:revision_x86-64}%2Fchrome-linux.zip?alt=media ef2c476b1f059e9aa026bbac1872368d
+mac_x86-64 = https://www.googleapis.com/download/storage/v1/b/chromium-browser-continuous/o/Mac%2F${:revision_mac}%2Fchrome-linux.zip?alt=media
 
 script =
   #If part directory already exist, will just throw an error.
-  import sys
+  import os
   platform = '%%s_%%s' %% (guessOperatingSystem(), guessPlatform())
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[platform].split(' ')
   extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
@@ -36,12 +58,46 @@ script =
   wrapper_location = os.path.join("%(location)s", "chrome-slapos")
   wrapper = open(wrapper_location, 'w')
   wrapper.write("""#!/bin/sh
-  export LD_LIBRARY_PATH=${libXrender:location}/lib/:${fontconfig:location}/lib/:${dbus:location}/lib/:${dbus-glib:location}/lib/:${pango:location}/lib:${cairo:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${libXt:location}/lib:${gtk-2:location}/lib:${libpng15:location}/lib:%(location)s
-  %(location)s/chrome""")
+  export LD_LIBRARY_PATH="%(location)s"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${atk:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${cairo:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${cups:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${dbus:location}/lib/"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${dbus-glib:location}/lib/"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${fontconfig:location}/lib/"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${gdk-pixbuf:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${gettext:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${glib:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${gtk-2:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${harfbuzz:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libX11:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXau:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXcomposite:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXcursor:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXext:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXi:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXrender:location}/lib/"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXtst:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libexpat:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libffi:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libpng:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libpng12:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libxcb:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libxml2:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${mesa:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${nspr:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${nss:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pango:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pcre:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pixman:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${sqlite3:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${xdamage:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${xfixes:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${zlib:location}/lib"
+  exec %(location)s/chrome --disable-setuid-sandbox --disable-gpu $*""")
   wrapper.flush()
   wrapper.close()
-  os.chmod(wrapper_location, 0766)
-  os.chmod(os.path.join("%(location)s", 'chrome'), 0766)
-  os.chmod(os.path.join("%(location)s", 'chrome-wrapper'), 0766)
-
-# requirements : libXrender1 libxss1 x11-common
\ No newline at end of file
+  os.system('"${findutils:location}/bin/find" "%(location)s" -type d -exec "${coreutils:location}/bin/chmod" a+rx {} \;')
+  os.system('"${findutils:location}/bin/find" "%(location)s" -type f -executable -exec "${coreutils:location}/bin/chmod" a+rx {} \;')
+  os.system('"${findutils:location}/bin/find" "%(location)s" -type f -exec "${coreutils:location}/bin/chmod" a+r {} \;')
+  os.chmod(wrapper_location, 0755)

component/egg-patch/ZODB4-pr136.patch

-From 6e2dd54b4988a40766db557906b1d544916a6859 Mon Sep 17 00:00:00 2001
-From: Julien Muchembled <jm@nexedi.com>
-Date: Fri, 13 Jan 2017 23:45:54 +0100
-Subject: [PATCH] Fix deadlock with storages that "sync" on a new transaction
-
-This backports a change from commit 227953b977a9e195c4ce9bbb9acd9c5ee60c333a.
-
-NEO, as well as ZEO+server_sync (ERP5 backports this feature with a
-monkey-patch), pings the server (primary master node in the case of NEO) on
-new transactions. However, this round-trip is actually performed by the thread
-that also does tasks requiring to lock the DB, like processing of invalidations.
-
-Since transaction 1.6.1 (more precisely commit e581a120a6), IStorage.sync()
-is called indirectly by DB.open() when a transaction has already begun,
-and the DB must not be locked when this happens.
----
- src/ZODB/DB.py           | 9 +++------
- src/ZODB/tests/testDB.py | 2 +-
- 2 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/src/ZODB/DB.py b/src/ZODB/DB.py
-index 95f1ab4..ffd10e9 100644
---- a/src/ZODB/DB.py
-+++ b/src/ZODB/DB.py
-@@ -753,19 +753,16 @@ def open(self, transaction_manager=None, at=None, before=None):
-                     result = self.pool.pop()
-             assert result is not None
- 
--            # open the connection.
--            result.open(transaction_manager)
--
-             # A good time to do some cache cleanup.
-             # (note we already have the lock)
-             self.pool.availableGC()
-             self.historical_pool.availableGC()
--
--            return result
--
-         finally:
-             self._r()
- 
-+        result.open(transaction_manager)
-+        return result
-+
-     def connectionDebugInfo(self):
-         result = []
-         t = time.time()
-diff --git a/src/ZODB/tests/testDB.py b/src/ZODB/tests/testDB.py
-index 59b6ccf..e6286a4 100644
---- a/src/ZODB/tests/testDB.py
-+++ b/src/ZODB/tests/testDB.py
-@@ -151,7 +151,7 @@ def connectionDebugInfo():
-     >>> before
-     [None, '\x03zY\xd8\xc0m9\xdd', None]
-     >>> opened
--    ['2008-12-04T20:40:44Z (1.40s)', '2008-12-04T20:40:45Z (0.30s)', None]
-+    ['2008-12-04T20:40:44Z (1.30s)', '2008-12-04T20:40:46Z (0.10s)', None]
-     >>> infos
-     ['test info (2)', ' (0)', ' (0)']
- 
--- 
-2.10.2.2.g19ca937.dirty
-

component/firefox/buildout.cfg

@@ -5,10 +5,14 @@ extends =
   ../dbus/buildout.cfg
   ../fontconfig/buildout.cfg
   ../gtk-2/buildout.cfg
+  ../gtk-3/buildout.cfg
   ../libffi/buildout.cfg
   ../libpng/buildout.cfg
+  ../mesa/buildout.cfg
   ../p11-kit/buildout.cfg
+  ../pcre/buildout.cfg
   ../xorg/buildout.cfg
+  ../xz-utils/buildout.cfg
 
 parts =
   firefox
@@ -26,23 +30,66 @@ depends =
   ${liberation-fonts:location}
   ${ipaex-fonts:location}
 
-version = 45.0.1
+version = 51.0.1
 
-# 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 3756c8d06d6f915a3dff1dae643ee74b
-x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 0409177ef649ec90ffe7a421a19bc156
+x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 9a5b67e9d759a1e4df004294a24b2b43
+x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 bd93f2652d1d90d59ae462439a93c85f
+geckodriver_x86 = https://github.com/mozilla/geckodriver/releases/download/v0.14.0/geckodriver-v0.14.0-linux32.tar.gz b5836f5a944fe9f3ed1a67c7b342c6a7
+geckodriver_x86-64 = https://github.com/mozilla/geckodriver/releases/download/v0.14.0/geckodriver-v0.14.0-linux64.tar.gz 4a185d3179862a35104603b9274452e7
 
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
   extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
   workdir = guessworkdir(extract_dir)
   self.copyTree(workdir, "%(location)s")
+  geckodriver_url, geckodriver_md5sum = self.options['geckodriver_' + guessPlatform()].split(' ')
+  extract_dir = self.extract(self.download(geckodriver_url, geckodriver_md5sum))
+  shutil.copy(extract_dir + '/geckodriver', "%(location)s")
   wrapper_location = os.path.join("%(location)s", "firefox-slapos")
   wrapper = open(wrapper_location, 'w')
   wrapper.write("""#!${dash:location}/bin/dash
   cd %(location)s
-  export LD_LIBRARY_PATH=%(location)s:${alsa:location}/lib:${atk:location}/lib:${bzip2:location}/lib:${cairo:location}/lib:${dbus:location}/lib:${dbus-glib:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${gdk-pixbuf:location}/lib:${gettext:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${harfbuzz:location}/lib:${libICE:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXcomposite:location}/lib:${libXcursor:location}/lib:${libXext:location}/lib:${libXrender:location}/lib:${libXt:location}/lib:${libffi:location}/lib:${libpng:location}/lib:${libtool:location}/lib:${libuuid:location}/lib:${libxcb:location}/lib:${libxml2:location}/lib:${p11-kit:location}/lib:${pango:location}/lib:${pixman:location}/lib:${xdamage:location}/lib:${xfixes:location}/lib:${zlib:location}/lib
+  export LD_LIBRARY_PATH="%(location)s"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${alsa:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${atk:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${at-spi2-atk:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${at-spi2-core:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${bzip2:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${cairo:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${dbus:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${dbus-glib:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${fontconfig:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${freetype:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${gdk-pixbuf:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${gettext:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${glib:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${gtk-3:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${harfbuzz:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libepoxy:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libffi:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libICE:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libpng:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libSM:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libtool:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libuuid:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libX11:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXau:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libxcb:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXcomposite:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXcursor:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXext:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXi:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libxml2:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXrender:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXt:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${mesa:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pango:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pcre:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pixman:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${xdamage:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${xfixes:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${xz-utils:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${zlib:location}/lib"
   export PATH=${fontconfig:location}/bin:$PATH
   exec %(location)s/firefox $*""")
   wrapper.close()

component/gcc/buildout.cfg

@@ -6,6 +6,7 @@ extends =
   ../perl/buildout.cfg
   ../tar/buildout.cfg
   ../xz-utils/buildout.cfg
+  ../binutils/buildout.cfg
 
 parts =
   gcc
@@ -59,6 +60,9 @@ configure-options =
   --with-mpc=${mpc:location}
   --enable-languages="c,c++"
   --with-isl=${isl:location}
+  --with-ld=${binutils:location}/bin/ld
+  --with-nm=${binutils:location}/bin/nm
+  --with-as=${binutils:location}/bin/as
 environment =
   LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${isl:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${mpfr:location}/lib
   PATH=${perl:location}/bin:${tar:location}/bin:%(PATH)s

component/golang/buildout.cfg

@@ -3,7 +3,7 @@
 parts = golang
 
 [golang]
-<= golang16
+<= golang18
 
 
 [golang-common]
@@ -19,8 +19,8 @@ environment =
 
 [golang14]
 <= golang-common
-url = https://storage.googleapis.com/golang/go1.4.3.src.tar.gz
-md5sum = dfb604511115dd402a77a553a5923a04
+url = https://storage.googleapis.com/golang/go1.4-bootstrap-20161024.tar.gz
+md5sum = 76e42c8152e8560ded880a6d1d1f53cb
 environment-extra =
 
 
@@ -42,3 +42,12 @@ md5sum = bf3fce6ccaadd310159c9e874220e2a2
 # go1.6 needs go1.4 to bootstrap
 environment-extra =
   GOROOT_BOOTSTRAP=${golang14:location}
+
+[golang18]
+<= golang-common
+url = https://storage.googleapis.com/golang/go1.8.src.tar.gz
+md5sum = 7743960c968760437b6e39093cfe6f67
+
+# go1.8 needs go1.4 to bootstrap
+environment-extra =
+  GOROOT_BOOTSTRAP=${golang14:location}

component/gperf/buildout.cfg

+[buildout]
+
+[gperf]
+recipe = slapos.recipe.cmmi
+url = ftp://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.4.tar.gz
+md5sum = c1f1db32fb6598d6a93e6e88796a8632

component/gtk-3/buildout.cfg

+[buildout]
+extends =
+  ../dbus/buildout.cfg
+  ../gettext/buildout.cfg
+  ../glib/buildout.cfg
+  ../gtk-2/buildout.cfg
+  ../intltool/buildout.cfg
+  ../libepoxy/buildout.cfg
+  ../pcre/buildout.cfg
+  ../perl/buildout.cfg
+  ../perl-XML-Parser/buildout.cfg
+  ../xorg/buildout.cfg
+
+[at-spi2-core]
+recipe = slapos.recipe.cmmi
+url =http://ftp.gnome.org/pub/gnome/core/3.20/3.20.2/sources/at-spi2-core-2.20.1.tar.xz
+md5sum = cd11cba463e8f5e1f39ba69555a7382f
+depends =
+  ${perl-XML-Parser:location}
+configure-options =
+  --disable-gtk-doc-html
+environment =
+  PATH=${dbus:location}/bin:${gettext:location}/bin:${glib:location}/bin:${intltool:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${dbus:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
+  CPPFLAGS=-I${inputproto:location}/include -I${kbproto:location}/include -I${libX11:location}/include -I${libXi:location}/include -I${libXtst:location}/include -I${xextproto:location}/include -I${xproto:location}/include
+  LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXi:location}/lib -Wl,-rpath=${libXi:location}/lib -L${libXtst:location}/lib -Wl,-rpath=${libXtst:location}/lib
+
+[at-spi2-atk]
+recipe = slapos.recipe.cmmi
+url =http://ftp.gnome.org/pub/gnome/core/3.20/3.20.2/sources/at-spi2-atk-2.20.1.tar.xz
+md5sum = 23309b6f8e1623871ace6347fb734dce
+environment =
+  PATH=${intltool:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${atk:location}/lib/pkgconfig:${at-spi2-core:location}/lib/pkgconfig:${dbus:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
+
+[gtk-3]
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnome.org/pub/gnome/core/3.20/3.20.2/sources/gtk+-3.20.4.tar.xz
+md5sum = 0cceee599f2910c25bf4b9dde4ab2fb6
+pkg_config_depends = ${at-spi2-atk:location}/lib/pkgconfig:${at-spi2-core:location}/lib/pkgconfig:${dbus:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${libepoxy:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${libXi:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
+configure-options =
+  --disable-static
+  --disable-glibtest
+  --disable-cups
+  --disable-papi
+  --enable-explicit-deps
+  --disable-xinerama
+  --disable-gtk-doc-html
+  --disable-man
+environment =
+  PATH=${gdk-pixbuf:location}/bin:${gettext:location}/bin:${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+# not taken from pkg-config result...
+  CPPFLAGS=-I${cairo:location}/include -I${inputproto:location}/include -I${libX11:location}/include -I${libXi:location}/include -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${libXext:location}/include
+  LDFLAGS=-L${libX11:location}/lib -L${libXi:location}/lib -L${libXext:location}/lib -L${libXrender:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/h5py/buildout.cfg

+[buildout]
+extends =
+  ../hdf5/buildout.cfg
+  ../cython/buildout.cfg
+parts =
+  h5py
+
+[hdf5-env]
+LDFLAGS = -L${hdf5:location}/lib
+CPPFLAGS = -I${hdf5:location}/include
+
+[h5py]
+recipe = zc.recipe.egg:custom
+egg = h5py
+setup-eggs = ${cython:egg}
+include-dirs =
+  ${hdf5:location}/include
+library-dirs =
+  ${hdf5:location}/lib
+rpath =
+  ${hdf5:location}/lib
+environment = hdf5-env

component/hdf5/buildout.cfg

+[buildout]
+extends =
+  ../zlib/buildout.cfg
+parts =
+  hdf5
+
+[hdf5]
+recipe = slapos.recipe.cmmi
+url = https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.0-patch1/src/hdf5-1.10.0-patch1.tar.bz2
+md5sum = f6d980febe2c35c11670a9b34fa3b487
+configure-options =
+  --with-zlib=${zlib:location}
+environment =
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/helloweb/buildout.cfg

@@ -89,7 +89,7 @@ input   = inline:
 recipe  = slapos.recipe.cmmi
 path    = ${helloweb-repository:location}/go/
 
-go      = ${golang16:location}/bin/go
+go      = ${golang18:location}/bin/go
 configure-command = :
 make-binary =
 make-targets= cd ${:path} &&

component/keras/buildout.cfg

+[buildout]
+extends =
+  ../tensorflow/buildout.cfg
+  ../h5py/buildout.cfg
+  ../pillow/buildout.cfg
+parts =
+  keras-egg
+
+[keras-egg]
+recipe = zc.recipe.egg
+eggs = 
+  ${scipy:egg}
+  ${numpy:egg}
+  ${tensorflow-build-install-egg:egg}
+  ${protobuf-python:egg}
+  Keras
+  ${h5py:egg}
+  ${pillow-python:egg}
+interpreter = keras-python
+scripts = keras-python
+
+[versions]
+Keras = 1.2.1
+Theano = 0.8.2
+tensorflow = 0.12.0
+h5py = 2.7.0rc2
+Cython = 0.25.2

component/lcms/buildout.cfg

@@ -13,8 +13,8 @@ parts =
 
 [lcms2]
 recipe = slapos.recipe.cmmi
-url = http://downloads.sourceforge.net/project/lcms/lcms/2.6/lcms2-2.6.tar.gz
-md5sum = f4c08d38ceade4a664ebff7228910a33
+url = http://downloads.sourceforge.net/project/lcms/lcms/2.8/lcms2-2.8.tar.gz
+md5sum = 87a5913f1a52464190bb655ad230539c
 configure-options =
   --disable-static
 environment =

component/libcap/buildout.cfg

@@ -14,7 +14,7 @@ attr-include = ${attr:location}/include/
 attr-lib = ${attr:location}/lib/
 slapos_promise =
   directory:sbin
-  directory:usr/include
+  directory:include
   statlib:lib/libcap.a
   file:lib/libcap.so
   file:sbin/getcap
@@ -26,7 +26,7 @@ script =
   workdir = guessworkdir(extract_dir)
   cflags = '-I%(attr)s' % {'attr': self.options['attr-include']}
   ldflags = '-L%(attr)s -Wl,-rpath=%(attr)s' % {'attr': self.options['attr-lib']}
-  call(['make', 'CFLAGS=%s' % cflags, 'LDFLAGS=%s' % ldflags, 'DESTDIR=%s' % self.options['location'], 'RAISE_SETFCAP=no', 'install'],
+  call(['make', 'CFLAGS=%s' % cflags, 'LDFLAGS=%s' % ldflags, 'DESTDIR=%s' % self.options['location'], 'RAISE_SETFCAP=no', 'prefix=', 'install'],
        cwd=workdir, env=env)
   lib64 = os.path.join(self.options['location'], 'lib64')
   lib = os.path.join(self.options['location'], 'lib')

component/libepoxy/buildout.cfg

+[buildout]
+extends =
+  ../mesa/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../xorg/buildout.cfg
+  ../xz-utils/buildout.cfg
+
+[libepoxy]
+recipe = slapos.recipe.cmmi
+url = https://github.com/anholt/libepoxy/releases/download/v1.4/libepoxy-1.4.0.tar.xz
+md5sum = d8d8cbf2beb64975d424fcc5167a2a38
+environment =
+  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${mesa:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}:${libXext:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig

component/libpng/buildout.cfg

@@ -18,15 +18,15 @@ environment =
 
 [libpng12]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.2.56.tar.xz
-md5sum = 868562bd1c58b76ed8703f135a2e439a
+url = http://download.sourceforge.net/libpng/libpng-1.2.57.tar.xz
+md5sum = 307052e5e8af97b82b17b64fb1b3677a
 
 [libpng15]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.26.tar.xz
-md5sum = 3414d556788e14b4a154369e67eacaa3
+url = http://download.sourceforge.net/libpng/libpng-1.5.28.tar.xz
+md5sum = 847aa2a1b231c07466d7f4167537424a
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.6.21.tar.xz
-md5sum = 3bacb4728f6694a64ad9052769d6a4ce
+url = http://download.sourceforge.net/libpng/libpng-1.6.28.tar.xz
+md5sum = 425354f86c392318d31aedca71019372

component/librsync/buildout.cfg

 [buildout]
 extends =
   ../bzip2/buildout.cfg
+  ../cmake/buildout.cfg
+  ../patch/buildout.cfg
+  ../perl/buildout.cfg
   ../popt/buildout.cfg
   ../zlib/buildout.cfg
 parts =
@@ -8,11 +11,19 @@ parts =
 
 [librsync]
 recipe = slapos.recipe.cmmi
-url = http://downloads.sourceforge.net/sourceforge/librsync/librsync-0.9.7.tar.gz
-md5sum = 24cdb6b78f45e0e83766903fd4f6bc84
+url = https://github.com/librsync/librsync/archive/v2.0.0.tar.gz
+md5sum = cbda9c3eba21bcf2d56a4080ba7a5dc4
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/librsync-2.0.0-issue50.patch#5bac5363646a2c2ec6d2c4b26ca4cd7f
+configure-command = ${cmake:location}/bin/cmake
 configure-options =
-  --disable-static
-  --enable-shared
+  -DCMAKE_INSTALL_PREFIX=${:location}
+  -DCMAKE_INSTALL_RPATH=${:location}/lib:${bzip2:location}/lib:${popt:location}/lib:${zlib:location}/lib
+make-options =
+  VERBOSE=1
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${bzip2:location}/include -I${popt:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib
+  PATH=${perl:location}/bin:%(PATH)s
+  CMAKE_INCLUDE_PATH=${bzip2:location}/include:${popt:location}/include:${zlib:location}/include
+  CMAKE_LIBRARY_PATH=${bzip2:location}/lib:${popt:location}/lib:${zlib:location}/lib