Update Release Candidate

/reviewed-on nexedi/slapos!159

.gitignore

@@ -10,4 +10,7 @@ parts/
 slapos.cookbook.egg-info
 .*.swp
 *~
-\#*\#
+\#*\#
\ No newline at end of file
+.eggs/
+*.egg/
+TEST_KNOWN_HOSTS

component/apache/buildout.cfg

@@ -4,6 +4,7 @@ parts =
   apache-antiloris
 
 extends =
+  ../nghttp2/buildout.cfg
   ../gdbm/buildout.cfg
   ../libexpat/buildout.cfg
   ../libuuid/buildout.cfg
@@ -17,15 +18,15 @@ extends =
   ../zlib/buildout.cfg
 
 [apr]
-recipe = hexagonit.recipe.download
-ignore-existing = true
+recipe = slapos.recipe.build:download-unpacked
+strip-top-level-dir = false
 version = 1.5.2
 md5sum = 4e9769f3349fe11fc0a5e1b224c236aa
 url = https://archive.apache.org/dist/apr/apr-${:version}.tar.bz2
 
 [apr-util]
-recipe = hexagonit.recipe.download
-ignore-existing = true
+recipe = slapos.recipe.build:download-unpacked
+strip-top-level-dir = false
 version = 1.5.4
 url = https://archive.apache.org/dist/apr/apr-util-${:version}.tar.bz2
 md5sum = 2202b18f269ad606d70e1864857ed93c
@@ -50,6 +51,7 @@ configure-options = --disable-static
                     --enable-disk-cache
                     --enable-mem-cache
                     --enable-echo
+                    --enable-http2
                     --enable-exception-hook
                     --enable-mods-shared=all
                     --enable-optional-fn-export
@@ -76,6 +78,7 @@ configure-options = --disable-static
                     --with-pcre=${pcre:location}
                     --with-sqlite3=${sqlite3:location}
                     --with-gdbm=${gdbm:location}
+                    --with-nghttp2=${nghttp2:location}
                     --without-lber
                     --without-ldap
                     --without-ndbm

component/autoconf/autoconf-2.69-shebang_workaround.patch

+diff -ur autoconf-2.69/bin/Makefile.in autoconf-2.69/bin/Makefile.in
+--- autoconf-2.69/bin/Makefile.in	2012-04-25 04:40:26.000000000 +0200
++++ autoconf-2.69/bin/Makefile.in	2017-04-12 16:47:38.029273723 +0200
+@@ -214,7 +214,7 @@
+ # apply to us.
+ MY_AUTOM4TE = \
+ 	autom4te_perllibdir='$(top_srcdir)'/lib					\
+-	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_builddir)/bin/autom4te	\
++	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'    perl $(top_builddir)/bin/autom4te	\
+ 		-B '$(top_builddir)'/lib -B '$(top_srcdir)'/lib        # keep ` '
+ 
+ 
+diff -ur autoconf-2.69/lib/autoconf/Makefile.in autoconf-2.69/lib/autoconf/Makefile.in
+--- autoconf-2.69/lib/autoconf/Makefile.in	2012-04-25 04:40:26.000000000 +0200
++++ autoconf-2.69/lib/autoconf/Makefile.in	2017-04-12 16:47:38.033273747 +0200
+@@ -230,7 +230,7 @@
+ # apply to us.
+ MY_AUTOM4TE = \
+ 	autom4te_perllibdir='$(top_srcdir)'/lib					\
+-	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_builddir)/bin/autom4te	\
++	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'    perl $(top_builddir)/bin/autom4te	\
+ 		-B '$(top_builddir)'/lib -B '$(top_srcdir)'/lib        # keep ` '
+ 
+ 
+diff -ur autoconf-2.69/lib/autoscan/Makefile.in autoconf-2.69/lib/autoscan/Makefile.in
+--- autoconf-2.69/lib/autoscan/Makefile.in	2012-04-25 04:40:26.000000000 +0200
++++ autoconf-2.69/lib/autoscan/Makefile.in	2017-04-12 16:47:38.029273723 +0200
+@@ -216,7 +216,7 @@
+ # apply to us.
+ MY_AUTOM4TE = \
+ 	autom4te_perllibdir='$(top_srcdir)'/lib					\
+-	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_builddir)/bin/autom4te	\
++	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'    perl $(top_builddir)/bin/autom4te	\
+ 		-B '$(top_builddir)'/lib -B '$(top_srcdir)'/lib        # keep ` '
+ 
+ 
+diff -ur autoconf-2.69/lib/autotest/Makefile.in autoconf-2.69/lib/autotest/Makefile.in
+--- autoconf-2.69/lib/autotest/Makefile.in	2012-04-25 04:40:26.000000000 +0200
++++ autoconf-2.69/lib/autotest/Makefile.in	2017-04-12 16:47:38.029273723 +0200
+@@ -223,7 +223,7 @@
+ # apply to us.
+ MY_AUTOM4TE = \
+ 	autom4te_perllibdir='$(top_srcdir)'/lib					\
+-	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_builddir)/bin/autom4te	\
++	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'    perl $(top_builddir)/bin/autom4te	\
+ 		-B '$(top_builddir)'/lib -B '$(top_srcdir)'/lib        # keep ` '
+ 
+ 
+diff -ur autoconf-2.69/lib/m4sugar/Makefile.in autoconf-2.69/lib/m4sugar/Makefile.in
+--- autoconf-2.69/lib/m4sugar/Makefile.in	2012-04-25 04:40:26.000000000 +0200
++++ autoconf-2.69/lib/m4sugar/Makefile.in	2017-04-12 16:47:38.033273747 +0200
+@@ -228,7 +228,7 @@
+ # apply to us.
+ MY_AUTOM4TE = \
+ 	autom4te_perllibdir='$(top_srcdir)'/lib					\
+-	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_builddir)/bin/autom4te	\
++	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'    perl $(top_builddir)/bin/autom4te	\
+ 		-B '$(top_builddir)'/lib -B '$(top_srcdir)'/lib        # keep ` '
+ 
+ 
+diff -ur autoconf-2.69/tests/Makefile.in autoconf-2.69/tests/Makefile.in
+--- autoconf-2.69/tests/Makefile.in	2012-04-25 04:40:26.000000000 +0200
++++ autoconf-2.69/tests/Makefile.in	2017-04-12 16:47:38.025273698 +0200
+@@ -201,7 +201,7 @@
+ # apply to us.
+ MY_AUTOM4TE = \
+ 	autom4te_perllibdir='$(top_srcdir)'/lib					\
+-	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_builddir)/bin/autom4te	\
++	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'    perl $(top_builddir)/bin/autom4te	\
+ 		-B '$(top_builddir)'/lib -B '$(top_srcdir)'/lib        # keep ` '
+ 
+ 

component/autoconf/buildout.cfg

 [buildout]
 extends =
   ../m4/buildout.cfg
+  ../patch/buildout.cfg
   ../perl/buildout.cfg
 parts =
   autoconf
@@ -9,6 +10,9 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
 md5sum = 82d05e03b93e45f5a39b828dc9c6c29b
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/autoconf-2.69-shebang_workaround.patch#9d286e6f9c271dff361891e381be706d
 environment =
   M4=${m4:location}/bin/m4
-  PATH=${perl:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${perl:location}/bin:%(PATH)s

component/automake/automake-1.15-shebang_workaround.patch

+--- automake-1.15/doc/help2man	2014-12-30 14:49:41.000000000 +0100
++++ automake-1.15/doc/help2man	2017-04-12 10:40:16.965600755 +0200
+@@ -632,11 +632,13 @@
+ sub get_option_value
+ {
+     my ($prog, $opt) = @_;
++    $prog = `which $prog`;
++    chomp($prog);
+     my $stderr = $discard_stderr ? '/dev/null' : '&1';
+     my $value = join '',
+ 	map { s/ +$//; expand $_ }
+ 	map { dec $_ }
+-	`$prog $opt 2>$stderr`;
++	`perl $prog $opt 2>$stderr`;
+ 
+     unless ($value)
+     {

component/automake/buildout.cfg

 [buildout]
 extends =
   ../autoconf/buildout.cfg
+  ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../xz-utils/buildout.cfg
 parts =
@@ -10,5 +11,8 @@ parts =
 recipe = slapos.recipe.cmmi
 md5sum = 9a1ddb0e053474d9d1105cfe39b0c48d
 url = http://ftp.gnu.org/gnu/automake/automake-1.15.tar.xz
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/automake-1.15-shebang_workaround.patch#203f9199b0e629de3630b5959f8cf73e
 environment =
-  PATH =${autoconf:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${autoconf:location}/bin:${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s

component/bazel/buildout.cfg

@@ -2,27 +2,18 @@
 extends =
   ../gcc/buildout.cfg
   ../unzip/buildout.cfg
+  ../zip/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)
+[zulu]
+recipe = hexagonit.recipe.download
+ignore-existing = true
+url = http://cdn.azul.com/zulu/bin/zulu8.20.0.5-jdk8.0.121-linux_x64.tar.gz
+md5sum = e5f4b1d997e50ffe4998c68c8ec45403
+strip-top-level-dir = true
 
 [template-bazel-crosstool]
 recipe = slapos.recipe.template:jinja2
@@ -43,14 +34,6 @@ context =
     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
@@ -63,7 +46,7 @@ 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
+java_home = ${zulu:location}
 script =
   extract_dir = self.extract(self.download(self.options['url'], self.options['md5sum']))
   crosstool_path = os.path.join(extract_dir, 'tools', 'cpp', 'CROSSTOOL')

component/binutils/buildout.cfg

 [buildout]
+extends =
+  ../gmp/buildout.cfg
+
 parts = binutils
 
+[mpfr]
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnu.org/gnu/mpfr/mpfr-3.1.3.tar.xz
+md5sum = 6969398cd2fbc56a6af570b5273c56a9
+configure-options =
+  --with-gmp=${gmp:location}
+  --disable-static
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
+  LDFLAGS=-Wl,-rpath=${gmp:location}/lib
+
+[mpc]
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnu.org/gnu/mpc/mpc-1.0.3.tar.gz
+md5sum = d6a1d5f8ddea3abd2cc3e98f58352d26
+configure-options =
+  --with-gmp=${gmp:location}
+  --with-mpfr=${mpfr:location}
+  --disable-static
+environment =
+  LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpfr:location}/lib
+
+[isl]
+recipe = slapos.recipe.cmmi
+url = ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-0.16.1.tar.bz2
+md5sum = ac1f25a0677912952718a51f5bc20f32
+configure-options =
+  --with-gmp-prefix=${gmp:location}
+  --disable-static
+environment =
+  LDFLAGS=-Wl,-rpath=${gmp:location}/lib
+
 [binutils]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/binutils/binutils-2.27.tar.gz
-md5sum = 41b053ed4fb2c6a8173ef421460fbb28
+url = http://ftp.gnu.org/gnu/binutils/binutils-2.27.tar.bz2
+md5sum = 2869c9bf3e60ee97c74ac2a6bf4e9d68
\ No newline at end of file
+configure-options =
+  --disable-bootstrap
+  --with-mpc=${mpc:location}
+  --with-mpfr=${mpfr:location}
+  --with-gmp=${gmp:location}
+  --with-isl=${isl:location}

component/chainer/buildout.cfg

+[buildout]
+extends =
+  ../scipy/buildout.cfg
+  ../protobuf-python/buildout.cfg
+  ../h5py/buildout.cfg
+  ../pillow/buildout.cfg
+  ../tensorflow/buildout.cfg
+parts =
+  chainer-egg
+
+[chainer-env]
+CUDA_PATH=${cuda:cuda_toolkit_path}
+
+[chainer]
+recipe = zc.recipe.egg:custom
+egg = chainer
+setup-eggs =
+  ${scipy:egg}
+  ${numpy:egg}
+  ${protobuf-python:egg}
+  ${h5py:egg}
+  ${pillow-python:egg}
+environment = chainer-env
+
+[chainer-egg]
+recipe = zc.recipe.egg
+initialization =
+  import scipy.spatial.ckdtree # load our own libstdc++ explicitly at the very beginning
+eggs =
+  ${scipy:egg}
+  ${numpy:egg}
+  ${protobuf-python:egg}
+  filelock
+  nose
+  six
+  ${chainer:egg}
+  ${h5py:egg}
+  ${pillow-python:egg}
+interpreter = chainer-python
+scripts = chainer-python
+
+[versions]
+chainer = 1.22.0
+filelock = 2.0.7
+nose = 1.3.7
+six = 1.10.0

component/cmake/buildout.cfg

@@ -7,8 +7,8 @@ parts =
 
 [cmake]
 recipe = slapos.recipe.cmmi
-url = http://www.cmake.org/files/v2.8/cmake-2.8.12.1.tar.gz
-md5sum = 9d38cd4e2c94c3cea97d0e2924814acc
+url = https://cmake.org/files/v3.7/cmake-3.7.2.tar.gz
+md5sum = 79bd7e65cd81ea3aa2619484ad6ff25a
 environment =
   CMAKE_INCLUDE_PATH=${ncurses:location}/include
   CMAKE_LIBRARY_PATH=${ncurses:location}/lib

component/cryptopp/buildout.cfg

+[buildout]
+parts =
+  cryptopp
+
+[cryptopp]
+recipe = slapos.recipe.cmmi
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+url = https://github.com/weidai11/cryptopp/archive/CRYPTOPP_5_6_3.tar.gz
+md5sum = 5bad00942de603ba6dd191d84eac2509
+configure-command = true
+make-options = PREFIX=${:location}
+make-targets = static shared install
+
+[cryptopp-5]
+<= cryptopp
+[cryptopp-5.6]
+<= cryptopp-5
+[cryptopp-5.6.3]
+<= cryptopp-5.6

component/depot_tools/buildout.cfg

+[buildout]
+parts =
+  depot_tools
+
+[depot_tools]
+recipe = slapos.recipe.build:gitclone
+repository = https://chromium.googlesource.com/chromium/tools/depot_tools.git
+branch = master
+git-executable = ${git:location}/bin/git

component/firefox/buildout.cfg

@@ -21,6 +21,9 @@ parts =
 # fail to run if exists.
 
 [firefox]
+<= firefox-51
+
+[firefox-51]
 recipe = slapos.recipe.build
 slapos_promise =
   file:firefox
@@ -91,6 +94,73 @@ script =
   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 "$@" 2> /dev/null
+  """)
+  wrapper.close()
+  os.chmod(wrapper_location, 0755)
+
+[firefox-45]
+recipe = slapos.recipe.build
+slapos_promise =
+  file:firefox
+  file:firefox-bin
+
+depends =
+  ${liberation-fonts:location}
+  ${ipaex-fonts:location}
+
+version = 45.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
+
+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")
+  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"
+  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:${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-2:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${harfbuzz:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libICE:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libSM: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:${libXrender:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXt: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:${libtool:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libuuid: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:${p11-kit:location}/lib"
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${pango: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:${zlib:location}/lib"
+  export PATH=${fontconfig:location}/bin:$PATH
   exec %(location)s/firefox $*""")
   wrapper.close()
   os.chmod(wrapper_location, 0755)

component/firewalld/buildout.cfg

@@ -62,21 +62,16 @@ environment =
 
 [gobject-introspection]
 recipe = slapos.recipe.cmmi
-url = https://github.com/GNOME/gobject-introspection/archive/GOBJECT_INTROSPECTION_1_45_2.tar.gz
-pre-configure =
-  libtoolize -c -f
-  aclocal -I${pkgconfig:location}/share/aclocal -I${gettext:location}/share/aclocal -I${libtool:location}/share/aclocal
-  ./autogen.sh
+url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/gobject-introspection-1.50.0.tar.xz
+md5sum = 5af8d724f25d0c9cfbe6df41b77e5dc0
 configure-options =
   --disable-static
 
 environment =
-  PATH=${autoconf:location}/bin:${automake:location}/bin:${pkgconfig:location}/bin:${libtool:location}/bin:${intltool:location}/bin:${gettext:location}/bin:${glib:location}/bin:${flex:location}/bin:${bison:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:${gettext:location}/bin:${glib:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
   CPPFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
   LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
-  M4=${m4:location}/bin/m4
-  ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${gettext:location}/share/aclocal:${libtool:location}/share/aclocal:${glib:location}/share/aclocal:${intltool:location}/share/aclocal
   PYTHON=${python2.7:location}/bin/python2.7
   GLIB_CFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
   GLIB_LIBS=-L${glib:location}/lib -lglib-2.0 -lintl -lgobject-2.0
@@ -86,9 +81,9 @@ environment =
 
 [pygobject3]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.10/pygobject-3.10.2.tar.xz
+url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/pygobject-3.22.0.tar.xz
 python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python2.7/site-packages
- md5sum = f311155be8510df6ad8e4edf1cb463d4
+ md5sum = ed4117ed5d554d25fd7718807fbf819f
 pre-configure =
   sed -i 's#/usr/local#${gobject-introspection:location}#g' ${gobject-introspection:location}/lib/pkgconfig/gobject-introspection-1.0.pc
 configure-options =

component/fluentd/buildout.cfg

@@ -10,8 +10,8 @@ recipe = rubygemsrecipe
 url = https://rubygems.org/rubygems/rubygems-2.4.8.zip
 ruby-executable = ${ruby:location}/bin/ruby
 gems =
-  fluentd==0.12.24
-  fluent-plugin-td==0.10.27
+  fluentd==0.14.14
+  fluent-plugin-td==0.10.29
 gem-options = --no-ri --no-rdoc --with-icu-lib=${icu:location}/lib/ --with-icu-dir=${icu:location}/
 environment =
   LDFLAGS = -L${icu:location}/lib -Wl,-rpath=${icu:location}/lib

component/fonts/buildout.cfg

@@ -14,8 +14,8 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [fonts-base]
 destination = ${fonts:location}/${:_buildout_section_name_}
-recipe = hexagonit.recipe.download
-ignore-existing = true
+location = ${:destination}
+recipe = slapos.recipe.build:download-unpacked
 strip-top-level-dir = true
 
 # Liberation(tm) Fonts - a font family which aims at metric

component/freetype/buildout.cfg

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

component/gcc/buildout.cfg

@@ -11,38 +11,6 @@ extends =
 parts =
   gcc
 
-[mpfr]
-recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/mpfr/mpfr-3.1.3.tar.xz
-md5sum = 6969398cd2fbc56a6af570b5273c56a9
-configure-options =
-  --with-gmp=${gmp:location}
-  --disable-static
-environment =
-  PATH=${xz-utils:location}/bin:%(PATH)s
-  LDFLAGS=-Wl,-rpath=${gmp:location}/lib
-
-[mpc]
-recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/mpc/mpc-1.0.3.tar.gz
-md5sum = d6a1d5f8ddea3abd2cc3e98f58352d26
-configure-options =
-  --with-gmp=${gmp:location}
-  --with-mpfr=${mpfr:location}
-  --disable-static
-environment =
-  LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpfr:location}/lib
-
-[isl]
-recipe = slapos.recipe.cmmi
-url = ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-0.16.1.tar.bz2
-md5sum = ac1f25a0677912952718a51f5bc20f32
-configure-options =
-  --with-gmp-prefix=${gmp:location}
-  --disable-static
-environment =
-  LDFLAGS=-Wl,-rpath=${gmp:location}/lib
-
 [gcc-common]
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2
@@ -58,14 +26,13 @@ configure-options =
   --with-gmp=${gmp:location}
   --with-mpfr=${mpfr:location}
   --with-mpc=${mpc:location}
-  --enable-languages="c,c++"
+  --enable-languages="c,c++,fortran"
   --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
+  PATH=${binutils:location}/bin:${perl:location}/bin:${tar:location}/bin:%(PATH)s
 
 [gcc-minimal]
 <= gcc-common
@@ -81,17 +48,3 @@ configure-options =
 environment =
   LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${mpfr:location}/lib
   PATH=${perl:location}/bin:${tar:location}/bin:%(PATH)s
-
-[gcc-fortran]
-<= gcc-common
-configure-options =
-  --disable-bootstrap
-  --disable-multilib
-  --with-gmp=${gmp:location}
-  --with-mpfr=${mpfr:location}
-  --with-mpc=${mpc:location}
-  --enable-languages="c,c++,fortran"
-  --with-isl=${isl:location}
-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/ghostscript/buildout.cfg

@@ -37,7 +37,7 @@ url = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs
 md5sum = 8f3d383d48da22345937b66b01ab2960
 
 [ghostscript-fonts]
-recipe = hexagonit.recipe.download
-ignore-existing = true
+recipe = slapos.recipe.build:download-unpacked
+strip-top-level-dir = false
 url = http://downloads.ghostscript.com/public/fonts/urw-base35-v1.10.zip
 md5sum = 66e8bbd8228519d5dba82b9433a61bb0

component/glib/buildout.cfg

@@ -11,10 +11,11 @@ parts =
 
 [glib]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/core/3.20/3.20.2/sources/glib-2.48.1.tar.xz
-md5sum = 67bd3b75c9f6d5587b457dc01cdcd5bb
+url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/glib-2.50.2.tar.xz
+md5sum = 5eeb2bfaf78a07be59585e8b6e80b1d6
 configure-options =
   --with-python=${python2.7:location}/bin/python2.7
+  --disable-libmount
   --disable-static
   --disable-selinux
   --disable-fam

component/glibmm/buildout.cfg

 [buildout]
 extends =
+  ../gcc/buildout.cfg
   ../gettext/buildout.cfg
   ../glib/buildout.cfg
   ../libsigc/buildout.cfg
@@ -11,14 +12,14 @@ parts =
 
 [glibmm]
 recipe = slapos.recipe.cmmi
-# we keep using glibmm-2.44 that is buildable with non-C++11 compiler
-url = http://ftp.gnome.org/pub/gnome/core/3.16/3.16.2/sources/glibmm-2.44.0.tar.xz
-md5sum = 32ee4150b436d097fe2506d0b0b13a75
+url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/glibmm-2.50.0.tar.xz
+md5sum = e7416beff6cba1f38c2bccd0dc8c3278
 pkg_config_depends = ${glib:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
 configure-options =
   --disable-documentation
 environment =
-  PATH=${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:${glib:location}/bin:%(PATH)s
+  PATH=${gcc:location}/bin:${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
+  LD_LIBRARY_PATH=${gcc:location}/lib:${gcc:location}/lib64
+  LDFLAGS=-Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64 -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib

component/groonga/buildout.cfg

@@ -14,8 +14,8 @@ extends =
 
 [groonga]
 recipe = slapos.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-6.1.1.tar.gz
-md5sum = f2dedb4b1a536a5e11a2b9a35664125b
+url = http://packages.groonga.org/source/groonga/groonga-7.0.0.tar.gz
+md5sum = 1b5383359ba1901e66b9e0910712569f
 # temporary patch to respect more tokens in natural language mode.
 patches =
   ${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b

component/gtk-2/buildout.cfg

@@ -61,8 +61,8 @@ environment =
 
 [pango]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/core/3.20/3.20.2/sources/pango-1.40.1.tar.xz
-md5sum = 6fc88c6529890d6c8e03074d57a3eceb
+url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/pango-1.40.3.tar.xz
+md5sum = 17c26720f5a862a12f7e1745e2f1d966
 pkg_config_depends = ${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}
 configure-options =
   --disable-static
@@ -75,8 +75,8 @@ environment =
 
 [gdk-pixbuf]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/core/3.20/3.20.2/sources/gdk-pixbuf-2.35.1.tar.xz
-md5sum = 72e0c924d5dc96bfde58a3b65ed83744
+url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/gdk-pixbuf-2.36.0.tar.xz
+md5sum = 1a3baf91956c7923dab49ee3de100ce1
 pkg_config_depends = ${glib:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}:${pcre:location}/lib/pkgconfig
 configure-options =
   --disable-static
@@ -84,7 +84,7 @@ configure-options =
   --without-libintl-prefix
   --with-x11
 environment =
-  PATH=${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${gettext:location}/bin:${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
   CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include
   LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
@@ -92,21 +92,21 @@ environment =
 
 [atk]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/core/3.20/3.20.2/sources/atk-2.20.0.tar.xz
-md5sum = 5187b0972f4d3905f285540b31395e20
+url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/atk-2.22.0.tar.xz
+md5sum = c7f2adcf75e4058727174cde970e9129
 configure-options =
   --with-python=${python2.7:location}/bin/python2.7
   --disable-gtk-doc-html
 environment =
-  PATH=${glib:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${gettext:location}/bin:${glib:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
   LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${gettext:location}/lib
   LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib
 
 [gtk-2]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/core/3.20/3.20.2/sources/gtk+-2.24.30.tar.xz
-md5sum = 04568ba5c58b75e3c7543e45628ad789
+url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/gtk+-2.24.31.tar.xz
+md5sum = 526a1008586094a2cbb4592fd3f9ee10
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig
 configure-options =
   --disable-static
@@ -117,7 +117,7 @@ configure-options =
   --disable-xinerama
   --disable-gtk-doc-html
 environment =
-  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  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${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${libXext:location}/include

component/gtk-3/buildout.cfg

@@ -13,8 +13,8 @@ extends =
 
 [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
+url =http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/at-spi2-core-2.22.0.tar.xz
+md5sum = 3da5fe62a653e49dad1c47f9a46fee56
 depends =
   ${perl-XML-Parser:location}
 configure-options =
@@ -23,20 +23,20 @@ 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
+  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 -L${zlib:location}/lib -Wl,-rpath=${zlib: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
+url =http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/at-spi2-atk-2.22.0.tar.xz
+md5sum = aa62aed21b8e03dc44ab81ae49d893ca
 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
+url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/gtk+-3.22.3.tar.xz
+md5sum = f0e6492896a2ca244501142319adaa95
 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

component/gtkmm/buildout.cfg

@@ -2,6 +2,8 @@
 extends =
   ../bzip2/buildout.cfg
   ../freetype/buildout.cfg
+  ../gcc/buildout.cfg
+  ../gettext/buildout.cfg
   ../glibmm/buildout.cfg
   ../gtk-2/buildout.cfg
   ../perl/buildout.cfg
@@ -14,55 +16,57 @@ parts =
 
 [cairomm]
 recipe = slapos.recipe.cmmi
-url = http://cairographics.org/releases/cairomm-1.11.2.tar.gz
-md5sum = 732a3ff5b57401eb5dfeef795a2a0c52
+url = http://cairographics.org/releases/cairomm-1.13.1.tar.gz
+md5sum = 21fe892652741b7544f52da6965d27fc
 pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}:${libsigc:location}/lib/pkgconfig
 configure-options =
   --disable-static
   --disable-documentation
 environment =
-  PATH=${freetype:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${freetype:location}/bin:${gcc:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
   CPPFLAGS=-I${libX11:location}/include -I${libXrender:location}/include -I${render:location}/include -I${xproto:location}/include
-  LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LD_LIBRARY_PATH=${gcc:location}/lib:${gcc:location}/lib64
+  LDFLAGS=-Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64 -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 
 [pangomm]
 recipe = slapos.recipe.cmmi
-# we keep using pangomm-2.36 for glibmm-2.44 that is buildable with non-C++11 compiler
-url = http://ftp.gnome.org/pub/gnome/core/3.16/3.16.2/sources/pangomm-2.36.0.tar.xz
-md5sum = 62910723211d86ab825b666b479871c9
+url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/pangomm-2.40.1.tar.xz
+md5sum = 874eadd9434613dbacf0272c82c3ac23
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${glibmm:location}/lib/pkgconfig:${glibmm:pkg_config_depends}:${cairomm:location}/lib/pkgconfig
 configure-options =
   --disable-static
   --disable-documentation
 environment =
-  PATH=${glib:location}/bin:${freetype:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${gcc:location}/bin:${glib:location}/bin:${freetype:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
-  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+  LD_LIBRARY_PATH=${gcc:location}/lib:${gcc:location}/lib64
+  LDFLAGS=-Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64 -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
 
 [atkmm]
 recipe = slapos.recipe.cmmi
-# we keep using atkmm-2.22 for glibmm-2.44 that is buildable with non-C++11 compiler
-url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/atkmm-2.22.7.tar.xz
-md5sum = fec7db3fc47ba2e0c95d130ec865a236
+url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/atkmm-2.24.2.tar.xz
+md5sum = d53b60b0f1be597e86070954a49cf0c3
 pkg_config_depends = ${atk:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${glibmm:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
 configure-options =
   --disable-static
   --disable-documentation
 environment =
-  PATH=${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${gcc:location}/bin:${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
-  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+  LD_LIBRARY_PATH=${gcc:location}/lib:${gcc:location}/lib64
+  LDFLAGS=-Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64 -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
 
 [gtkmm]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.24/gtkmm-2.24.4.tar.xz
-md5sum = b9ac60c90959a71095f07f84dd39961d
+url = http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.24/gtkmm-2.24.5.tar.xz
+md5sum = 6c59ae8bbff48fad9132f23af347acf1
 pkg_config_depends = ${pangomm:location}/lib/pkgconfig:${pangomm:pkg_config_depends}:${atkmm:location}/lib/pkgconfig:${atkmm:pkg_config_depends}:${gtk-2:location}/lib/pkgconfig:${gtk-2:pkg_config_depends}
 configure-options =
   --disable-static
   --disable-documentation
 environment =
-  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${gtk-2:location}/bin:${pango:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${gcc:location}/bin:${gdk-pixbuf:location}/bin:${glib:location}/bin:${gtk-2:location}/bin:${pango:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LD_LIBRARY_PATH=${gcc:location}/lib:${gcc:location}/lib64
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64 -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/icu/buildout.cfg

@@ -15,3 +15,11 @@ configure-options =
 
 [icu]
 <= icu4c
+
+[icu4c-58.2]
+<= icu4c
+
+[icu4c-55.1]
+<= icu4c
+url = http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-src.tgz
+md5sum = e2d523df79d6cb7855c2fbe284f4db29

component/inkscape/buildout.cfg

@@ -3,13 +3,17 @@ parts = inkscape
 extends =
   ../boost-lib/buildout.cfg
   ../bzip2/buildout.cfg
+  ../cmake/buildout.cfg
   ../freetype/buildout.cfg
   ../garbage-collector/buildout.cfg
+  ../gcc/buildout.cfg
   ../gettext/buildout.cfg
   ../glibmm/buildout.cfg
   ../gtk-2/buildout.cfg
   ../gtkmm/buildout.cfg
   ../intltool/buildout.cfg
+  ../lcms/buildout.cfg
+  ../libjpeg/buildout.cfg
   ../libpng/buildout.cfg
   ../libsigc/buildout.cfg
   ../libxml2/buildout.cfg
@@ -23,36 +27,36 @@ extends =
 
 [gsl]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnu.org/gnu/gsl/gsl-1.16.tar.gz
-md5sum = e49a664db13d81c968415cd53f62bc8b
+url = http://ftp.gnu.org/gnu/gsl/gsl-2.3.tar.gz
+md5sum = 905fcbbb97bc552d1037e34d200931a0
 configure-options =
   --disable-static
 environment =
-  PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PATH=${gcc:location}/bin:${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${atk:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${glibmm:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
-  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+  LD_LIBRARY_PATH=${gcc:location}/lib:${gcc:location}/lib64
+  LDFLAGS=-Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64 -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
 
 [inkscape]
 recipe = slapos.recipe.cmmi
-url = https://inkscape.org/en/gallery/item/3860/inkscape-0.91.tar.bz2
-md5sum = 278dfa4514adcde23546370ec2c84581
-patch-options = -p0
-# based on
-# http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/15017
-patches =
-  ${:_profile_base_location_}/inkscape-0.91_gcc6.patch#ce3ddbb90f7e5e81fd322469194b6c3c
-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
+url = https://inkscape.org/gallery/item/10682/inkscape-0.92.1.tar_XlpI7qT.bz2
+md5sum = db2eb2a566cf35ff949fc9ccb172889a
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+pkg_config_depends = ${freetype:location}/lib/pkgconfig:${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
+configure-command = ${cmake:location}/bin/cmake
 configure-options =
-  --disable-static
-  --disable-openmp
-  --disable-lcms
-  --disable-wpg
-  --disable-visio
-  --disable-cdr
-  --without-gnome-vfs
+  -DCMAKE_INSTALL_PREFIX=${:location}
+  -DCMAKE_C_COMPILER=${gcc:location}/bin/gcc
+  -DCMAKE_CXX_COMPILER=${gcc:location}/bin/g++
+  -DENABLE_POPPLER=OFF
+  -DWITH_GNOME_VFS=OFF
+  -DWITH_IMAGE_MAGICK=OFF
+  -DWITH_LIBCDR=OFF
+  -DWITH_LIBVISIO=OFF
+  -DWITH_LIBWPG=OFF
 environment =
-  PATH=${freetype:location}/bin:${gdk-pixbuf:location}/bin:${gettext:location}/bin:${glib:location}/bin:${intltool:location}/bin:${libxml2:location}/bin:${pango:location}/bin:${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PATH=${cmake:location}/bin:${freetype:location}/bin:${gcc:location}/bin:${gdk-pixbuf:location}/bin:${gettext:location}/bin:${glib:location}/bin:${intltool:location}/bin:${libxml2:location}/bin:${pango:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
-  CPPFLAGS=-I${boost-lib:location}/include -I${cairo:location}/include -I${garbage-collector:location}/include -I${libpng:location}/include -I${popt:location}/include  -I${zlib:location}/include
-# rpath seems not taken from pkgconfig...
-  LDFLAGS=-L${atk:location}/lib -Wl,-rpath=${atk:location}/lib -L${atkmm:location}/lib -Wl,-rpath=${atkmm:location}/lib -L${boost-lib:location}/lib -Wl,-rpath=${boost-lib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${cairo:location}/lib -Wl,-rpath=${cairo:location}/lib -L${cairomm:location}/lib -Wl,-rpath=${cairomm:location}/lib -L${fontconfig:location}/lib -Wl,-rpath=${fontconfig:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib -L${garbage-collector:location}/lib -Wl,-rpath=${garbage-collector:location}/lib -L${gdk-pixbuf:location}/lib -Wl,-rpath=${gdk-pixbuf:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${glibmm:location}/lib -Wl,-rpath=${glibmm:location}/lib -L${gsl:location}/lib -Wl,-rpath=${gsl:location}/lib -L${gtk-2:location}/lib -Wl,-rpath=${gtk-2:location}/lib -L${gtkmm:location}/lib -Wl,-rpath=${gtkmm:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${libsigc:location}/lib -Wl,-rpath=${libsigc:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${libxslt:location}/lib -Wl,-rpath=${libxslt:location}/lib -L${pango:location}/lib -Wl,-rpath=${pango:location}/lib -L${pangomm:location}/lib -Wl,-rpath=${pangomm:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  CMAKE_INCLUDE_PATH=${boost-lib:location}/include:${freetype:location}/include:${garbage-collector:location}/include:${libjpeg:location}/include:${lcms2:location}/include:${libpng:location}/include:${zlib:location}/include
+  CMAKE_LIBRARY_PATH=${boost-lib:location}/lib:${freetype:location}/lib:${garbage-collector:location}/lib:${gcc:location}/lib:${gcc:location}/lib64:${lcms2:location}/lib:${libjpeg:location}/lib:${libpng:location}/lib:${zlib:location}/lib
+  LDFLAGS=-L${atk:location}/lib -Wl,-rpath=${atk:location}/lib -L${atkmm:location}/lib -Wl,-rpath=${atkmm:location}/lib -L${boost-lib:location}/lib -Wl,-rpath=${boost-lib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${cairo:location}/lib -Wl,-rpath=${cairo:location}/lib -L${cairomm:location}/lib -Wl,-rpath=${cairomm:location}/lib -L${fontconfig:location}/lib -Wl,-rpath=${fontconfig:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib -L${garbage-collector:location}/lib -Wl,-rpath=${garbage-collector:location}/lib -Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64 -L${gdk-pixbuf:location}/lib -Wl,-rpath=${gdk-pixbuf:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${glibmm:location}/lib -Wl,-rpath=${glibmm:location}/lib -L${gsl:location}/lib -Wl,-rpath=${gsl:location}/lib -L${gtk-2:location}/lib -Wl,-rpath=${gtk-2:location}/lib -L${gtkmm:location}/lib -Wl,-rpath=${gtkmm:location}/lib -L${lcms2:location}/lib -Wl,-rpath=${lcms2:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${libsigc:location}/lib -Wl,-rpath=${libsigc:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${libxslt:location}/lib -Wl,-rpath=${libxslt:location}/lib -L${pango:location}/lib -Wl,-rpath=${pango:location}/lib -L${pangomm:location}/lib -Wl,-rpath=${pangomm:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/inkscape/inkscape-0.91_gcc6.patch

---- src/ui/dialog/layer-properties.cpp	2014-12-21 21:58:32 +0000
-+++ src/ui/dialog/layer-properties.cpp	2016-07-18 17:19:25 +0000
-@@ -146,7 +146,7 @@
-     destroy_();
-     Glib::signal_idle().connect(
-         sigc::bind_return(
--            sigc::bind(sigc::ptr_fun(&::operator delete), this),
-+            sigc::bind(sigc::ptr_fun<void*, void>(&::operator delete), this),
-             false 
-         )
-     );

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/CVE-2014-8137.patch

-Description: CVE-2014-8137: double-free in in jas_iccattrval_destroy()
-Origin: vendor, https://bugzilla.redhat.com/attachment.cgi?id=967283,
- https://bugzilla.redhat.com/attachment.cgi?id=967284
-Bug-Debian: https://bugs.debian.org/773463
-Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1173157
-Forwarded: no
-Author: Tomas Hoger <thoger@redhat.com>
-Last-Update: 2014-12-20
-
---- a/src/libjasper/base/jas_icc.c
-+++ b/src/libjasper/base/jas_icc.c
-@@ -1010,7 +1010,6 @@ static int jas_icccurv_input(jas_iccattr
- 	return 0;
- 
- error:
--	jas_icccurv_destroy(attrval);
- 	return -1;
- }
- 
-@@ -1128,7 +1127,6 @@ static int jas_icctxtdesc_input(jas_icca
- #endif
- 	return 0;
- error:
--	jas_icctxtdesc_destroy(attrval);
- 	return -1;
- }
- 
-@@ -1207,8 +1205,6 @@ static int jas_icctxt_input(jas_iccattrv
- 		goto error;
- 	return 0;
- error:
--	if (txt->string)
--		jas_free(txt->string);
- 	return -1;
- }
- 
-@@ -1329,7 +1325,6 @@ static int jas_icclut8_input(jas_iccattr
- 		goto error;
- 	return 0;
- error:
--	jas_icclut8_destroy(attrval);
- 	return -1;
- }
- 
-@@ -1498,7 +1493,6 @@ static int jas_icclut16_input(jas_iccatt
- 		goto error;
- 	return 0;
- error:
--	jas_icclut16_destroy(attrval);
- 	return -1;
- }
- 
---- a/src/libjasper/jp2/jp2_dec.c
-+++ b/src/libjasper/jp2/jp2_dec.c
-@@ -291,7 +291,10 @@ jas_image_t *jp2_decode(jas_stream_t *in
- 	case JP2_COLR_ICC:
- 		iccprof = jas_iccprof_createfrombuf(dec->colr->data.colr.iccp,
- 		  dec->colr->data.colr.iccplen);
--		assert(iccprof);
-+		if (!iccprof) {
-+			jas_eprintf("error: failed to parse ICC profile\n");
-+			goto error;
-+		}
- 		jas_iccprof_gethdr(iccprof, &icchdr);
- 		jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc);
- 		jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc));

component/jasper/CVE-2014-8138.patch

-Description: CVE-2014-8138: heap overflow in jp2_decode()
-Origin: vendor, https://bugzilla.redhat.com/attachment.cgi?id=967280
-Bug-Debian: https://bugs.debian.org/773463
-Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1173162
-Forwarded: no
-Author: Tomas Hoger <thoger@redhat.com>
-Last-Update: 2014-12-20
-
---- a/src/libjasper/jp2/jp2_dec.c
-+++ b/src/libjasper/jp2/jp2_dec.c
-@@ -389,6 +389,11 @@ jas_image_t *jp2_decode(jas_stream_t *in
- 	/* Determine the type of each component. */
- 	if (dec->cdef) {
- 		for (i = 0; i < dec->numchans; ++i) {
-+			/* Is the channel number reasonable? */
-+			if (dec->cdef->data.cdef.ents[i].channo >= dec->numchans) {
-+				jas_eprintf("error: invalid channel number in CDEF box\n");
-+				goto error;
-+			}
- 			jas_image_setcmpttype(dec->image,
- 			  dec->chantocmptlut[dec->cdef->data.cdef.ents[i].channo],
- 			  jp2_getct(jas_image_clrspc(dec->image),

component/jasper/CVE-2014-8157.patch

-Description: CVE-2014-8157: dec->numtiles off-by-one check in jpc_dec_process_sot()
-Origin: vendor, http://pkgs.fedoraproject.org/cgit/jasper.git/tree/jasper-CVE-2014-8157.patch
-Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1179282
-Bug-Debian: https://bugs.debian.org/775970
-Forwarded: not-needed
-Author: Salvatore Bonaccorso <carnil@debian.org>
-Last-Update: 2015-01-22
-
---- a/src/libjasper/jpc/jpc_dec.c
-+++ b/src/libjasper/jpc/jpc_dec.c
-@@ -489,7 +489,7 @@ static int jpc_dec_process_sot(jpc_dec_t
- 		dec->curtileendoff = 0;
- 	}
- 
--	if (JAS_CAST(int, sot->tileno) > dec->numtiles) {
-+	if (JAS_CAST(int, sot->tileno) >= dec->numtiles) {
- 		jas_eprintf("invalid tile number in SOT marker segment\n");
- 		return -1;
- 	}

component/jasper/CVE-2014-8158.patch

-Description: CVE-2014-8158: unrestricted stack memory use in jpc_qmfb.c
-Origin: vendor, http://pkgs.fedoraproject.org/cgit/jasper.git/tree/jasper-CVE-2014-8158.patch
-Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1179298
-Bug-Debian: https://bugs.debian.org/775970
-Forwarded: not-needed
-Author: Salvatore Bonaccorso <carnil@debian.org>
-Last-Update: 2015-01-22
-
---- a/src/libjasper/jpc/jpc_qmfb.c
-+++ b/src/libjasper/jpc/jpc_qmfb.c
-@@ -306,11 +306,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
- {
- 
- 	int bufsize = JPC_CEILDIVPOW2(numcols, 1);
--#if !defined(HAVE_VLA)
- 	jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE];
--#else
--	jpc_fix_t splitbuf[bufsize];
--#endif
- 	jpc_fix_t *buf = splitbuf;
- 	register jpc_fix_t *srcptr;
- 	register jpc_fix_t *dstptr;
-@@ -318,7 +314,6 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
- 	register int m;
- 	int hstartcol;
- 
--#if !defined(HAVE_VLA)
- 	/* Get a buffer. */
- 	if (bufsize > QMFB_SPLITBUFSIZE) {
- 		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
-@@ -326,7 +321,6 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
- 			abort();
- 		}
- 	}
--#endif
- 
- 	if (numcols >= 2) {
- 		hstartcol = (numcols + 1 - parity) >> 1;
-@@ -360,12 +354,10 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
- 		}
- 	}
- 
--#if !defined(HAVE_VLA)
- 	/* If the split buffer was allocated on the heap, free this memory. */
- 	if (buf != splitbuf) {
- 		jas_free(buf);
- 	}
--#endif
- 
- }
- 
-@@ -374,11 +366,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
- {
- 
- 	int bufsize = JPC_CEILDIVPOW2(numrows, 1);
--#if !defined(HAVE_VLA)
- 	jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE];
--#else
--	jpc_fix_t splitbuf[bufsize];
--#endif
- 	jpc_fix_t *buf = splitbuf;
- 	register jpc_fix_t *srcptr;
- 	register jpc_fix_t *dstptr;
-@@ -386,7 +374,6 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
- 	register int m;
- 	int hstartcol;
- 
--#if !defined(HAVE_VLA)
- 	/* Get a buffer. */
- 	if (bufsize > QMFB_SPLITBUFSIZE) {
- 		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
-@@ -394,7 +381,6 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
- 			abort();
- 		}
- 	}
--#endif
- 
- 	if (numrows >= 2) {
- 		hstartcol = (numrows + 1 - parity) >> 1;
-@@ -428,12 +414,10 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
- 		}
- 	}
- 
--#if !defined(HAVE_VLA)
- 	/* If the split buffer was allocated on the heap, free this memory. */
- 	if (buf != splitbuf) {
- 		jas_free(buf);
- 	}
--#endif
- 
- }
- 
-@@ -442,11 +426,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
- {
- 
- 	int bufsize = JPC_CEILDIVPOW2(numrows, 1);
--#if !defined(HAVE_VLA)
- 	jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE];
--#else
--	jpc_fix_t splitbuf[bufsize * JPC_QMFB_COLGRPSIZE];
--#endif
- 	jpc_fix_t *buf = splitbuf;
- 	jpc_fix_t *srcptr;
- 	jpc_fix_t *dstptr;
-@@ -457,7 +437,6 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
- 	int m;
- 	int hstartcol;
- 
--#if !defined(HAVE_VLA)
- 	/* Get a buffer. */
- 	if (bufsize > QMFB_SPLITBUFSIZE) {
- 		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
-@@ -465,7 +444,6 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
- 			abort();
- 		}
- 	}
--#endif
- 
- 	if (numrows >= 2) {
- 		hstartcol = (numrows + 1 - parity) >> 1;
-@@ -517,12 +495,10 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
- 		}
- 	}
- 
--#if !defined(HAVE_VLA)
- 	/* If the split buffer was allocated on the heap, free this memory. */
- 	if (buf != splitbuf) {
- 		jas_free(buf);
- 	}
--#endif
- 
- }
- 
-@@ -531,11 +507,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
- {
- 
- 	int bufsize = JPC_CEILDIVPOW2(numrows, 1);
--#if !defined(HAVE_VLA)
- 	jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE];
--#else
--	jpc_fix_t splitbuf[bufsize * numcols];
--#endif
- 	jpc_fix_t *buf = splitbuf;
- 	jpc_fix_t *srcptr;
- 	jpc_fix_t *dstptr;
-@@ -546,7 +518,6 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
- 	int m;
- 	int hstartcol;
- 
--#if !defined(HAVE_VLA)
- 	/* Get a buffer. */
- 	if (bufsize > QMFB_SPLITBUFSIZE) {
- 		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
-@@ -554,7 +525,6 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
- 			abort();
- 		}
- 	}
--#endif
- 
- 	if (numrows >= 2) {
- 		hstartcol = (numrows + 1 - parity) >> 1;
-@@ -606,12 +576,10 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
- 		}
- 	}
- 
--#if !defined(HAVE_VLA)
- 	/* If the split buffer was allocated on the heap, free this memory. */
- 	if (buf != splitbuf) {
- 		jas_free(buf);
- 	}
--#endif
- 
- }
- 
-@@ -619,18 +587,13 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int
- {
- 
- 	int bufsize = JPC_CEILDIVPOW2(numcols, 1);
--#if !defined(HAVE_VLA)
- 	jpc_fix_t joinbuf[QMFB_JOINBUFSIZE];
--#else
--	jpc_fix_t joinbuf[bufsize];
--#endif
- 	jpc_fix_t *buf = joinbuf;
- 	register jpc_fix_t *srcptr;
- 	register jpc_fix_t *dstptr;
- 	register int n;
- 	int hstartcol;
- 
--#if !defined(HAVE_VLA)
- 	/* Allocate memory for the join buffer from the heap. */
- 	if (bufsize > QMFB_JOINBUFSIZE) {
- 		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
-@@ -638,7 +601,6 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int
- 			abort();
- 		}
- 	}
--#endif
- 
- 	hstartcol = (numcols + 1 - parity) >> 1;
- 
-@@ -670,12 +632,10 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int
- 		++srcptr;
- 	}
- 
--#if !defined(HAVE_VLA)
- 	/* If the join buffer was allocated on the heap, free this memory. */
- 	if (buf != joinbuf) {
- 		jas_free(buf);
- 	}
--#endif
- 
- }
- 
-@@ -684,18 +644,13 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int
- {
- 
- 	int bufsize = JPC_CEILDIVPOW2(numrows, 1);
--#if !defined(HAVE_VLA)
- 	jpc_fix_t joinbuf[QMFB_JOINBUFSIZE];
--#else
--	jpc_fix_t joinbuf[bufsize];
--#endif
- 	jpc_fix_t *buf = joinbuf;
- 	register jpc_fix_t *srcptr;
- 	register jpc_fix_t *dstptr;
- 	register int n;
- 	int hstartcol;
- 
--#if !defined(HAVE_VLA)
- 	/* Allocate memory for the join buffer from the heap. */
- 	if (bufsize > QMFB_JOINBUFSIZE) {
- 		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
-@@ -703,7 +658,6 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int
- 			abort();
- 		}
- 	}
--#endif
- 
- 	hstartcol = (numrows + 1 - parity) >> 1;
- 
-@@ -735,12 +689,10 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int
- 		++srcptr;
- 	}
- 
--#if !defined(HAVE_VLA)
- 	/* If the join buffer was allocated on the heap, free this memory. */
- 	if (buf != joinbuf) {
- 		jas_free(buf);
- 	}
--#endif
- 
- }
- 
-@@ -749,11 +701,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a,
- {
- 
- 	int bufsize = JPC_CEILDIVPOW2(numrows, 1);
--#if !defined(HAVE_VLA)
- 	jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE];
--#else
--	jpc_fix_t joinbuf[bufsize * JPC_QMFB_COLGRPSIZE];
--#endif
- 	jpc_fix_t *buf = joinbuf;
- 	jpc_fix_t *srcptr;
- 	jpc_fix_t *dstptr;
-@@ -763,7 +711,6 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a,
- 	register int i;
- 	int hstartcol;
- 
--#if !defined(HAVE_VLA)
- 	/* Allocate memory for the join buffer from the heap. */
- 	if (bufsize > QMFB_JOINBUFSIZE) {
- 		if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
-@@ -771,7 +718,6 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a,
- 			abort();
- 		}
- 	}
--#endif
- 
- 	hstartcol = (numrows + 1 - parity) >> 1;
- 
-@@ -821,12 +767,10 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a,
- 		srcptr += JPC_QMFB_COLGRPSIZE;
- 	}
- 
--#if !defined(HAVE_VLA)
- 	/* If the join buffer was allocated on the heap, free this memory. */
- 	if (buf != joinbuf) {
- 		jas_free(buf);
- 	}
--#endif
- 
- }
- 
-@@ -835,11 +779,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a,
- {
- 
- 	int bufsize = JPC_CEILDIVPOW2(numrows, 1);
--#if !defined(HAVE_VLA)
- 	jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE];
--#else
--	jpc_fix_t joinbuf[bufsize * numcols];
--#endif
- 	jpc_fix_t *buf = joinbuf;
- 	jpc_fix_t *srcptr;
- 	jpc_fix_t *dstptr;
-@@ -849,7 +789,6 @@ void jpc_qmfb_join_colres(jpc_fix_t *a,
- 	register int i;
- 	int hstartcol;
- 
--#if !defined(HAVE_VLA)
- 	/* Allocate memory for the join buffer from the heap. */
- 	if (bufsize > QMFB_JOINBUFSIZE) {
- 		if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) {
-@@ -857,7 +796,6 @@ void jpc_qmfb_join_colres(jpc_fix_t *a,
- 			abort();
- 		}
- 	}
--#endif
- 
- 	hstartcol = (numrows + 1 - parity) >> 1;
- 
-@@ -907,12 +845,10 @@ void jpc_qmfb_join_colres(jpc_fix_t *a,
- 		srcptr += numcols;
- 	}
- 
--#if !defined(HAVE_VLA)
- 	/* If the join buffer was allocated on the heap, free this memory. */
- 	if (buf != joinbuf) {
- 		jas_free(buf);
- 	}
--#endif
- 
- }
- 

component/jasper/CVE-2014-9029.patch

-Description: CVE-2014-9029: Heap overflows in libjasper
-Origin: vendor
-Forwarded: no
-Author: Tomas Hoger <thoger@redhat.com>
-Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
-Last-Update: 2014-11-28
-
---- a/src/libjasper/jpc/jpc_dec.c
-+++ b/src/libjasper/jpc/jpc_dec.c
-@@ -1280,7 +1280,7 @@ static int jpc_dec_process_coc(jpc_dec_t
- 	jpc_coc_t *coc = &ms->parms.coc;
- 	jpc_dec_tile_t *tile;
- 
--	if (JAS_CAST(int, coc->compno) > dec->numcomps) {
-+	if (JAS_CAST(int, coc->compno) >= dec->numcomps) {
- 		jas_eprintf("invalid component number in COC marker segment\n");
- 		return -1;
- 	}
-@@ -1306,7 +1306,7 @@ static int jpc_dec_process_rgn(jpc_dec_t
- 	jpc_rgn_t *rgn = &ms->parms.rgn;
- 	jpc_dec_tile_t *tile;
- 
--	if (JAS_CAST(int, rgn->compno) > dec->numcomps) {
-+	if (JAS_CAST(int, rgn->compno) >= dec->numcomps) {
- 		jas_eprintf("invalid component number in RGN marker segment\n");
- 		return -1;
- 	}
-@@ -1355,7 +1355,7 @@ static int jpc_dec_process_qcc(jpc_dec_t
- 	jpc_qcc_t *qcc = &ms->parms.qcc;
- 	jpc_dec_tile_t *tile;
- 
--	if (JAS_CAST(int, qcc->compno) > dec->numcomps) {
-+	if (JAS_CAST(int, qcc->compno) >= dec->numcomps) {
- 		jas_eprintf("invalid component number in QCC marker segment\n");
- 		return -1;
- 	}

component/jasper/CVE-2016-1577.patch

-Description: CVE-2016-1577: Prevent double-free in jas_iccattrval_destroy()
-Origin: vendor, http://www.openwall.com/lists/oss-security/2016/03/03/12
-Bug-Ubuntu: https://launchpad.net/bugs/1547865
-Bug-Debian: https://bugs.debian.org/816625
-Forwarded: not-needed
-Author: Tyler Hicks <tyhicks@canonical.com>
-Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
-Last-Update: 2016-03-05
-
---- a/src/libjasper/base/jas_icc.c
-+++ b/src/libjasper/base/jas_icc.c
-@@ -300,6 +300,7 @@ jas_iccprof_t *jas_iccprof_load(jas_stre
- 				if (jas_iccprof_setattr(prof, tagtabent->tag, attrval))
- 					goto error;
- 				jas_iccattrval_destroy(attrval);
-+				attrval = 0;
- 			} else {
- #if 0
- 				jas_eprintf("warning: skipping unknown tag type\n");

component/jasper/CVE-2016-2089.patch

-Description: CVE-2016-2089: matrix rows_ NULL pointer dereference in jas_matrix_clip()
-Origin: vendor
-Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1302636
-Bug-Debian: https://bugs.debian.org/812978
-Forwarded: not-needed
-Author: Tomas Hoger <thoger@redhat.com>
-Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
-Last-Update: 2016-03-05
-
---- a/src/libjasper/base/jas_image.c
-+++ b/src/libjasper/base/jas_image.c
-@@ -426,6 +426,10 @@ int jas_image_readcmpt(jas_image_t *imag
- 		return -1;
- 	}
- 
-+	if (!data->rows_) {
-+		return -1;
-+	}
-+
- 	if (jas_matrix_numrows(data) != height || jas_matrix_numcols(data) != width) {
- 		if (jas_matrix_resize(data, height, width)) {
- 			return -1;
-@@ -479,6 +483,10 @@ int jas_image_writecmpt(jas_image_t *ima
- 		return -1;
- 	}
- 
-+	if (!data->rows_) {
-+		return -1;
-+	}
-+
- 	if (jas_matrix_numrows(data) != height || jas_matrix_numcols(data) != width) {
- 		return -1;
- 	}
---- a/src/libjasper/base/jas_seq.c
-+++ b/src/libjasper/base/jas_seq.c
-@@ -262,6 +262,10 @@ void jas_matrix_divpow2(jas_matrix_t *ma
- 	int rowstep;
- 	jas_seqent_t *data;
- 
-+	if (!matrix->rows_) {
-+		return;
-+	}
-+
- 	rowstep = jas_matrix_rowstep(matrix);
- 	for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
- 	  rowstart += rowstep) {
-@@ -282,6 +286,10 @@ void jas_matrix_clip(jas_matrix_t *matri
- 	jas_seqent_t *data;
- 	int rowstep;
- 
-+	if (!matrix->rows_) {
-+		return;
-+	}
-+
- 	rowstep = jas_matrix_rowstep(matrix);
- 	for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
- 	  rowstart += rowstep) {
-@@ -306,6 +314,10 @@ void jas_matrix_asr(jas_matrix_t *matrix
- 	int rowstep;
- 	jas_seqent_t *data;
- 
-+	if (!matrix->rows_) {
-+		return;
-+	}
-+
- 	assert(n >= 0);
- 	rowstep = jas_matrix_rowstep(matrix);
- 	for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
-@@ -325,6 +337,10 @@ void jas_matrix_asl(jas_matrix_t *matrix
- 	int rowstep;
- 	jas_seqent_t *data;
- 
-+	if (!matrix->rows_) {
-+		return;
-+	}
-+
- 	rowstep = jas_matrix_rowstep(matrix);
- 	for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
- 	  rowstart += rowstep) {
-@@ -367,6 +383,10 @@ void jas_matrix_setall(jas_matrix_t *mat
- 	int rowstep;
- 	jas_seqent_t *data;
- 
-+	if (!matrix->rows_) {
-+		return;
-+	}
-+
- 	rowstep = jas_matrix_rowstep(matrix);
- 	for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
- 	  rowstart += rowstep) {

component/jasper/CVE-2016-2116.patch

-Description: CVE-2016-2116: Prevent jas_stream_t memory leak in jas_iccprof_createfrombuf()
-Origin: vendor, http://www.openwall.com/lists/oss-security/2016/03/03/12
-Bug-Debian: https://bugs.debian.org/816626
-Forwarded: not-needed
-Author: Tyler Hicks <tyhicks@canoonical.com>
-Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
-Last-Update: 2016-03-05
-
---- a/src/libjasper/base/jas_icc.c
-+++ b/src/libjasper/base/jas_icc.c
-@@ -1693,6 +1693,8 @@ jas_iccprof_t *jas_iccprof_createfrombuf
- 	jas_stream_close(in);
- 	return prof;
- error:
-+	if (in)
-+		jas_stream_close(in);
- 	return 0;
- }
- 

component/jasper/buildout.cfg

@@ -11,17 +11,7 @@ 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
-  ${:_profile_base_location_}/CVE-2014-9029.patch#d69195cf17878f024cc0b580045ec314
-  ${:_profile_base_location_}/CVE-2014-8137.patch#bc5103b9a33315538106bf6652383a10
-  ${:_profile_base_location_}/CVE-2014-8138.patch#bfb9604fe84b6e686fea29bd760cf34d
-  ${:_profile_base_location_}/CVE-2014-8157.patch#2fb5f62ba8a9f8afffc95a07d1194783
-  ${:_profile_base_location_}/CVE-2014-8158.patch#9036077a1fab5de8819f210ea7b57a38
-  ${:_profile_base_location_}/CVE-2016-1577.patch#bc970cf3e8535559454781ec54db2d15
-  ${:_profile_base_location_}/CVE-2016-2089.patch#9b73eda015b04a6da493de89ce9b5685
-  ${:_profile_base_location_}/CVE-2016-2116.patch#387df217963281827e006ab4f14f869a
+  ${:_profile_base_location_}/jasper_1.900.1-debian1-2.4+deb8u3.patch#1cf61d1ebc87d355523d3484169671f7
 configure-options =
   --disable-static
   --enable-shared

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/keras/buildout.cfg

 [buildout]
 extends =
   ../tensorflow/buildout.cfg
+  ../python-PyYAML/buildout.cfg
   ../h5py/buildout.cfg
   ../pillow/buildout.cfg
 parts =
@@ -8,20 +9,23 @@ parts =
 
 [keras-egg]
 recipe = zc.recipe.egg
+initialization =
+  import scipy.spatial.ckdtree # load our own libstdc++ explicitly at the very beginning
 eggs = 
   ${scipy:egg}
   ${numpy:egg}
   ${tensorflow-build-install-egg:egg}
   ${protobuf-python:egg}
-  Keras
+  ${python-PyYAML:egg}
+  six
+  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
+Keras = 2.0.1
+tensorflow = 1.0.1
 h5py = 2.7.0rc2
 Cython = 0.25.2

component/kumo/buildout.cfg

@@ -25,6 +25,6 @@ configure-options =
 
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
-  LD_LIBRARY_PATH=${gcc-fortran:location}/lib:${gcc-fortran:location}/lib64
-  LDFLAGS=-Wl,-rpath=${gcc-fortran:location}/lib -Wl,-rpath=${gcc-fortran:location}/lib64 -L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${tokyocabinet:location}/lib -Wl,-rpath=${messagepack:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib
-  PATH=${gcc-fortran:location}/bin:${patch:location}/bin:%(PATH)s
+  LD_LIBRARY_PATH=${gcc:location}/lib:${gcc:location}/lib64
+  LDFLAGS=-Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64 -L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${tokyocabinet:location}/lib -Wl,-rpath=${messagepack:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib
+  PATH=${gcc:location}/bin:${patch:location}/bin:%(PATH)s

component/libatlas/buildout.cfg

@@ -39,5 +39,5 @@ configure-options =
 make-options =
   -C build
 environment =
-  PATH=${gcc-fortran:location}/bin:${patch:location}/bin:%(PATH)s
-  LD_LIBRARY_PATH=${gcc-fortran:location}/lib:${gcc-fortran:location}/lib64
+  PATH=${gcc:location}/bin:${patch:location}/bin:%(PATH)s
+  LD_LIBRARY_PATH=${gcc:location}/lib:${gcc:location}/lib64

component/librsvg/buildout.cfg

@@ -21,8 +21,8 @@ environment =
 
 [librsvg]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/core/3.20/3.20.2/sources/librsvg-2.40.15.tar.xz
-md5sum = 3a66ab5b4fe1fb43b471708e4ff39a0e
+url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/librsvg-2.40.16.tar.xz
+md5sum = f474fe37177a2bf8050787df2046095c
 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/libsigc/buildout.cfg

 [buildout]
 extends =
+  ../gcc/buildout.cfg
   ../m4/buildout.cfg
   ../perl/buildout.cfg
   ../xz-utils/buildout.cfg
@@ -9,10 +10,11 @@ parts =
 
 [libsigc]
 recipe = slapos.recipe.cmmi
-# we keep using libsigc++-2.4 for glibmm-2.44 that is buildable with non-C++11 compiler
-url = http://ftp.gnome.org/pub/gnome/core/3.16/3.16.2/sources/libsigc++-2.4.1.tar.xz
-md5sum = 55945ba6e1652f89999e910f6b52047c
+url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/libsigc++-2.10.0.tar.xz
+md5sum = 70bcbde2c900e4925d6ef4bf50954195
 configure-options =
   --disable-documentation
 environment =
-  PATH=${m4:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${gcc:location}/bin:${m4:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  LD_LIBRARY_PATH=${gcc:location}/lib:${gcc:location}/lib64
+  LDFLAGS=-Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64

component/libtiff/buildout.cfg

@@ -2,6 +2,7 @@
 extends =
   ../libjpeg/buildout.cfg
   ../jbigkit/buildout.cfg
+  ../patch/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -15,6 +16,9 @@ configure-options =
   --disable-static
   --without-x
   --disable-lzma
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/tiff_4.0.7-5.debian.patch#f132ec0dc5cde03f9bbbe90b7a79fed4
 environment =
   CPPFLAGS=-I${libjpeg:location}/include -I${jbigkit:location}/include -I${zlib:location}/include
   LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/logrotate/buildout.cfg

@@ -2,17 +2,17 @@
 extends =
   ../patch/buildout.cfg
   ../popt/buildout.cfg
+  ../xz-utils/buildout.cfg
 parts = logrotate
 
 [logrotate]
 recipe = slapos.recipe.cmmi
-url = https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.9.tar.gz
-md5sum = eeba9dbca62a9210236f4b83195e4ea5
-patch-options = -p1
-patches =
-  ${:_profile_base_location_}/logrotate-3.7.9-O_CLOEXEC.optional.patch#6beac248c978b767d4bccc1b7eebe6bd
-configure-command = true
-make-options = PREFIX=${buildout:parts-directory}/${:_buildout_section_name_} 
+url = https://github.com/logrotate/logrotate/releases/download/3.11.0/logrotate-3.11.0.tar.xz
+md5sum = 3a9280e4caeb837427a2d54518fbcdac
+# BBB this is only for backward-compatibility.
+post-install =
+  ln -s . ${buildout:parts-directory}/${:_buildout_section_name_}/usr
 environment =
-  PATH=${patch:location}/bin:%(PATH)s
-  POPT_DIR=${popt:location}/include -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib
+  PATH=${xz-utils:location}/bin:%(PATH)s
+  CPPFLAGS=-I${popt:location}/include
+  LDFLAGS=-L${popt:location}/lib -Wl,-rpath=${popt:location}/lib

component/mariadb/buildout.cfg

@@ -22,13 +22,12 @@ parts =
 
 [mariadb]
 recipe = slapos.recipe.cmmi
-version = 10.1.21
-url = http://ftp.osuosl.org/pub/mariadb/mariadb-10.1.21/source/mariadb-10.1.21.tar.gz
+url = https://downloads.mariadb.com/MariaDB/mariadb-10.1.21/source/mariadb-10.1.21.tar.gz
 md5sum = ff8b96edeeb22425117309a249055310
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 patch-options = -p0
 patches =
   ${:_profile_base_location_}/mariadb_10.1.21_create_system_tables__no_test.patch#3c76aa9564a162f13aced7c0a3f783b3
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
   -DCMAKE_INSTALL_PREFIX=${:location}
@@ -55,7 +54,8 @@ configure-options =
   -DWITHOUT_DAEMON_EXAMPLE=1
   -DCMAKE_C_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include"
   -DCMAKE_CXX_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include"
-  -DCMAKE_INSTALL_RPATH=${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib
+  -DCMAKE_INSTALL_RPATH=${:CMAKE_INSTALL_RPATH}
+CMAKE_INSTALL_RPATH=${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib
 environment =
   CMAKE_PROGRAM_PATH=${cmake:location}/bin
   CMAKE_INCLUDE_PATH=${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${pcre:location}/include:${readline5:location}/include:${xz-utils:location}/include:${zlib:location}/include
@@ -70,8 +70,8 @@ post-install =
 # 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-6.11.tar.gz
-md5sum = 1c30bb6d89dbee0cc2f9b0a5cfaaccf0
+url = http://packages.groonga.org/source/mroonga/mroonga-7.00.tar.gz
+md5sum = befcbb7de8f5dd27366ea513dc092f3f
 pre-configure =
   mkdir fake_mariadb_source &&
   ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql

component/mariadb/mariarocks.cfg

-[buildout]
-extends =
-  buildout.cfg
-
-[mariarocks-source]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-repository = https://github.com/MariaDB/server.git
-branch = 10.2-mariarocks
-
-[mariarocks]
-<= mariadb
-url =
-md5sum =
-patches =
-path = ${mariarocks-source:location}
+[mariadb]
+url = https://downloads.mariadb.com/MariaDB/mariadb-10.2.5/source/mariadb-10.2.5.tar.gz
+md5sum = 16fb01bb375c8d8a91a9ecf491397d51
 pre-configure =
-  ${git:location}/bin/git submodule update --init
-post-install =
-  make clean
+  sed -i -e '/(rc == -1 || errno == EINTR)/s/||/\&\&/' libmariadb/plugins/pvio/pvio_socket.c
+  sed -i -e 's,set(SYSTEM_LIBS $${CMAKE_THREAD_LIBS_INIT}),set(SYSTEM_LIBS $${CMAKE_THREAD_LIBS_INIT} $${LIBRT}),' storage/rocksdb/build_rocksdb.cmake
+configure-options +=
+  -DPLUGIN_DAEMON_EXAMPLE=NO
+  -DPLUGIN_EXAMPLE=NO
+  -DPLUGIN_MROONGA=NO
+  -DCMAKE_C_COMPILER=${gcc:location}/bin/gcc
+  -DCMAKE_CXX_COMPILER=${gcc:location}/bin/g++
+  -DCMAKE_INSTALL_RPATH=${gcc:location}/lib:${gcc:location}/lib64:${:CMAKE_INSTALL_RPATH}

component/nghttp2/buildout.cfg

+[buildout]
+extends = 
+  ../automake/buildout.cfg
+  ../libtool/buildout.cfg
+  ../pkgconfig/buildout.cfg
+
+parts =
+  nghttp2
+
+[nghttp2]
+recipe = slapos.recipe.cmmi
+url = https://github.com/nghttp2/nghttp2/archive/v1.20.0.zip 
+md5sum = e77319851b27c2366aa1cc8a8eabe73e
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+pre-configure =
+  autoreconf -fisv -I ${libtool:location}/share/aclocal -I ${pkgconfig:location}/share/aclocal
+  automake
+  autoconf
+environment =
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${git:location}/bin:${libtool:location}/bin:${m4:location}/bin:%(PATH)s

component/nspr/buildout.cfg

@@ -8,8 +8,11 @@ parts = nspr
 recipe = slapos.recipe.cmmi
 url = https://ftp.mozilla.org/pub/nspr/releases/v4.13.1/src/nspr-4.13.1.tar.gz
 md5sum = 9c44298a6fc478b3c0a4e98f4f9981ed
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-command = nspr/configure
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --enable-64bit
   --enable-ipv6
+environment=
+  LDFLAGS=-Wl,-rpath=${:location}/lib

component/nss/buildout.cfg

@@ -19,6 +19,7 @@ make-options =
   SQLITE_INCLUDE_DIR=${sqlite3:location}/include
   SQLITE_LIB_DIR=${sqlite3:location}/lib
   LDFLAGS="-Wl,-rpath=${:location}/lib -Wl,-rpath=${nspr:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib"
+  RPATH="-Wl,-rpath=${:location}/lib -Wl,-rpath=${nspr:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib"
   all
 post-install =
   cp -aLr dist/*OBJ/* ${:location}/

component/numpy/openblas.cfg

@@ -6,7 +6,7 @@ extends =
   ../openblas/buildout.cfg
 
 [numpy-env]
-PATH = ${gcc-fortran:location}/bin:%(PATH)s
+PATH = ${gcc:location}/bin:%(PATH)s
 OPENBLAS = ${openblas:location}/lib/libopenblas.so
 LAPACK = ${openblas:location}/lib/libopenblas.so
 ATLAS = ${openblas:location}/lib/libopenblas.so
@@ -14,6 +14,6 @@ ATLAS = ${openblas:location}/lib/libopenblas.so
 [numpy]
 environment = numpy-env
 rpath =
-  ${gcc-fortran:location}/lib
-  ${gcc-fortran:location}/lib64
+  ${gcc:location}/lib
+  ${gcc:location}/lib64
   ${openblas:location}/lib

component/openblas/buildout.cfg

@@ -36,6 +36,6 @@ make-options =
 make-targets =
   PREFIX="${buildout:parts-directory}/${:_buildout_section_name_}" install
 environment =
-  PATH=${gcc-fortran:location}/bin:${patch:location}/bin:${perl:location}/bin:%(PATH)s
-  LD_LIBRARY_PATH=${gcc-fortran:location}/lib:${gcc-fortran:location}/lib64
-  LDFLAGS=-Wl,-rpath=${gcc-fortran:location}/lib -Wl,-rpath=${gcc-fortran:location}/lib64
+  PATH=${gcc:location}/bin:${patch:location}/bin:${perl:location}/bin:%(PATH)s
+  LD_LIBRARY_PATH=${gcc:location}/lib:${gcc:location}/lib64
+  LDFLAGS=-Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64

component/openssl/buildout.cfg

@@ -16,8 +16,8 @@ parts =
 
 [openssl]
 recipe = slapos.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.2j.tar.gz
-md5sum = 96322138f0b69e61b7212bc53d5e912b
+url = https://www.openssl.org/source/openssl-1.0.2k.tar.gz
+md5sum = f965fc0bf01bf882b31314b61391ae65
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 # 'prefix' option to override --openssldir/--prefix (which is useful
 # when combined with INSTALL_PREFIX). Used by slapos.package.git/obs
@@ -37,6 +37,8 @@ configure-options =
   shared no-idea no-mdc2 no-rc5 zlib
   -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${:location}/lib
   && make depend
+make-options =
+  SHARED_LDFLAGS='-Wl,-rpath=${:location}/lib -Wl,-rpath=${zlib:location}/lib'
 make-targets =
   install_sw && x=${:location}/etc/ssl/certs && rm -f $x/* &&
   for i in ${ca-certificates:location}/certs/*/*.crt; do

component/pcre/buildout.cfg

@@ -4,8 +4,8 @@ parts =
 
 [pcre]
 recipe = slapos.recipe.cmmi
-url = http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.39.tar.bz2
-md5sum = e3fca7650a0556a2647821679d81f585 
+url = http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.40.tar.bz2
+md5sum = 41a842bf7dcecd6634219336e2167d1d 
 configure-options =
   --disable-static
   --enable-unicode-properties

component/percona-toolkit/buildout.cfg

@@ -11,5 +11,13 @@ recipe = slapos.recipe.cmmi
 version = 2.2.15
 url = http://www.percona.com/redir/downloads/percona-toolkit/${:version}/tarball/percona-toolkit-${:version}.tar.gz
 md5sum = 022f40dadaea9025820530ea1f986192
+depends =
+  ${perl-DBI:location}
+  ${perl-DBD-mariadb:location}
+pre-configure =
+  sed -i -e 's,^#!/usr/bin/env perl,#!perl,' bin/*
 configure-command =
   ${perl:location}/bin/perl Makefile.PL
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+make-options =
+  INSTALLSITESCRIPT=${:location}/bin

component/perl-DBI/buildout.cfg

@@ -10,3 +10,6 @@ url = http://www.cpan.org/modules/by-module/DBI/DBI-1.631.tar.gz
 md5sum = 444d3c305e86597e11092b517794a840
 configure-command =
   ${perl:location}/bin/perl Makefile.PL
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+make-options =
+  INSTALLSITESCRIPT=${:location}/bin

component/perl-Encode-HanExtra/Encode-HanExtra-0.23_use_shebang.patch

+--- Encode-HanExtra-0.23/Makefile.PL.orig	2017-04-14 13:22:30.511213646 +0200
++++ Encode-HanExtra-0.23/Makefile.PL	2017-04-14 13:22:41.935282773 +0200
+@@ -179,7 +179,7 @@
+         my $plib = $self->{PERL_CORE} ? '"-I$(PERL_LIB)"' : '';
+         my $ucopts = '-"Q"';
+         $str .=
+-          qq{\n\t\$(PERL) $plib $enc2xs $ucopts -o \$\@ -f $table.fnm\n\n};
++          qq{\n\t$enc2xs $ucopts -o \$\@ -f $table.fnm\n\n};
+         open(FILELIST, ">$table.fnm")
+           || die "Could not open $table.fnm: $!";
+         foreach my $file (@{ $tables{$table} }) {

component/perl-Encode-HanExtra/buildout.cfg

 [buildout]
 extends =
+  ../patch/buildout.cfg
   ../perl/buildout.cfg
 parts =
   perl-Encode-HanExtra
@@ -10,3 +11,8 @@ url = http://www.cpan.org/modules/by-module/Encode/Encode-HanExtra-0.23.tar.gz
 md5sum = e1d3bc32c1c8ee304235a06fbcd5d5a4
 configure-command =
   ${perl:location}/bin/perl Makefile.PL
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/Encode-HanExtra-0.23_use_shebang.patch#4ac804013a68a3e6b7c3bc4115d25a5e
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/perl-Net-IP/buildout.cfg

@@ -10,3 +10,6 @@ url = http://www.cpan.org/modules/by-module/Net/Net-IP-1.26.tar.gz
 md5sum = 3a98e3ac45d69ea38a63a7e678bd716d
 configure-command =
   ${perl:location}/bin/perl Makefile.PL
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+make-options =
+  INSTALLSITESCRIPT=${:location}/bin

component/perl-libwww-perl/buildout.cfg

@@ -35,3 +35,6 @@ url = http://www.cpan.org/modules/by-module/LWP/libwww-perl-6.06.tar.gz
 md5sum = 292496bd2a13da95903b383f59009200
 configure-command =
   ${perl:location}/bin/perl Makefile.PL
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+make-options =
+  INSTALLSITESCRIPT=${:location}/bin

component/pole/buildout.cfg

+[buildout]
+parts =
+  pole
+
+[pole]
+recipe = slapos.recipe.cmmi
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+url = https://bitbucket.org/dimin/pole/get/c15e513.tar.gz
+md5sum = 691a5d80863df868804c5a9defa0c8a6
+configure-command = true
+make-binary =
+make-options =
+make-targets = true
+post-install =
+  set -e -x
+  mkdir bin
+  cd pole
+  g++ -o ../bin/poledump pole.cpp poledump.cpp
+  mv ../bin '${:location}'

component/r-language/buildout.cfg

@@ -9,7 +9,6 @@ extends =
   ../zlib/buildout.cfg
 
 parts =
-  gcc-fortran
   r-language
 
 [r-language]
@@ -33,6 +32,6 @@ configure-options =
   --without-ICU
   --without-x
 environment =
-  PATH=${gcc-fortran:location}/bin:%(PATH)s
+  PATH=${gcc:location}/bin:%(PATH)s
   CPPFLAGS=-I${bzip2:location}/include -I${openblas:location}/include -I${pcre:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${xz-utils:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gcc-fortran:location}/lib -Wl,-rpath=${gcc-fortran:location}/lib -L${gcc-fortran:location}/lib64 -Wl,-rpath=${gcc-fortran:location}/lib64 -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openblas:location}/lib -Wl,-rpath=${openblas:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${xz-utils:location}/lib -Wl,-rpath=${xz-utils:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib -L${gcc:location}/lib64 -Wl,-rpath=${gcc:location}/lib64 -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openblas:location}/lib -Wl,-rpath=${openblas:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${xz-utils:location}/lib -Wl,-rpath=${xz-utils:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/r-language/software.cfg

@@ -8,7 +8,6 @@ extends =
 
 parts =
   eggs
-  gcc-fortran
   r-language
 
 [eggs]

component/rpy2/buildout.cfg

@@ -10,7 +10,7 @@ extends =
 # see ../manpy/buildout.cfg as an example
 
 [rpy2_env]
-PATH = ${gcc-fortran:location}/bin:${r-language:location}/bin:%(PATH)s
+PATH = ${gcc:location}/bin:${r-language:location}/bin:%(PATH)s
 
 [rpy2]
 recipe = zc.recipe.egg:custom
@@ -21,8 +21,8 @@ initialization =
   import os
   os.environ['PATH'] = '${r-language:location}/bin' + os.pathsep + os.environ.get('PATH', '')
 rpath =
-  ${gcc-fortran:location}/lib
-  ${gcc-fortran:location}/lib64
+  ${gcc:location}/lib
+  ${gcc:location}/lib64
   ${pcre:location}/lib
   ${readline:location}/lib
   ${xz-utils:location}/lib

component/scikit-learn/buildout.cfg

 [buildout]
 extends =
-  ../numpy/buildout.cfg
+  ../cython/buildout.cfg
+  ../numpy/openblas.cfg
   ../scipy/buildout.cfg
 
 parts =
@@ -16,6 +17,28 @@ environment = scikit-learn-env
 setup-eggs =
   ${numpy:egg}
   ${scipy:egg}
+rpath =
+  ${gcc:location}/lib
+  ${gcc:location}/lib64
+  ${openblas:location}/lib
+
+[scikit-learn-repository]
+recipe  = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+repository = https://github.com/scikit-learn/scikit-learn.git
+location = ${buildout:parts-directory}/scikit-learn
+
+[scikit-learn-develop]
+# This only work if we use zc.recipe.egg from zc.buildout 2 patched
+# by nexedi (zc.recipe.egg = 2.0.3+slapos001 and zc.buildout = 2.5.2+slapos003)
+recipe = zc.recipe.egg:develop
+egg = scikit-learn
+setup = ${scikit-learn-repository:location}
+environment = scikit-learn-env
+setup-eggs =
+  ${cython:egg}
+  ${numpy:egg}
+  ${scipy:egg}
 rpath =
   ${gcc-fortran:location}/lib
   ${gcc-fortran:location}/lib64

component/slapos/buildout.cfg

@@ -28,13 +28,7 @@ parts =
   py
   firewalld-patch
 
-extensions -=
-  buildout-versions
-
-extensions +=
-  slapos.rebootstrap
-
-show-picked-versions = true
+rebootstrap-directory = rebootstrap
 
 [environment]
 # Note: For now original PATH is appended to the end, as not all tools are
@@ -129,9 +123,3 @@ eggs =
     ${slapos:eggs}
 interpreter = py
 scripts = py
-
-[versions]
-setuptools = 28.8.0
-slapos.rebootstrap = 3.7
-zc.buildout = 2.5.2+slapos005
-zc.recipe.egg = 2.0.3+slapos002

component/tensorflow/buildout.cfg

@@ -13,7 +13,7 @@ parts =
 [numpy-egg]
 recipe = zc.recipe.egg
 initialization =
-  import scipy.stats # load our own libstdc++ explicitly at the very beginning
+  import scipy.spatial.ckdtree # load our own libstdc++ explicitly at the very beginning
 eggs =
   setuptools
   ${scipy:egg}
@@ -26,28 +26,16 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 recipe = plone.recipe.command
 stop-on-error = true
 repository = https://github.com/tensorflow/tensorflow
-tag = v0.12.0
+tag = v1.0.1
 git-binary = ${git:location}/bin/git
 patch-binary = ${patch:location}/bin/patch
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = export HOME=${:location}; (${:git-binary} clone --recurse-submodules --quiet -b ${:tag} ${:repository} ${:location}; cd ${buildout:parts-directory} ; ${:patch-binary} -p1 -d ${:_buildout_section_name_} < ${:_profile_base_location_}/tensorflow-v0.12.0.patch ) || (rm -fr ${:location}; exit 1)
-
-[template-tensorflow-bzl]
-recipe = slapos.recipe.template:jinja2
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-mode = 640
-filename = tensorflow.bzl
-template = ${:_profile_base_location_}/${:filename}.in
-rendered = ${:location}/${:filename}
-tf_extension_linkopts = '-lrt', '-Wl,-rpath=${gcc:location}/lib64'
-context =
-    key tf_extension_linkopts template-tensorflow-bzl:tf_extension_linkopts
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+command = export HOME=${:location}; (${:git-binary} clone --recurse-submodules --quiet -b ${:tag} ${:repository} ${:location}; cd ${buildout:parts-directory} ; ${:patch-binary} -p1 -d ${:_buildout_section_name_} < ${:_profile_base_location_}/tensorflow-v1.0.1.patch ) || (rm -fr ${:location}; exit 1)
 
 [cuda]
 tf_need_cuda = 1
 tf_cuda_version = 8.0
-tf_cudnn_version = 6.5
+tf_cudnn_version = 5.1.10
 tf_cuda_compute_capabilities = 5.2,6.1
 cuda_toolkit_path = /usr/local/cuda
 cudnn_install_path = /usr/local/cuda
@@ -55,7 +43,6 @@ cudnn_install_path = /usr/local/cuda
 [tensorflow-build]
 recipe = slapos.recipe.build
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-tensorflow-bzl-file-path = ${template-tensorflow-bzl:rendered}
 workdir = ${tensorflow-repository:location}
 gcc-bin = ${gcc:location}/bin
 gcc-lib = ${gcc:location}/lib
@@ -79,6 +66,9 @@ script =
                                   os.environ.get('LIBRARY_PATH') or '']),
          'PYTHON_BIN_PATH':self.options['numpy-python-command'],
          'PYTHON_LIB_PATH':self.options['python27-lib'],
+         'CC_OPT_FLAGS':'-march=native',
+         'TF_NEED_JEMALLOC':'1',
+         'TF_ENABLE_XLA':'0',
          'TF_NEED_GCP':'0',
          'TF_NEED_HDFS':'0',
          'TF_NEED_OPENCL':'0',
@@ -96,8 +86,6 @@ script =
   if not os.path.exists(env['CUDA_TOOLKIT_PATH']): env['TF_NEED_CUDA'] = '0'
   env['LD_LIBRARY_PATH'] = env['LIBRARY_PATH']
   env['LDFLAGS'] = '-lW,-rpath='+self.options['gcc-lib64']
-  shutil.copy(self.options['tensorflow-bzl-file-path'],
-              os.path.join(workdir, 'tensorflow', 'tensorflow.bzl'))
   call(['./configure'], cwd=workdir, env=env)
   bazel_command = (env['TF_NEED_CUDA'] == '1' and
     ['bazel', 'build', '-c', 'opt', '--copt', '-march=native', '--config', 'cuda', '-s', '--verbose_failures', '//tensorflow/tools/pip_package:build_pip_package']
@@ -116,7 +104,7 @@ egg = tensorflow
 script =
   os.makedirs(location)
   workdir = self.options['tensorflow-repository-path']
-  egg_name = 'tensorflow-0.12.0-py2.7-linux-x86_64.egg'
+  egg_name = 'tensorflow-1.0.1-py2.7-linux-x86_64.egg'
   dist_dir = os.path.join(workdir, 'dist')
   dest_dir = os.path.join(self.buildout['buildout']['eggs-directory'], egg_name)
   call(['bazel-bin/tensorflow/tools/pip_package/build_pip_package', dist_dir], cwd=workdir)

component/tensorflow/tensorflow-v0.12.0.patch

-diff -N -u -r tensorflow.orig/tensorflow/tools/pip_package/build_pip_package.sh tensorflow/tensorflow/tools/pip_package/build_pip_package.sh
---- tensorflow.orig/tensorflow/tools/pip_package/build_pip_package.sh   2017-01-04 12:16:06.540748399 +0900
-+++ tensorflow/tensorflow/tools/pip_package/build_pip_package.sh        2017-01-04 12:16:19.852748187 +0900
-@@ -136,7 +136,7 @@
-   pushd ${TMPDIR}
-   rm -f MANIFEST
-   echo $(date) : "=== Building wheel"
--  "${PYTHON_BIN_PATH:-python}" setup.py bdist_wheel ${GPU_FLAG} >/dev/null
-+  "${PYTHON_BIN_PATH:-python}" setup.py bdist_egg ${GPU_FLAG} >/dev/null
-   mkdir -p ${DEST}
-   cp dist/* ${DEST}
-   popd
-diff -N -u -r tensorflow.orig/tensorflow/tools/pip_package/setup.py tensorflow/tensorflow/tools/pip_package/setup.py
---- tensorflow.orig/tensorflow/tools/pip_package/setup.py       2017-01-04 12:16:06.540748399 +0900
-+++ tensorflow/tensorflow/tools/pip_package/setup.py    2017-01-04 12:17:29.836747073 +0900
-@@ -34,7 +34,7 @@
- REQUIRED_PACKAGES = [
-     'numpy >= 1.11.0',
-     'six >= 1.10.0',
--    'protobuf == 3.1.0',
-+    'protobuf == 3.1.0.post1',
- ]
- 
- project_name = 'tensorflow'
-diff -N -u -r tensorflow.orig/tensorflow/workspace.bzl tensorflow/tensorflow/workspace.bzl
---- tensorflow.orig/tensorflow/workspace.bzl    2017-01-04 12:16:06.568748399 +0900
-+++ tensorflow/tensorflow/workspace.bzl 2017-01-04 12:16:19.852748187 +0900
-@@ -228,9 +228,9 @@
- 
-   native.new_http_archive(
-     name = "zlib_archive",
--    url = "http://zlib.net/zlib-1.2.8.tar.gz",
--    sha256 = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d",
--    strip_prefix = "zlib-1.2.8",
-+    url = "https://github.com/madler/zlib/archive/v1.2.9.zip",
-+    sha256 = "819936ec260b679726f21dd9c1ef9c553ce0281988842c24a9c42652cbca698a",
-+    strip_prefix = "zlib-1.2.9",
-     build_file = str(Label("//:zlib.BUILD")),
-   )
- 

component/tensorflow/tensorflow-v1.0.1.patch

+diff --git a/tensorflow/tools/pip_package/build_pip_package.sh b/tensorflow/tools/pip_package/build_pip_package.sh
+index e2bee21..1df90c1 100755
+--- a/tensorflow/tools/pip_package/build_pip_package.sh
++++ b/tensorflow/tools/pip_package/build_pip_package.sh
+@@ -136,7 +136,7 @@ function main() {
+   pushd ${TMPDIR}
+   rm -f MANIFEST
+   echo $(date) : "=== Building wheel"
+-  "${PYTHON_BIN_PATH:-python}" setup.py bdist_wheel ${GPU_FLAG} >/dev/null
++  "${PYTHON_BIN_PATH:-python}" setup.py bdist_egg ${GPU_FLAG} >/dev/null
+   mkdir -p ${DEST}
+   cp dist/* ${DEST}
+   popd

component/tesseract/buildout.cfg

@@ -46,8 +46,7 @@ make-options =
   LIBTOOL=${libtool:location}/bin/libtool
 
 [tesseract-eng-traineddata]
-recipe = hexagonit.recipe.download
-ignore-existing = true
+recipe = slapos.recipe.build:download-unpacked
 strip-top-level-dir = true
 url = http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.01.eng.tar.gz
 md5sum = 89c139a73e0e7b1225809fc7b226b6c9

component/w3m/buildout.cfg

 [buildout]
 extends =
+  ../gettext/buildout.cfg
   ../garbage-collector/buildout.cfg
   ../ncurses/buildout.cfg
   ../openssl/buildout.cfg
@@ -39,7 +40,7 @@ patches =
   ${:_profile_base_location_}/w3m-0.5.2-gc72.patch#5a74b6379240c8dd1372efa7926c8bdc
 
 environment =
-  PATH=${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PATH=${gettext:location}/bin:${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig
   CPPFLAGS=-I${ncurses:location}/include/ -I${zlib:location}/include/ -I${garbage-collector:location}/include
   LDFLAGS=-Wl,--as-needed -L${garbage-collector:location}/lib -Wl,-rpath=${garbage-collector:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/wget/buildout.cfg

 [buildout]
 extends =
+  ../gettext/buildout.cfg
   ../openssl/buildout.cfg
   ../patch/buildout.cfg
   ../pcre/buildout.cfg
+  ../perl/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
@@ -28,7 +30,7 @@ patches =
   ${:_profile_base_location_}/wget-doc.makefile.patch#0d23cf1ee81268a94699aebbb26058e6
 
 environment =
-  PATH=${patch:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${gettext:location}/bin:${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${openssl:location}/lib
   CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include -I${pcre:location}/include

slapos/recipe/pbs.py

@@ -194,7 +194,7 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
 
         if [ -e %(backup_signature)s ]; then
           cd $BACKUP_DIR
-          find -type f ! -name backup.signature ! -wholename "./rdiff-backup-data/*" -print0 | xargs -P4 -0 sha256sum  | LC_ALL=C sort -k 66 > ../proof.signature
+          find -type f ! -name backup.signature ! -wholename "./rdiff-backup-data/*" -print0 | xargs -0 sha256sum  | LC_ALL=C sort -k 66 > ../proof.signature
           cmp backup.signature ../proof.signature || SUCCEEDED=false
           diff -ruw backup.signature ../proof.signature > ../backup.diff
           # XXX If there is a difference on the backup, we should publish the

slapos/recipe/random.py

@@ -120,7 +120,7 @@ class Password(object):
     if not passwd:
       passwd = self.generatePassword(int(options_get('bytes', '8')))
       self.update = self.install
-    self.passwd = passwd
+    self.passwd = passwd.strip('\n')
     # Password must not go into .installed file, for 2 reasons:
     # security of course but also to prevent buildout to always reinstall.
     options.get = lambda option, *args, **kw: passwd \

slapos/recipe/re6stnet/__init__.py

@@ -168,18 +168,6 @@ class Recipe(GenericBaseRecipe):
 
     self.generateCertificate()
 
-    wrapper = self.createFile(self.options['wrapper'], self.substituteTemplate(
-      self.getTemplateFilename('registry-run.in'), dict(
-          parameter='@%s' % self.options['config-file'],
-          pid_file=self.options['pid-file'],
-          command=self.options['command']
-        )
-      )
-    )
-    os.chmod(self.options['wrapper'], stat.S_IRWXU)
-
-    path_list.append(wrapper)
-
     registry_url = 'http://%s:%s/' % (self.options['ipv4'], self.options['port'])
     token_dict, add_token_dict, rm_token_dict = self.generateSlaveTokenList(
                                               self.slave_list, token_save_path)
@@ -204,13 +192,12 @@ class Recipe(GenericBaseRecipe):
 
     service_dict = dict(token_base_path=token_list_path,
                         token_json=token_save_path,
-                        db=self.options['db-path'],
                         partition_id=self.computer_partition_id,
                         computer_id=self.computer_id,
-                        registry_url=registry_url)
-    service_dict['server_url'] = self.server_url
-    service_dict['cert_file'] = self.cert_file
-    service_dict['key_file'] = self.key_file
+                        registry_url=registry_url,
+                        server_url=self.server_url,
+                        cert_file=self.cert_file,
+                        key_file=self.key_file)
 
     request_add = self.createPythonScript(
         self.options['manager-wrapper'].strip(),
@@ -218,55 +205,5 @@ class Recipe(GenericBaseRecipe):
       )
     path_list.append(request_add)
 
-    request_drop = self.createPythonScript(
-        self.options['drop-service-wrapper'].strip(),
-        '%s.re6stnet.requestRemoveToken' % __name__, service_dict
-      )
-    path_list.append(request_drop)
-
-    request_check = self.createPythonScript(
-        self.options['check-service-wrapper'].strip(),
-        '%s.re6stnet.checkService' % __name__, service_dict
-      )
-    path_list.append(request_check)
-
-    revoke_check = self.createPythonScript(
-        self.options['revoke-service-wrapper'].strip(),
-        '%s.re6stnet.requestRevoqueCertificate' % __name__, service_dict
-      )
-    path_list.append(revoke_check)
-
-    # Send connection parameters of slave instances
-    if token_dict:
-      self.slap.initializeConnection(self.server_url, self.key_file,
-        self.cert_file)
-      computer_partition = self.slap.registerComputerPartition(
-        self.computer_id,
-        self.computer_partition_id)
-
-      for slave_reference, token in token_dict.iteritems():
-        try:
-          status_file = os.path.join(token_list_path, '%s.status' % slave_reference)
-          status = self.readFile(status_file) or 'New token requested'
-          msg = status
-          if status == 'TOKEN_ADDED':
-            msg = 'Token is ready for use'
-          elif status == 'TOKEN_USED':
-            msg = 'Token not available, it has been used to generate re6stnet certificate.'
-
-          ipv6_file = os.path.join(token_list_path, '%s.ipv6' % slave_reference)
-          ipv6 = self.readFile(ipv6_file) or '::'
-
-          ipv4_file = os.path.join(token_list_path, '%s.ipv4' % slave_reference)
-          node_ipv4 = self.readFile(ipv4_file) or '0.0.0.0'
-
-          computer_partition.setConnectionDict(
-              {'token':token, '1_info':msg, 'ipv6': ipv6, 'ipv4': node_ipv4},
-              slave_reference)
-        except Exception:
-          self.logger.fatal("Error while sending slave %s informations: %s",
-             slave_reference, traceback.format_exc())
-
     return path_list
 
-

slapos/recipe/shellinabox.py

@@ -25,6 +25,7 @@
 #
 ##############################################################################
 from getpass import getpass
+import hmac
 import pwd
 import grp
 import os
@@ -33,19 +34,24 @@ import shlex
 from slapos.recipe.librecipe import GenericBaseRecipe
 
 def login_shell(args):
-  password = args['password']
-  
-  if (password != ''):
-    entered_password = getpass()
-  else:
-    entered_password = ''
+  password_file = args['password-file']
+  if password_file:
+    with open(password_file, 'r') as password_file:
+      password = password_file.read()
 
-  if entered_password != password:
-    return 1
+    if (password != ''):
+      entered_password = getpass()
+    else:
+      entered_password = ''
+
+    if not hmac.compare_digest(entered_password, password):
+      return 1
+    else:
+      commandline = shlex.split(args['shell'])
+      path = commandline[0]
+      os.execv(path, commandline)
   else:
-    commandline = shlex.split(args['shell'])
-    path = commandline[0]
-    os.execv(path, commandline)
+    return 1
 
 def shellinabox(args):
   certificate_dir = args['certificate_dir']
@@ -95,7 +101,7 @@ class Recipe(GenericBaseRecipe):
       self.options['login-shell'],
       '%s.login_shell' % __name__,
       {
-        'password': self.options['password'],
+        'password-file': self.options['password-file'],
         'shell': self.options['shell']
       }
     )

slapos/test/recipe/test_re6stnet.py

@@ -33,7 +33,6 @@ class Re6stnetTest(unittest.TestCase):
                 'ipv4': '127.0.0.1',
                 'port': '9201',
                 'pid-file': '/path/to/pid/file',
-                'db-path': '/path/to/db',
                 'command': '/path/to/command',
                 'manager-wrapper': os.path.join(self.base_dir, 'manager_wrapper'),
                 'drop-service-wrapper': os.path.join(self.base_dir, 'drop_wrapper'),
@@ -86,22 +85,10 @@ class Re6stnetTest(unittest.TestCase):
     self.assertIn("'key_file': '/path/to/key'", content)
     self.assertIn("'cert_file': '/path/to/cert'", content)
     self.assertIn("'server_url': 'http://server.com'", content)
-    self.assertIn("'db': '%s'" % self.options['db-path'], content)
     self.assertIn("'token_base_path': '%s'" % self.token_dir, content)
     self.assertIn("'registry_url': 'http://%s:%s/'" % (self.options['ipv4'],
                                                 self.options['port']), content)
   
-  def checkRegistryWrapper(self):
-    path = os.path.join(self.base_dir, 'wrapper')
-    self.assertTrue(os.path.exists(path))
-    content = ""
-    config_file = os.path.join(self.base_dir, 'config')
-    with open(path, 'r') as f:
-        content = f.read()
-    self.assertIn("@%s" % config_file, content)
-    self.assertIn("/path/to/pid/file", content)
-    self.assertIn("/path/to/command", content)
-
   def fake_generateCertificates(self):
     return
 
@@ -182,10 +169,6 @@ class Re6stnetTest(unittest.TestCase):
     self.assertEqual(token_dict['SOFTINST-58778'], second_add)
     
     self.checkWrapper(os.path.join(self.base_dir, 'manager_wrapper'))
-    self.checkWrapper(os.path.join(self.base_dir, 'drop_wrapper'))
-    self.checkWrapper(os.path.join(self.base_dir, 'check_wrapper'))
-    self.checkWrapper(os.path.join(self.base_dir, 'revoke_wrapper'))
-    self.checkRegistryWrapper()
     
     # Remove one element
     self.options.update({
@@ -226,8 +209,4 @@ class Re6stnetTest(unittest.TestCase):
     self.assertItemsEqual(os.listdir(self.options['token-dir']), [])
 
     self.checkWrapper(os.path.join(self.base_dir, 'manager_wrapper'))
-    self.checkWrapper(os.path.join(self.base_dir, 'drop_wrapper'))
-    self.checkWrapper(os.path.join(self.base_dir, 'check_wrapper'))
-    self.checkWrapper(os.path.join(self.base_dir, 'revoke_wrapper'))
-    self.checkRegistryWrapper()
 

software/agent/software.cfg

@@ -51,29 +51,29 @@ pycrypto = 2.6.1
 pycurl = 7.43.0
 slapos.recipe.download = 1.0
 slapos.recipe.template = 2.8
-slapos.toolbox = 0.65
+slapos.toolbox = 0.66
 smmap = 0.9.0
 
 # Required by:
-# slapos.toolbox = 0.65
+# slapos.toolbox = 0.66
 GitPython = 2.0.8
 
 # Required by:
-# slapos.toolbox = 0.65
+# slapos.toolbox = 0.66
 atomize = 0.2.0
 
 # Required by:
-# slapos.toolbox = 0.65
+# slapos.toolbox = 0.66
 feedparser = 5.2.1
 
 # Required by:
-# slapos.toolbox = 0.65
+# slapos.toolbox = 0.66
 lockfile = 0.12.2
 
 # Required by:
-# slapos.toolbox = 0.65
+# slapos.toolbox = 0.66
 paramiko = 2.0.1
 
 # Required by:
-# slapos.toolbox = 0.65
+# slapos.toolbox = 0.66
 rpdb = 0.1.5

software/apache-frontend/README.apache_frontend.rst

@@ -461,6 +461,6 @@ Solution 2 (IPv6 only)
 
 It is also possible to directly allow the service to listen on 80 and 443 ports using the following command:
 
-  setcap 'cap_net_bind_service=+ep' /opt/slapgrid/$APACHE_FRONTEND_SOFTWARE_RELEASE_MD5/parts/apache-2.2/bin/httpd
+  setcap 'cap_net_bind_service=+ep' /opt/slapgrid/$APACHE_FRONTEND_SOFTWARE_RELEASE_MD5/parts/apache/bin/httpd
 
 Then specify in the instance parameters "port" and "plain_http_port" to be 443 and 80, respectively.

software/apache-frontend/development.cfg

@@ -8,25 +8,12 @@
 [buildout]
 extends =
 # Extend in this order, otherwise "parts" will be taken from git profile
-  ../../component/git/buildout.cfg
   common.cfg
 
 parts +=
-  slapos.cookbook-repository
+  slapos.toolbox-dev
 
-develop =
-  ${:parts-directory}/slapos.cookbook-repository
-
-
-[slapos.cookbook-repository]
-recipe = slapos.recipe.build:gitclone
-repository = https://lab.nexedi.com/nexedi/slapos.git
-branch = master
-git-executable = ${git:location}/bin/git
-
-[check-recipe]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command =
-  grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
+[slapos.toolbox-dev]
+recipe = zc.recipe.egg:develop
+egg = slapos.toolbox
+setup = ${slapos.toolbox-repository:location}

software/apache-frontend/templates/trafficserver/records.config.jinja2

@@ -331,7 +331,7 @@ CONFIG proxy.config.cache.permit.pinning INT 0
    # default the ram cache size to AUTO_SIZE (-1) based on cache size
    #   (approximately 10 MB of RAM cache per GB of disk cache)
    # alternatively, set to a fixed value such as 21474836480 (20GB)
-CONFIG proxy.config.cache.ram_cache.size INT {{ slapparameter_dict.get('ram-cache-size', '1G') }}
+CONFIG proxy.config.cache.ram_cache.size INT {{ ats_configuration.get('ram-cache-size', '1G') }}
    # Replacement algorithm
    #  0 : Clocked Least Frequently Used by Size (CLFUS) w/optional compression
    #  1 : LRU w/o optional compression - trivially simple

software/apache-frontend/templates/trafficserver/storage.config.jinja2

-{{ trafficserver.get("cache-path") }} {{ trafficserver.get("disk-cache-size") }} volume={{ trafficserver.get("hostname") }}
+{{ ats_configuration.get("cache-path") }} {{ ats_configuration.get("disk-cache-size") }} volume={{ ats_configuration.get("hostname") }}
\ No newline at end of file