Merge branch 'master' of https://lab.nexedi.com/donkey-hotei/slapos

CHANGES.txt → CHANGES.rst

 Changes
 =======
 
+1.0.31 (2016-05-30)
+-------------------
+
+  * Implement cross recipe cache for registerComputerPartition
+  * Fixup! workarround for long shebang (place script on bin)  
+
+1.0.30 (2016-05-23)
+-------------------
+
+  * Implement a workarround for long shebang
+  * Implement Validation for user inputs ssl certificates 
+
+1.0.25 (2016-04-15)
+-------------------
+
+  * fixup slap configuration: provide instance and root instance title
+
+1.0.22 (2016-04-01)
+-------------------
+
+  * slap configuration: provide instance and root instance title
+
 1.0.16 (2015-10.27)
 -------------------
- * kvm recipe: fix bugs dowload image and disk creation
+
+  * kvm recipe: fix bugs dowload image and disk creation
 
 1.0.14 (2015-10.26)
+
 -------------------
- * kvm recipe: Allow to set keyboard layout language used by qemu and VNC
- * simplehttpserver-recipe: fix encoding error
+  * kvm recipe: Allow to set keyboard layout language used by qemu and VNC
+  * simplehttpserver-recipe: fix encoding error
 
 0.103 (2015-07-24)
 ------------------
+
   * kvm: fix issues with boolean parameters and add 'qed' in external disk format list.
   * simplehttpserver-recipe: Add support for POST method which only get content and save into specified file.
 
 0.102 (2015-05-22)
 ------------------
+
  * kvm-recipe: vm of kvm-cluster can get ipv4/hostname of all other vm in the same cluster
  * simplehttpserver-recipe: simple http server to serve files
 
 0.101 (2015-04-29)
 ------------------
+
  * kvm recipe: new parameters: external-disk-format, numa and cpu-options.
  * kvm recipe: allow guest VM to connect to host http service via a local predefined ipv4 address (guestfwd).
 
 0.100 (2015-04-20)
 ------------------
+
  * re6stnet recipe: re6st-registry log can now be reopened with SIGUSR1
  * re6stnet recipe: re6st certificate generation is improved.
 
 0.99 (2015-04-10)
 -----------------
+
  * re6stnet: new recipe to deploy re6st registry (re6st master) with slapos.
 
 0.98 (2015-04-09)
 -----------------
+
  * shellinabox: do not run in debug mode, it is much slower !
 
 0.97 (2015-03-26)
 -----------------
+
  * switch softwaretype recipe: the recipe is backward compatible with old slapos node packages.
  * kvm recipe: Avoid getting wrong storage path when creating kvm external disk
 
 0.96 (2015-03-20)
 -----------------
+
  * slap configuration: recipe can read from master network information releated to a tap interface
  * slap configuration: recipe will setup data folder in DATA directory of computer partition if disk is mounted
  * switch softwaretype recipe: also generate tap network information when they exist

MANIFEST.in

-include CHANGES.txt
-include slapos/recipe/apache_frontend/template/notfound.html
+include CHANGES.rst
 recursive-include slapos/recipe *.in
 recursive-include slapos/recipe *.bin
-recursive-include slapos/recipe README.*.txt
+recursive-include slapos/recipe README.*.rst
 recursive-include slapos/recipe *.js
 recursive-include slapos/recipe *.zcml

component/alsa/buildout.cfg

@@ -11,7 +11,6 @@ configure-options =
   --disable-static
   --disable-aload
   --disable-mixer
-  --disable-pcm
   --disable-rawmidi
   --disable-hwdep
   --disable-seq

component/apache-modsecurity/buildout.cfg

+[buildout]
+extends = 
+  ../pcre/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../curl/buildout.cfg
+  ../apache/buildout.cfg
+
+parts =
+  apache
+  apache-modsecurity
+
+[apache-modsecurity]
+recipe = slapos.recipe.cmmi
+url = https://www.modsecurity.org/tarball/2.9.1/modsecurity-2.9.1.tar.gz
+configure-command=${apache:location}/bin/apxs
+configure-options= -c ${apache-modsecurity:location}/apache2/modsecurity.c
+make-binary = ${:configure-command}
+configure =
+  --with-apxs=${apache:location}/bin/apxs
+  --with-pcre=${pcre:location}
+  --with-apr=${apr-util:location}
+  --with-curl=${curl:location}
+  --with-libxml=${libxml2:location}
+   

component/apache/buildout.cfg

@@ -9,6 +9,7 @@ extends =
   ../libuuid/buildout.cfg
   ../libxml2/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../pcre/buildout.cfg
   ../perl/buildout.cfg
   ../pkgconfig/buildout.cfg
@@ -17,12 +18,14 @@ extends =
 
 [apr]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 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
 version = 1.5.4
 url = https://archive.apache.org/dist/apr/apr-util-${:version}.tar.bz2
 md5sum = 2202b18f269ad606d70e1864857ed93c
@@ -106,6 +109,8 @@ configure-options = -c mod_antiloris.c
 make-binary = ${:configure-command}
 make-options = -i -a -n antiloris mod_antiloris.la
 make-targets =
+environment =
+  PATH=${patch:location}/bin:%(PATH)s
 
 [apache-2.2]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
@@ -163,7 +168,7 @@ configure-options = --disable-static
                     --without-iconv
 
 environment =
-  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
   CPPFLAGS =-I${libuuid:location}/include
   LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib

component/bash/buildout.cfg

@@ -4,6 +4,7 @@ parts =
 
 extends =
   ../ncurses/buildout.cfg
+  ../patch/buildout.cfg
 
 [bash]
 recipe = slapos.recipe.cmmi
@@ -45,3 +46,4 @@ configure-options =
 environment =
   CPPFLAGS=-I${ncurses:location}/include
   LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s

component/bison/buildout.cfg

 [buildout]
 extends =
   ../m4/buildout.cfg
+  ../perl/buildout.cfg
   ../xz-utils/buildout.cfg
 parts =
   bison
@@ -11,4 +12,4 @@ url = http://ftp.gnu.org/gnu/bison/bison-3.0.2.tar.xz
 md5sum = 146be9ff9fbd27497f0bf2286a5a2082
 environment =
   M4=${m4:location}/bin/m4
-  PATH=${xz-utils:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s

component/boa/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
 
 parts = boa
 
 [boa-patch-ENOSYS]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/www-servers/boa/files/boa-0.94.14_rc21-ENOSYS.patch?revision=1.1
 filename = boa-0.94.14_rc21-ENOSYS.patch
 md5sum = 7206b342195961501ed1eae38486e5db
@@ -35,3 +38,5 @@ script =
     os.chmod('%(location)s/bin/boa', 0755)
     shutil.copyfile(workdir + '/src/boa_indexer', '%(location)s/bin/boa_indexer')
     os.chmod('%(location)s/bin/boa_indexer', 0755)
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/busybox/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
 
 parts = busybox
 
@@ -19,3 +21,5 @@ script =
     self.logger.info("Installing")
     call(['make', 'CONFIG_PREFIX=%(location)s', 'install'], cwd=workdir, env=env)
     self.logger.info("Installation finished")
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/cclient/buildout.cfg

@@ -11,6 +11,7 @@ parts =
 
 [cclient-patch]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 download-only = true
 url = ${:_profile_base_location_}/imap-2007f.patch
 md5sum = 42c77fdd5d7a976fc302b93aadb3da98

component/cloud9/buildout.cfg

@@ -39,6 +39,7 @@ executable = ${:location}/bin/cloud9.js
 
 [cloud9-session-directory.patch]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ${:_profile_base_location_}/${:filename}
 filename = cloud9-session-directory.patch
 download-only = true
@@ -46,6 +47,7 @@ md5sum = 5dc8cc28447ed3747b8a53c768d872aa
 
 [cloud9-socket.patch]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ${:_profile_base_location_}/${:filename}
 filename = cloud9-socket.patch
 download-only = true
@@ -54,6 +56,7 @@ md5sum = c581456cb3a76841898f79f9600e3a1e
 [cloud9-file-already-exist.patch]
 # This patch prevents the error "File already exists"
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ${:_profile_base_location_}/${:filename}
 filename = cloud9-file_already_exist.patch
 download-only = true
@@ -63,6 +66,7 @@ md5sum = 0bc104af8176388d60cbf884b72c8318
 # This patch prevents cloud9 to die every
 # time a tab is closed
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ${:_profile_base_location_}/${:filename}
 filename = cloud9-removeAllListeners.patch
 download-only = true

component/cloudooo/buildout.eggversion.cfg

@@ -18,6 +18,7 @@ eggs =
   cloudooo.handler.pdf
   cloudooo.handler.ffmpeg
   cloudooo.handler.imagemagick
+  cloudooo.handler.wkhtmltopdf
   PasteScript
   python-magic
 entry-points =

component/coreutils/buildout.cfg

 [buildout]
 extends =
   ../gmp/buildout.cfg
+  ../perl/buildout.cfg
   ../xz-utils/buildout.cfg
 parts =
   coreutils-output
@@ -9,10 +10,8 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz
 md5sum = abed135279f87ad6762ce57ff6d89c41
-configure-options =
-  -enable-install-program=tr,basename,uname,cat,cp,ls
 environment =
-  PATH=${xz-utils:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
   LDFLAGS=-Wl,--as-needed -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib
 
 [coreutils-output]

component/curl/buildout.cfg

@@ -12,8 +12,8 @@ parts =
 
 [curl]
 recipe = slapos.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.47.0.tar.bz2
-md5sum = 85c58a00412476993050cb242a3f365d
+url = http://curl.haxx.se/download/curl-7.49.0.tar.bz2
+md5sum = 7416aaff4a9210b43edda7615ffa4169
 configure-options =
   --disable-static
   --disable-ldap

component/dbus/buildout.cfg

@@ -32,6 +32,6 @@ configure-options =
   --disable-gtk-doc-html
 environment =
   PATH=${pkgconfig:location}/bin:${glib:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${dbus:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${dbus:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
   CPPFLAGS=-I${libexpat:location}/include
   LDFLAGS=-L${libexpat:location}/lib -L${gettext:location}/lib -Wl,-rpath=${zlib:location}/lib

component/dcron/buildout.cfg

 [buildout]
 extends =
   ../coreutils/buildout.cfg
+  ../patch/buildout.cfg
 
 parts = dcron-output
 
@@ -15,6 +16,8 @@ patch-options = -p1
 make-options =
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
 post-make-hook = ${:_profile_base_location_}/dcron-hooks.py#860e914dff4108b47565965fe5ebc7b5:post_make_hook
+environment =
+  PATH=${patch:location}/bin:%(PATH)s
 
 [dcron-output]
 # Shared binary location to ease migration

component/dropbear/buildout.cfg

@@ -8,6 +8,7 @@
 extends =
   ../zlib/buildout.cfg
   ../coreutils/buildout.cfg
+  ../patch/buildout.cfg
 
 parts =
   dropbear-output
@@ -19,13 +20,16 @@ md5sum = 0284ea239083f04c8b874e08e1aca243
 #      in order have all patches working.
 url = http://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.bz2
 
+# NOTE DEFAULT_RECV_WINDOW and RECV_MAX_PAYLOAD_LEN are tweaked to support
+#      faster network throughput compared to dropbear defaults.
 configure-options =
   --with-zlib=${zlib:location}
-  CFLAGS="-DENABLE_SINGLEUSER -D__DIRTY_NO_SHELL_CHECKING"
+  CFLAGS="-DENABLE_SINGLEUSER -D__DIRTY_NO_SHELL_CHECKING -DDEFAULT_RECV_WINDOW=1048576 -DRECV_MAX_PAYLOAD_LEN=524288"
 
 environment =
   CPPFLAGS =-I${zlib:location}/include
   LDFLAGS =-Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s
 
 patches=
   ${:_profile_base_location_}/userspace.patch#3d934c2c90e8c57536a4fa2cf8ad216d

component/firefox/buildout.cfg

@@ -26,12 +26,12 @@ depends =
   ${liberation-fonts:location}
   ${ipaex-fonts:location}
 
-version = 40.0.2
+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 91005730fe4de7504e1d21d80e427377
-x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 2cf6af6369c01f9b49ad69aa12a705b4
+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(' ')

component/firewalld/buildout.cfg

@@ -18,6 +18,8 @@ extends =
   ../libffi/buildout.cfg
   ../flex/buildout.cfg
   ../bison/buildout.cfg
+  ../xz-utils/buildout.cfg
+  ../perl/buildout.cfg
 
 [firewalld]
 recipe = slapos.recipe.cmmi
@@ -30,8 +32,8 @@ pre-configure =
   ./autogen.sh
 
 environment =
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
-  PATH=${autoconf:location}/bin:${automake:location}/bin:${pkgconfig:location}/bin:${libtool:location}/bin:${intltool:location}/bin:${gettext:location}/bin:${glib:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${pkgconfig:location}/bin:${libtool:location}/bin:${intltool:location}/bin:${gettext:location}/bin:${glib:location}/bin:${perl:location}/bin:%(PATH)s
   CPPFLAGS=-I${gettext:location}/include
   LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
   PYTHON=${python2.7:location}/bin/python2.7
@@ -47,7 +49,7 @@ url = http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${:version}.t
 md5sum = b09cd2d1a057cc432ce944de3fc06bf7
 python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python2.7/site-packages
 environment =
-  PKG_CONFIG_PATH=${dbus:location}/lib/pkgconfig:${dbus-glib:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${dbus:location}/lib/pkgconfig:${dbus-glib:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
   DBUS_CFLAGS=-I${dbus:location}/include/dbus-1.0 -I${dbus:location}/lib/dbus-1.0/include
   DBUS_LIBS=-L${dbus:location}/lib -ldbus-1
@@ -71,7 +73,7 @@ configure-options =
 
 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
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
+  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
@@ -96,8 +98,8 @@ configure-options =
   --with-python=${python2.7:location}/bin/python2.7
 
 environment =
-  PATH=${pkgconfig:location}/bin:${libtool:location}/bin:${glib:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gobject-introspection:location}/lib/pkgconfig
+  PATH=${pkgconfig:location}/bin:${libtool:location}/bin:${glib:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gobject-introspection:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
   PYTHON=${python2.7:location}/bin/python2.7
   FFI_CFLAGS=-I${libffi:location}/include
   FFI_LIBS=-L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
@@ -111,6 +113,7 @@ environment =
 
 [trusted-config]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = https://raw.githubusercontent.com/t-woerner/firewalld/v0.3.14/config/zones/trusted.xml
 download-only = true
 filename = trusted.xml

component/fluentd/buildout.cfg

@@ -10,8 +10,11 @@ recipe = rubygemsrecipe
 url = https://rubygems.org/rubygems/rubygems-2.4.8.zip
 ruby-executable = ${ruby:location}/bin/ruby
 gems =
-  fluentd==0.12.15
+  fluentd==0.12.24
   fluent-plugin-td==0.10.27
+  fluent-plugin-wendelin==0.2
+  fluent-plugin-bin
+
 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

 [buildout]
+extends =
+  ../xz-utils/buildout.cfg
+
 parts =
   liberation-fonts
   ipaex-fonts
@@ -12,6 +15,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [fonts-base]
 destination = ${fonts:location}/${:_buildout_section_name_}
 recipe = hexagonit.recipe.download
+ignore-existing = true
 strip-top-level-dir = true
 
 # Liberation(tm) Fonts - a font family which aims at metric
@@ -43,6 +47,8 @@ md5sum = 9f2acd83291a31dbe053912f4115db75
 <= fonts-base
 url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/f/fonts-android/fonts-android_4.3.orig.tar.xz
 md5sum = 2d41d5342eb5f61591ddeec5b80da74d
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
 
 # Microsoft's TrueType core fonts
 # non-free so not enabled by default

component/gcc/buildout.cfg

@@ -3,6 +3,8 @@
 [buildout]
 extends =
   ../gmp/buildout.cfg
+  ../perl/buildout.cfg
+  ../tar/buildout.cfg
   ../xz-utils/buildout.cfg
 
 parts =
@@ -32,8 +34,8 @@ environment =
 
 [isl]
 recipe = slapos.recipe.cmmi
-url = ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-0.14.tar.bz2
-md5sum = acd347243fca5609e3df37dba47fd0bb
+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
@@ -42,8 +44,8 @@ environment =
 
 [gcc-common]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/gcc/gcc-5.2.0/gcc-5.2.0.tar.bz2
-md5sum = a51bcfeb3da7dd4c623e27207ed43467
+url = http://ftp.gnu.org/gnu/gcc/gcc-5.3.0/gcc-5.3.0.tar.bz2
+md5sum = c9616fd448f980259c31de613e575719
 # make install does not work when several core are used
 make-targets = install -j1
 
@@ -59,6 +61,7 @@ configure-options =
   --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
 
 [gcc-minimal]
 <= gcc-common
@@ -73,6 +76,7 @@ configure-options =
   --without-cloog
 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
@@ -86,3 +90,4 @@ configure-options =
   --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/gdal/buildout.cfg

@@ -10,6 +10,7 @@ extends =
   ../proj4/buildout.cfg
   ../sqlite3/buildout.cfg
   ../webp/buildout.cfg
+  ../xz-utils/buildout.cfg
 
 parts =
   gdal-python
@@ -34,6 +35,7 @@ configure-options =
   --with-wepb=${webp:location}
   --with-xml2=${libxml2:location}/bin/xml2-config
 environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${pcre:location}/include
   LDFLAGS=-L${pcre:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib -Wl,-rpath=${curl:location}/lib -Wl,-rpath=${geos:location}/lib -Wl,-rpath=${giflib:location}/lib -Wl,-rpath=${jasper:location}/lib -Wl,-rpath=${jbigkit:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libjpeg:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${libtiff:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${webp:location}/lib -Wl,-rpath=${zlib:location}/lib
 

component/geos/buildout.cfg

@@ -4,9 +4,9 @@ parts =
 
 [geos]
 recipe = slapos.recipe.cmmi
-version = 3.4.2
+version = 3.5.0
 url = http://download.osgeo.org/geos/geos-${:version}.tar.bz2
-md5sum = fc5df2d926eb7e67f988a43a92683bae
+md5sum = 136842690be7f504fba46b3c539438dd
 configure-options =
   --disable-dependency-tracking
   --disable-static

component/ghostscript/buildout.cfg

@@ -37,6 +37,7 @@ md5sum = aa125af368d89b3dbd15fc379f13375f
 
 [ghostscript-fonts]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = http://downloads.sourceforge.net/project/gs-fonts/gs-fonts/8.11%20%28base%2035%2C%20GPL%29/ghostscript-fonts-std-8.11.tar.gz
 md5sum = 6865682b095f8c4500c54b285ff05ef6
 strip-top-level-dir = true

component/git/buildout.cfg

@@ -9,6 +9,7 @@ extends =
   ../openssl/buildout.cfg
   ../pcre/buildout.cfg
   ../perl/buildout.cfg
+  ../tar/buildout.cfg
   ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
 parts =
@@ -16,8 +17,8 @@ parts =
 
 [git]
 recipe = slapos.recipe.cmmi
-url = https://www.kernel.org/pub/software/scm/git/git-2.7.0.tar.xz
-md5sum = 0214e04f7041f835c5c38f2b78eccced
+url = https://www.kernel.org/pub/software/scm/git/git-2.7.4.tar.xz
+md5sum = b0219fcb6d73104361f4fbdba3741d00
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}
@@ -28,7 +29,7 @@ configure-options =
 environment =
   NO_PYTHON=y
   NO_TCLTK=y
-  PATH=${curl:location}/bin:${gettext:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${curl:location}/bin:${gettext:location}/bin:${tar:location}/bin:${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib
 

component/glib/buildout.cfg

@@ -2,6 +2,7 @@
 extends =
   ../gettext/buildout.cfg
   ../libffi/buildout.cfg
+  ../pcre/buildout.cfg
   ../perl/buildout.cfg
   ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
@@ -10,8 +11,8 @@ parts =
 
 [glib]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/core/3.16/3.16.2/sources/glib-2.44.1.tar.xz
-md5sum = 83efba4722a9674b97437d1d99af79db
+url = http://ftp.gnome.org/pub/gnome/core/3.20/3.20.2/sources/glib-2.48.1.tar.xz
+md5sum = 67bd3b75c9f6d5587b457dc01cdcd5bb
 configure-options =
   --with-python=${python2.7:location}/bin/python2.7
   --disable-static
@@ -25,6 +26,8 @@ environment =
   LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
   LIBFFI_CFLAGS=-I${libffi:location}/include
   LIBFFI_LIBS= -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
+  PCRE_CFLAGS=-I${pcre:location}/include
+  PCRE_LIBS=-L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -lpcre
 
 [x86-cygwin-glib]
 patches =

component/glibmm/buildout.cfg

@@ -11,9 +11,10 @@ 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
-pkg_config_depends = ${glib:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig
+pkg_config_depends = ${glib:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
 configure-options =
   --disable-documentation
 environment =

component/gmp/buildout.cfg

@@ -10,7 +10,7 @@ parts =
 recipe = slapos.recipe.cmmi
 version = 6.1.0
 url = https://gmplib.org/download/gmp/gmp-${:version}.tar.xz
-md5sum = a9868ef2556ad6a2909babcd1428f3c7 
+md5sum = a9868ef2556ad6a2909babcd1428f3c7
 configure-options =
   --enable-cxx
   --disable-static

component/groonga/buildout.cfg

@@ -8,13 +8,14 @@ parts =
 extends =
   ../jemalloc/buildout.cfg
   ../libstemmer/buildout.cfg
+  ../patch/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
 
 [groonga]
 recipe = slapos.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-5.1.2.tar.gz
-md5sum = 04066b547f1f4dd869eb35ac52a2e88b
+url = http://packages.groonga.org/source/groonga/groonga-6.0.2.tar.gz
+md5sum = 10fde26350296a479953fd28679f2566
 # temporary patch to respect more tokens in natural language mode.
 patches =
   ${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b
@@ -29,16 +30,22 @@ configure-options =
   --with-libstemmer
   --with-libstemmer-include=${libstemmer:location}/include
   --with-libstemmer-lib=${libstemmer:location}/lib
+  --without-ruby
+  --without-inkscape
+  --without-lemon
+  --without-lz4
   --without-mecab
   --without-kytea
+  --without-libevent
 environment =
   CPPFLAGS=-I${libstemmer:location}/include -I${libstemmer:location}/include -I${zlib:location}/include
   LDFLAGS=-Wl,-rpath=${jemalloc:location}/lib -L${jemalloc:location}/lib -Wl,-rpath=${libstemmer:location}/lib -L${libstemmer:location}/lib -Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s
 
 [groonga-normalizer-mysql]
 recipe = slapos.recipe.cmmi
-url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.tar.gz
-md5sum = 0a0b523547999f90d347982fe9d03c0e
+url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.tar.gz
+md5sum = 5a93c0238da114e5f91db659ffd499b0
 location = ${groonga:location}
 configure-options =
   --disable-static

component/gtk-2/buildout.cfg

@@ -26,7 +26,7 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://cairographics.org/releases/cairo-1.14.2.tar.xz
 md5sum = e1cdfaf1c6c995c4d4c54e07215b0118
-pkg_config_depends = ${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${libpng:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${pixman:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
+pkg_config_depends = ${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${glib:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${libpng:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig
 configure-options =
   --disable-static
   --disable-gtk-doc-html
@@ -61,8 +61,8 @@ environment =
 
 [pango]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/core/3.14/3.14.2/sources/pango-1.36.8.tar.xz
-md5sum = 217a9a753006275215fa9fa127760ece
+url = http://ftp.gnome.org/pub/gnome/core/3.20/3.20.2/sources/pango-1.40.1.tar.xz
+md5sum = 6fc88c6529890d6c8e03074d57a3eceb
 pkg_config_depends = ${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}
 configure-options =
   --disable-static
@@ -75,9 +75,9 @@ environment =
 
 [gdk-pixbuf]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.32/gdk-pixbuf-2.32.1.tar.xz
-md5sum = b1590189a2e89fab9f871959c168508c
-pkg_config_depends = ${glib:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}
+url = http://ftp.gnome.org/pub/gnome/core/3.20/3.20.2/sources/gdk-pixbuf-2.35.1.tar.xz
+md5sum = 72e0c924d5dc96bfde58a3b65ed83744
+pkg_config_depends = ${glib:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}:${pcre:location}/lib/pkgconfig
 configure-options =
   --disable-static
   --disable-gtk-doc-html
@@ -92,21 +92,21 @@ environment =
 
 [atk]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/core/3.16/3.16.2/sources/atk-2.16.0.tar.xz
-md5sum = c7c5002bd6e58b4723a165f1bf312116
+url = http://ftp.gnome.org/pub/gnome/core/3.20/3.20.2/sources/atk-2.20.0.tar.xz
+md5sum = 5187b0972f4d3905f285540b31395e20
 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
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
+  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.16/3.16.2/sources/gtk+-2.24.28.tar.xz
-md5sum = bfacf87b2ea67e4e5c7866a9003e6526
+url = http://ftp.gnome.org/pub/gnome/core/3.20/3.20.2/sources/gtk+-2.24.30.tar.xz
+md5sum = 04568ba5c58b75e3c7543e45628ad789
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig
 configure-options =
   --disable-static

component/gtkmm/buildout.cfg

@@ -28,6 +28,7 @@ environment =
 
 [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
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${glibmm:location}/lib/pkgconfig:${glibmm:pkg_config_depends}:${cairomm:location}/lib/pkgconfig
@@ -41,9 +42,10 @@ environment =
 
 [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
-pkg_config_depends = ${glib:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${glibmm:location}/lib/pkgconfig:
+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

component/gzip/buildout.cfg

 [buildout]
 extends =
+  ../patch/buildout.cfg
   ../xz-utils/buildout.cfg
 parts =
   gzip
@@ -9,7 +10,7 @@ recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.6.tar.xz
 md5sum = da981f86677d58a106496e68de6f8995
 environment =
-  PATH=${xz-utils:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${xz-utils:location}/bin:%(PATH)s
 patch-options = -p1
 # The --rsyncable patch is from debian/ubuntu,
 # specifically https://launchpad.net/ubuntu/+source/gzip/1.6-3ubuntu1

component/haproxy/buildout.cfg

@@ -12,14 +12,14 @@ parts = haproxy
 
 [haproxy]
 recipe = slapos.recipe.cmmi
-url = http://www.haproxy.org/download/1.6/src/haproxy-1.6.1.tar.gz
-md5sum = 7343def2af8556ebc8972a9748176094
+url = http://www.haproxy.org/download/1.6/src/haproxy-1.6.5.tar.gz
+md5sum = 5290f278c04e682e42ab71fed26fc082
 configure-command = true
 # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
 # otherwise use "generic".
 # For ARCH value, x86_64 and i[3456]86 are supported.
 make-options =
-  TARGET="$(uname -sr 2>/dev/null|grep -Eq '^Linux (2\.6\.2[89]|2\.6\.[3-9]|3)' && echo linux2628 || echo generic)"
+  TARGET="$(uname -sr 2>/dev/null|grep -Eq '^Linux (2\.6\.2[89]|2\.6\.[3-9]|[3-9])' && echo linux2628 || echo generic)"
   ARCH="$(uname -m 2>/dev/null|grep -E '^(x86_64|i[3456]86)$')"
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
   USE_DL=1

component/icu/buildout.cfg

@@ -8,7 +8,10 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 url = http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz
 md5sum = ea93970a0275be6b42f56953cd332c17
 configure-command = source/configure
-configure-options = --prefix=${:location}
+configure-options =
+  --prefix=${:location}
+  --disable-static
+  --enable-rpath
 
 [icu]
 <= icu4c

component/imagemagick/buildout.cfg

@@ -17,6 +17,7 @@ extends =
   ../libxml2/buildout.cfg
   ../jasper/buildout.cfg
   ../jbigkit/buildout.cfg
+  ../patch/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../webp/buildout.cfg
   ../xz-utils/buildout.cfg
@@ -24,10 +25,10 @@ extends =
 
 [imagemagick]
 recipe = slapos.recipe.cmmi
-version = 6.8.9-1
-url = http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${:version}.tar.xz
-md5sum = bde038ae05fb20d29cebf88ab9cbdce5
-pkg_config_depends = ${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${xz-utils:location}/lib/pkgconfig
+version = 7.0.1-1
+url = https://www.imagemagick.org/download/releases/ImageMagick-${:version}.tar.xz
+md5sum = 24673d00fcc8aa00313eeca6aa20fd3c
+pkg_config_depends = ${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${lcms2:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig
 configure-options =
   --disable-static
   --without-x
@@ -37,30 +38,30 @@ configure-options =
   --without-dps
   --without-djvu
   --without-fftw
+  --without-flif
   --without-fpx
   --with-fontconfig
   --without-gslib
   --without-gvc
-  --without-lcms
-  --with-lcms2
+  --with-lcms
   --without-openjp2
   --without-lqr
   --without-lzma
   --without-openexr
   --without-pango
+  --without-raqm
   --without-rsvg
   --without-wmf
   --with-bzlib=${bzip2:location}
   --with-zlib=${zlib:location}
-  --with-ltdl-include=${libtool:location}/include
-  --with-ltdl-lib=${libtool:location}/lib
   --with-gs-font-dir=${ghostscript-fonts:location}
   --with-frozenpaths
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/imagemagick-6.6.6-1-no-gsx-gsc-probe.patch#3f28ecd9f6722cf2c3238ce6ec3d7a68
+  ${:_profile_base_location_}/safe_policy.patch#07889fefbd9b55f19b9136ed6c17aa8c
 environment =
-  PATH=${freetype:location}/bin:${ghostscript:location}/bin:${inkscape:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${freetype:location}/bin:${ghostscript:location}/bin:${inkscape:location}/bin:${libxml2:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
-  CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include -I${webp:location}/include -I${lcms2:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib -L${lcms2:location}/lib -Wl,-rpath=${lcms2:location}/lib
+  CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libtool:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include -I${webp:location}/include
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libtool:location}/lib -Wl,-rpath=${libtool:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib

component/imagemagick/safe_policy.patch

+--- ImageMagick-7.0.1-1/config/policy.xml.orig	2016-05-04 00:18:54.000000000 +0200
++++ ImageMagick-7.0.1-1/config/policy.xml	2016-05-06 08:22:30.002045742 +0200
+@@ -50,16 +50,25 @@
+ -->
+ <policymap>
+   <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
+-  <!-- <policy domain="resource" name="memory" value="2GiB"/> -->
+-  <!-- <policy domain="resource" name="map" value="4GiB"/> -->
+-  <!-- <policy domain="resource" name="width" value="10MP"/> -->
+-  <!-- <policy domain="resource" name="height" value="10MP"/> -->
+-  <!-- <policy domain="resource" name="area" value="1GB"/> -->
+-  <!-- <policy domain="resource" name="disk" value="16EB"/> -->
+-  <!-- <policy domain="resource" name="file" value="768"/> -->
+-  <!-- <policy domain="resource" name="thread" value="4"/> -->
+-  <!-- <policy domain="resource" name="throttle" value="0"/> -->
+-  <!-- <policy domain="resource" name="time" value="3600"/> -->
+-  <!-- <policy domain="system" name="precision" value="6"/> -->
++  <policy domain="resource" name="memory" value="2GiB"/>
++  <policy domain="resource" name="map" value="4GiB"/>
++  <policy domain="resource" name="width" value="10MP"/>
++  <policy domain="resource" name="height" value="10MP"/>
++  <policy domain="resource" name="area" value="1GB"/>
++  <policy domain="resource" name="disk" value="16EB"/>
++  <policy domain="resource" name="file" value="768"/>
++  <policy domain="resource" name="thread" value="4"/>
++  <policy domain="resource" name="throttle" value="0"/>
++  <policy domain="resource" name="time" value="3600"/>
++  <policy domain="system" name="precision" value="6"/>
+   <policy domain="cache" name="shared-secret" value="passphrase"/>
++  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
++  <policy domain="coder" rights="none" pattern="HTTPS" />
++  <policy domain="coder" rights="none" pattern="MSL" />
++  <policy domain="coder" rights="none" pattern="MVG" />
++  <policy domain="coder" rights="none" pattern="PLT" />
++  <policy domain="coder" rights="none" pattern="SHOW" />
++  <policy domain="coder" rights="none" pattern="TEXT" />
++  <policy domain="coder" rights="none" pattern="URL" />
++  <policy domain="coder" rights="none" pattern="WIN" />
+ </policymap>

component/inkscape/buildout.cfg

@@ -28,7 +28,7 @@ configure-options =
   --disable-static
 environment =
   PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${glibmm:location}/lib/pkgconfig:
+  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
 
 [inkscape]

component/ipython/buildout.cfg

@@ -2,6 +2,7 @@
 extends =
   ../numpy/buildout.cfg
   ../matplotlib/buildout.cfg
+  ../python-pyzmq/buildout.cfg
 
 parts =
   ipython
@@ -13,14 +14,18 @@ parts =
 recipe = zc.recipe.egg:custom
 egg = ipython
 environment = ipython-env
-setup-eggs = ${numpy:egg}
+setup-eggs =
+  ${numpy:egg}
+  ${python-pyzmq:egg}
 
 [ipython-notebook]
 recipe = zc.recipe.egg:scripts
 eggs = ipython[notebook]
   ${matplotlib:egg}
 environment = ipython-env
-setup-eggs = ${numpy:egg}
+setup-eggs =
+  ${numpy:egg}
+  ${python-pyzmq:egg}
 initialization =
   # https://github.com/ipython/ipython/issues/5420
   import os

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-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

 [buildout]
 extends =
   ../libjpeg/buildout.cfg
+  ../patch/buildout.cfg
 parts =
   jasper
 
@@ -16,6 +17,11 @@ patches =
   ${:_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
 configure-options =
   --disable-static
   --enable-shared
@@ -23,3 +29,4 @@ configure-options =
 environment =
   CPPFLAGS=-I${libjpeg:location}/include
   LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s

component/jbigkit/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+
 parts =
   jbigkit
 
@@ -16,3 +19,5 @@ patches =
 configure-command = true
 make-targets = lib pbm
 post-make-hook = ${:_profile_base_location_}/jbigkit-hooks.py#f1edb4ddd212d2d100d7ea8b2e42d21f:post_make_hook
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/json-c/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+
 parts =
   json-c
 
 [json-c-patch-base]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ${:_profile_base_location_}/${:filename}
 download-only = true
 
@@ -25,3 +29,5 @@ patch-options = -p1
 patches =
   ${json-c-patch-3859e99f50abe11a8dade28efa9ea3d99dfaac11:location}/${json-c-patch-3859e99f50abe11a8dade28efa9ea3d99dfaac11:filename}
   ${json-c-patch-89ae583a8624fad6be4a7d1da084b0c410e4fc63:location}/${json-c-patch-89ae583a8624fad6be4a7d1da084b0c410e4fc63:filename}
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/kerberos/buildout.cfg

@@ -8,6 +8,7 @@ extends =
 
 [kerberos-package]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.1-signed.tar
 md5sum = 76c6bed945c5771674357cfd4a08e3f5
 

component/kumo/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../tokyocabinet/buildout.cfg
   ../messagepack/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../zlib/buildout.cfg
 
 parts = kumo
@@ -24,3 +25,4 @@ configure-options =
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
   LDFLAGS=-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=${patch:location}/bin:%(PATH)s

component/leptonica/buildout.cfg

@@ -7,6 +7,7 @@ extends =
   ../libtiff/buildout.cfg
   ../webp/buildout.cfg
   ../giflib/buildout.cfg
+  ../patch/buildout.cfg
 
 [leptonica]
 recipe = slapos.recipe.cmmi
@@ -20,3 +21,4 @@ patches =
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libtiff:location}/include -I${webp:location}/include -I${giflib:location}/include
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib -L${giflib:location}/lib -Wl,-rpath=${giflib:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s

component/libatlas/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+
 parts =
   libatlas
 
 [lapack-download]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 version = 3.5.0
 filename = lapack-${:version}.tgz
 url = http://www.netlib.org/lapack/${:filename}
@@ -35,5 +39,5 @@ configure-options =
 make-options =
   -C build
 environment =
-  PATH=${gcc-fortran:location}/bin:%(PATH)s
+  PATH=${gcc-fortran:location}/bin:${patch:location}/bin:%(PATH)s
   LD_LIBRARY_PATH=${gcc-fortran:location}/lib:${gcc-fortran:location}/lib64

component/libdmtx/buildout.cfg

@@ -6,6 +6,7 @@ extends =
   ../bzip2/buildout.cfg
   ../imagemagick/buildout.cfg
   ../jbigkit/buildout.cfg
+  ../patch/buildout.cfg
   ../zlib/buildout.cfg
 parts =
   libdmtx
@@ -24,8 +25,11 @@ url = http://prdownloads.sourceforge.net/libdmtx/dmtx-utils-0.7.4.tar.bz2
 md5sum = b132ab9fb1d289869469b8bb4959a08a
 configure-options =
   --disable-static
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/imagemagick-7.patch#e0ec31041be5a4f3551ab84696671110
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${imagemagick:location}/lib/pkgconfig:${libdmtx:location}/lib/pkgconfig
   CPPFLAGS=-I${libdmtx:location}/include
   LDFLAGS=-Wl,-rpath=${jbigkit:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib

component/libdmtx/imagemagick-7.patch

+diff -ur dmtx-utils-0.7.4.orig/configure.ac dmtx-utils-0.7.4/configure.ac
+--- dmtx-utils-0.7.4.orig/configure.ac	2011-06-03 07:13:10.000000000 +0200
++++ dmtx-utils-0.7.4/configure.ac	2016-05-06 22:56:23.129582472 +0200
+@@ -60,7 +60,7 @@
+ fi
+ 
+ if test x$dmtxread = xyes -o x$dmtxwrite = xyes; then
+-   PKG_CHECK_MODULES(MAGICK, Wand >= 6.2.4, [], AC_MSG_ERROR([dmtxread/dmtxwrite requires Wand >= 6.2.4]))
++   PKG_CHECK_MODULES(MAGICK, MagickWand >= 6.2.4, [], AC_MSG_ERROR([dmtxread/dmtxwrite requires MagickWand >= 6.2.4]))
+    AC_SUBST(MAGICK_CFLAGS)
+    AC_SUBST(MAGICK_LIBS)
+ fi
+diff -ur dmtx-utils-0.7.4.orig/configure dmtx-utils-0.7.4/configure
+--- dmtx-utils-0.7.4.orig/configure	2011-06-03 07:13:53.000000000 +0200
++++ dmtx-utils-0.7.4/configure	2016-05-06 22:56:40.641701426 +0200
+@@ -11074,12 +11074,12 @@
+     pkg_cv_MAGICK_CFLAGS="$MAGICK_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Wand >= 6.2.4\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "Wand >= 6.2.4") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"MagickWand >= 6.2.4\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "MagickWand >= 6.2.4") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_MAGICK_CFLAGS=`$PKG_CONFIG --cflags "Wand >= 6.2.4" 2>/dev/null`
++  pkg_cv_MAGICK_CFLAGS=`$PKG_CONFIG --cflags "MagickWand >= 6.2.4" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -11090,12 +11090,12 @@
+     pkg_cv_MAGICK_LIBS="$MAGICK_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Wand >= 6.2.4\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "Wand >= 6.2.4") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"MagickWand >= 6.2.4\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "MagickWand >= 6.2.4") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_MAGICK_LIBS=`$PKG_CONFIG --libs "Wand >= 6.2.4" 2>/dev/null`
++  pkg_cv_MAGICK_LIBS=`$PKG_CONFIG --libs "MagickWand >= 6.2.4" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -11115,18 +11115,18 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        MAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "Wand >= 6.2.4" 2>&1`
++	        MAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "MagickWand >= 6.2.4" 2>&1`
+         else
+-	        MAGICK_PKG_ERRORS=`$PKG_CONFIG --print-errors "Wand >= 6.2.4" 2>&1`
++	        MAGICK_PKG_ERRORS=`$PKG_CONFIG --print-errors "MagickWand >= 6.2.4" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$MAGICK_PKG_ERRORS" >&5
+ 
+-	as_fn_error $? "dmtxread/dmtxwrite requires Wand >= 6.2.4" "$LINENO" 5
++	as_fn_error $? "dmtxread/dmtxwrite requires MagickWand >= 6.2.4" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-	as_fn_error $? "dmtxread/dmtxwrite requires Wand >= 6.2.4" "$LINENO" 5
++	as_fn_error $? "dmtxread/dmtxwrite requires MagickWand >= 6.2.4" "$LINENO" 5
+ else
+ 	MAGICK_CFLAGS=$pkg_cv_MAGICK_CFLAGS
+ 	MAGICK_LIBS=$pkg_cv_MAGICK_LIBS
+diff -ur dmtx-utils-0.7.4.orig/dmtxread/dmtxread.c dmtx-utils-0.7.4/dmtxread/dmtxread.c
+--- dmtx-utils-0.7.4.orig/dmtxread/dmtxread.c	2011-06-03 07:13:10.000000000 +0200
++++ dmtx-utils-0.7.4/dmtxread/dmtxread.c	2016-05-06 23:17:08.190667778 +0200
+@@ -114,7 +114,7 @@
+          }
+ 
+          /* Copy pixels to known format */
+-         success = MagickGetImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, pxl);
++         success = MagickExportImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, pxl);
+          if(success == MagickFalse || pxl == NULL) {
+             CleanupMagick(&wand, DmtxTrue);
+             FatalError(EX_OSERR, "malloc() error");
+diff -ur dmtx-utils-0.7.4.orig/dmtxread/dmtxread.h dmtx-utils-0.7.4/dmtxread/dmtxread.h
+--- dmtx-utils-0.7.4.orig/dmtxread/dmtxread.h	2011-06-03 07:13:10.000000000 +0200
++++ dmtx-utils-0.7.4/dmtxread/dmtxread.h	2016-05-06 23:01:38.871722717 +0200
+@@ -33,7 +33,7 @@
+ #include <math.h>
+ #include <stdarg.h>
+ #include <assert.h>
+-#include <wand/magick-wand.h>
++#include <MagickWand/MagickWand.h>
+ #include <dmtx.h>
+ #include "../common/dmtxutil.h"
+ 
+diff -ur dmtx-utils-0.7.4.orig/dmtxwrite/dmtxwrite.h dmtx-utils-0.7.4/dmtxwrite/dmtxwrite.h
+--- dmtx-utils-0.7.4.orig/dmtxwrite/dmtxwrite.h	2011-06-03 07:13:10.000000000 +0200
++++ dmtx-utils-0.7.4/dmtxwrite/dmtxwrite.h	2016-05-06 23:01:38.871722717 +0200
+@@ -34,7 +34,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <assert.h>
+-#include <wand/magick-wand.h>
++#include <MagickWand/MagickWand.h>
+ #include <dmtx.h>
+ #include "../common/dmtxutil.h"
+ 

component/libexpat/CVE-2015-1283-refix.patch

+From 29a11774d8ebbafe8418b4a5ffb4cc1160b194a1 Mon Sep 17 00:00:00 2001
+From: Pascal Cuoq <cuoq@trust-in-soft.com>
+Date: Sun, 15 May 2016 09:05:46 +0200
+Subject: [PATCH] Avoid relying on undefined behavior in CVE-2015-1283 fix. It
+ does not really work: https://godbolt.org/g/Zl8gdF
+
+---
+ expat/lib/xmlparse.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/lib/xmlparse.c b/lib/xmlparse.c
+index 13e080d..cdb12ef 100644
+--- a/lib/xmlparse.c
++++ b/lib/xmlparse.c
+@@ -1695,7 +1695,8 @@ XML_GetBuffer(XML_Parser parser, int len
+   }
+ 
+   if (len > bufferLim - bufferEnd) {
+-    int neededSize = len + (int)(bufferEnd - bufferPtr);
++    /* Do not invoke signed arithmetic overflow: */
++    int neededSize = (int) ((unsigned)len + (unsigned)(bufferEnd - bufferPtr));
+ /* BEGIN MOZILLA CHANGE (sanity check neededSize) */
+     if (neededSize < 0) {
+       errorCode = XML_ERROR_NO_MEMORY;
+@@ -1729,7 +1730,8 @@ XML_GetBuffer(XML_Parser parser, int len
+       if (bufferSize == 0)
+         bufferSize = INIT_BUFFER_SIZE;
+       do {
+-        bufferSize *= 2;
++        /* Do not invoke signed arithmetic overflow: */
++        bufferSize = (int) (2U * (unsigned) bufferSize);
+ /* BEGIN MOZILLA CHANGE (prevent infinite loop on overflow) */
+       } while (bufferSize < neededSize && bufferSize > 0);
+ /* END MOZILLA CHANGE */
+-- 
+2.8.2
+

component/libexpat/CVE-2015-1283.patch

+Description: fix multiple integer overflows in the XML_GetBuffer function
+ Multiple integer overflows in the XML_GetBuffer function in Expat through
+ 2.1.0, as used in Google Chrome before 44.0.2403.89 and other products,
+ allow remote attackers to cause a denial of service (heap-based buffer
+ overflow) or possibly have unspecified other impact via crafted XML data,
+ a related issue to CVE-2015-2716.
+Origin: Mozilla, https://hg.mozilla.org/releases/mozilla-esr31/rev/2f3e78643f5c
+Author: Eric Rahm <erahm@mozilla.com>
+Forwarded: not-needed
+Last-Update: 2015-07-24
+
+diff --git a/lib/xmlparse.c b/lib/xmlparse.c
+--- a/lib/xmlparse.c
++++ b/lib/xmlparse.c
+@@ -1673,29 +1673,40 @@ XML_ParseBuffer(XML_Parser parser, int l
+   XmlUpdatePosition(encoding, positionPtr, bufferPtr, &position);
+   positionPtr = bufferPtr;
+   return result;
+ }
+ 
+ void * XMLCALL
+ XML_GetBuffer(XML_Parser parser, int len)
+ {
++/* BEGIN MOZILLA CHANGE (sanity check len) */
++  if (len < 0) {
++    errorCode = XML_ERROR_NO_MEMORY;
++    return NULL;
++  }
++/* END MOZILLA CHANGE */
+   switch (ps_parsing) {
+   case XML_SUSPENDED:
+     errorCode = XML_ERROR_SUSPENDED;
+     return NULL;
+   case XML_FINISHED:
+     errorCode = XML_ERROR_FINISHED;
+     return NULL;
+   default: ;
+   }
+ 
+   if (len > bufferLim - bufferEnd) {
+-    /* FIXME avoid integer overflow */
+     int neededSize = len + (int)(bufferEnd - bufferPtr);
++/* BEGIN MOZILLA CHANGE (sanity check neededSize) */
++    if (neededSize < 0) {
++      errorCode = XML_ERROR_NO_MEMORY;
++      return NULL;
++    }
++/* END MOZILLA CHANGE */
+ #ifdef XML_CONTEXT_BYTES
+     int keep = (int)(bufferPtr - buffer);
+ 
+     if (keep > XML_CONTEXT_BYTES)
+       keep = XML_CONTEXT_BYTES;
+     neededSize += keep;
+ #endif  /* defined XML_CONTEXT_BYTES */
+     if (neededSize  <= bufferLim - buffer) {
+@@ -1714,17 +1725,25 @@ XML_GetBuffer(XML_Parser parser, int len
+     }
+     else {
+       char *newBuf;
+       int bufferSize = (int)(bufferLim - bufferPtr);
+       if (bufferSize == 0)
+         bufferSize = INIT_BUFFER_SIZE;
+       do {
+         bufferSize *= 2;
+-      } while (bufferSize < neededSize);
++/* BEGIN MOZILLA CHANGE (prevent infinite loop on overflow) */
++      } while (bufferSize < neededSize && bufferSize > 0);
++/* END MOZILLA CHANGE */
++/* BEGIN MOZILLA CHANGE (sanity check bufferSize) */
++      if (bufferSize <= 0) {
++        errorCode = XML_ERROR_NO_MEMORY;
++        return NULL;
++      }
++/* END MOZILLA CHANGE */
+       newBuf = (char *)MALLOC(bufferSize);
+       if (newBuf == 0) {
+         errorCode = XML_ERROR_NO_MEMORY;
+         return NULL;
+       }
+       bufferLim = newBuf + bufferSize;
+ #ifdef XML_CONTEXT_BYTES
+       if (bufferPtr) {
+
+
+
+

component/libexpat/buildout.cfg

@@ -2,9 +2,19 @@
 parts =
   libexpat
 
+extends =
+  ../patch/buildout.cfg
+
 [libexpat]
 recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/project/expat/expat/2.1.0/expat-2.1.0.tar.gz
 md5sum = dd7dab7a5fea97d2a6a43f511449b7cd
 configure-options =
   --disable-static
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/CVE-2015-1283.patch#44b31d7377035591f37ad94a31a8042b
+  ${:_profile_base_location_}/CVE-2015-1283-refix.patch#47382fe30c9a49724c626cef793ef382
+  ${:_profile_base_location_}/CVE-2016-0718-v2-2-1.patch#4ee57e7a052ada99f2e11fa21a229727
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/libffi/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+
 parts =
   libffi
 
@@ -16,3 +19,5 @@ configure-options =
 # on x86_64 OpenSuse, libraries are installed under parts/libffi/lib64.
 make-targets =
   install && cp -av ${:location}/lib64/* ${:location}/lib/ || true
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/libiconv/buildout.cfg

@@ -4,6 +4,7 @@ parts =
 
 [libiconv.gets.patch]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ${:_profile_base_location_}/${:filename}
 md5sum = 8a20d8afe0617fce56f77537d2b84621
 download-only = true

component/libreoffice-bin/buildout.cfg

@@ -9,14 +9,14 @@ parts =
 [libreoffice-bin]
 recipe = slapos.recipe.build
 # here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
-version = 5.0.0.5
+version = 5.1.0.3
 url = http://downloadarchive.documentfoundation.org/libreoffice/old/${:version}/rpm/%s/LibreOffice_${:version}_Linux_%s_rpm.tar.gz
 # supported architectures md5sums
-md5sum_x86 = d54ebe17b34f39446762e73fc3d31277
-md5sum_x86-64 = 6e1c97eaa221748e328c80470d296583
+md5sum_x86 = 32440c65e746c4816391fa9bb086d526
+md5sum_x86-64 = d649918b6e59fd84b16d8572a27ca19a
 
 # where office code can be found?
-officedir = libreoffice5.0
+officedir = libreoffice5.1
 
 # script to install
 script =

component/librsvg/buildout.cfg

@@ -10,19 +10,19 @@ extends =
 
 [libcroco]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/libcroco-0.6.8.tar.xz
-md5sum = 767e73c4174f75b99695d4530fd9bb80
+url = http://ftp.gnome.org/pub/gnome/core/3.20/3.20.2/sources/libcroco-0.6.11.tar.xz
+md5sum = dabc1911dfbfa85f8e6859ca47863168
 configure-options =
   --disable-static
 environment =
   PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${pkgconfig:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pkgconfig:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
   LDFLAGS=-Wl,-rpath=${zlib:location}/lib
 
 [librsvg]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/core/3.16/3.16.2/sources/librsvg-2.40.9.tar.xz
-md5sum = 31df15e3beaa8fbbf538ca3c52b400d2
+url = http://ftp.gnome.org/pub/gnome/core/3.20/3.20.2/sources/librsvg-2.40.15.tar.xz
+md5sum = 3a66ab5b4fe1fb43b471708e4ff39a0e
 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

@@ -9,6 +9,7 @@ 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
 configure-options =

component/libsodium/buildout.cfg

+[buildout]
+parts =
+  libsodium
+
+[libsodium]
+recipe = slapos.recipe.cmmi
+url = https://download.libsodium.org/libsodium/releases/libsodium-1.0.8.tar.gz
+md5sum = 0a66b86fd3aab3fe4c858edcd2772760
+configure-options =
+  --disable-static

component/libstemmer/buildout.cfg

 # libstemmer
 # http://snowball.tartarus.org/
 
+[buildout]
+extends =
+  ../patch/buildout.cfg
+
 [libstemmer]
 recipe = slapos.recipe.cmmi
 url = http://snowball.tartarus.org/dist/libstemmer_c.tgz
@@ -11,4 +15,5 @@ patches =
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-command = true
 make-options = DESTDIR=${:location}
-
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/libtasn1/buildout.cfg

@@ -4,8 +4,8 @@ parts =
 
 [libtasn1]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/libtasn1/libtasn1-4.7.tar.gz
-md5sum = 12d10ca4ae0a3b95f7aa06a076da39ec
+url = http://ftp.gnu.org/gnu/libtasn1/libtasn1-4.8.tar.gz
+md5sum = 9a6767705725544f2b86670dcfb34107
 configure-options =
   --disable-static
   --disable-gtk-doc-html

component/libtiff/buildout.cfg

@@ -2,6 +2,7 @@
 extends =
   ../libjpeg/buildout.cfg
   ../jbigkit/buildout.cfg
+  ../patch/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -22,3 +23,4 @@ configure-options =
 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
+  PATH=${patch:location}/bin:%(PATH)s

component/libxml2/buildout.cfg

@@ -11,8 +11,8 @@ parts =
 
 [libxml2]
 recipe = slapos.recipe.cmmi
-url = http://xmlsoft.org/sources/libxml2-2.9.3.tar.gz
-md5sum = daece17e045f1c107610e137ab50c179
+url = http://xmlsoft.org/sources/libxml2-2.9.4.tar.gz
+md5sum = ae249165c173b1ff386ee8ad676815f5
 configure-options =
   --disable-static
   --without-python

component/libxslt/buildout.cfg

@@ -7,8 +7,8 @@ parts =
   libxslt
 
 [libxslt]
-url = ftp://xmlsoft.org/libxslt/libxslt-1.1.28.tar.gz
-md5sum = 9667bf6f9310b957254fdcf6596600b7
+url = ftp://xmlsoft.org/libxslt/libxslt-1.1.29.tar.gz
+md5sum = a129d3c44c022de3b9dcf6d6f288d72e
 recipe = slapos.recipe.cmmi
 configure-options =
   --disable-static

component/libzmq/buildout.cfg

+[buildout]
+extends =
+  ../libsodium/buildout.cfg
+  ../pkgconfig/buildout.cfg
+
+parts =
+  libzmq
+
+[libzmq]
+recipe = slapos.recipe.cmmi
+url = http://download.zeromq.org/zeromq-4.1.4.tar.gz
+md5sum = a611ecc93fffeb6d058c0e6edf4ad4fb
+configure-options =
+  --without-documentation
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${libsodium:location}/lib/pkgconfig

component/logrotate/buildout.cfg

 [buildout]
 extends =
+  ../patch/buildout.cfg
   ../popt/buildout.cfg
 parts = logrotate
 
@@ -13,4 +14,5 @@ patches =
 configure-command = true
 make-options = PREFIX=${buildout:parts-directory}/${:_buildout_section_name_} 
 environment =
+  PATH=${patch:location}/bin:%(PATH)s
   POPT_DIR=${popt:location}/include -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib

component/lxc/buildout.cfg

@@ -12,6 +12,7 @@ parts = lxc
 
 [lxc-0.8.0-rc2-libexecdir-patch]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ${:_profile_base_location_}/${:filename}
 filename = libexecdir-fix.patch
 download-only = true
@@ -19,6 +20,7 @@ md5sum = d674463ccb3a7c205c2326fb4ab5436b
 
 [lxc-0.8.0-rc2-lxc-ls-patch]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ${:_profile_base_location_}/${:filename}
 filename = lxc-ls-fix.patch
 download-only = true
@@ -26,6 +28,7 @@ md5sum = 28c155a554d4f4856351085494585c73
 
 [lxc-0.8.0-rc2-cap_get_flag-patch]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ${:_profile_base_location_}/${:filename}
 filename = cap_get_flag-fix.patch
 download-only = true

component/make/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+
 parts =
   make
 
@@ -16,3 +19,5 @@ md5sum = 7c93b1ab4680eb21c2c13f4f47741e2d
 patches =
   ${:_profile_base_location_}/make-dfsg_3.81-8.2.diff#fa77bb989a096fafbe7c78582e9415e3
 patch-options = -p1
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/manpy/buildout.cfg

@@ -4,7 +4,7 @@ extends =
   ../rpy2/buildout.cfg
   ../pulp/buildout.cfg
   ../git/buildout.cfg
-  ../mysql-python/buildout.cfg
+  ../python-mysqlclient/buildout.cfg
 
 parts = 
   manpy
@@ -32,7 +32,7 @@ eggs = dream
 environment = manpy-env
 setup-eggs =
   ${scipy:egg}
-  ${mysql-python:egg}
+  ${python-mysqlclient:egg}
 initialization =
   ${pulp:initialization}
   ${rpy2:initialization}

component/mariadb/buildout.cfg

@@ -10,6 +10,7 @@ extends =
   ../libxml2/buildout.cfg
   ../ncurses/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../pcre/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../readline/buildout.cfg
@@ -21,9 +22,9 @@ parts =
 
 [mariadb]
 recipe = slapos.recipe.cmmi
-version = 10.1.11
-url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
-md5sum = c199608ae4282f16007dc8c270ff2439
+version = 10.1.14
+url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb/?serve
+md5sum = 294925531e0fd2f0461e3894496a5adc
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 patch-options = -p0
 patches =
@@ -60,6 +61,7 @@ environment =
   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
   CMAKE_LIBRARY_PATH=${libaio: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
   LDFLAGS=-L${jemalloc:location}/lib -Wl,-rpath=${jemalloc:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${pcre:location}/lib -L${xz-utils:location}/lib -L${zlib:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s
 post-install =
   mkdir -p ${:location}/include/wsrep &&
   cp -p wsrep/wsrep_api.h ${:location}/include/wsrep
@@ -68,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-5.12.tar.gz
-md5sum = b42816754058114de708e1da028399bd
+url = http://packages.groonga.org/source/mroonga/mroonga-6.02.tar.gz
+md5sum = a7c6320e273eaa407860cac11970dae8
 pre-configure =
   mkdir fake_mariadb_source &&
   ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql
@@ -80,9 +82,9 @@ configure-options =
   --disable-document
 patch-options = -p1
 patches =
-  ${:_profile_base_location_}/mroonga_boolean.patch#36645770ae612515b74b90884ecc59fc
+  ${:_profile_base_location_}/mroonga_boolean.patch#29f85fc98e85d39b31e53b1e1683d288
 environment =
-  PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PATH=${groonga:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${groonga:location}/include/groonga -I${pcre:location}/include
   LDFLAGS=-L${groonga:location}/lib
   PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig:${groonga-normalizer-mysql:location}/lib/pkgconfig

component/mariadb/mroonga_boolean.patch

 diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
-index dd9967d..c105a62 100644
+index 06691fb..b59e685 100644
 --- a/ha_mroonga.cpp
 +++ b/ha_mroonga.cpp
-@@ -7678,7 +7678,7 @@ grn_rc ha_mroonga::generic_ft_init_ext_prepare_expression_in_boolean_mode(
+@@ -8283,7 +8283,7 @@ grn_rc ha_mroonga::generic_ft_init_ext_prepare_expression_in_boolean_mode(
  
-   const char *keyword, *keyword_original;
-   uint keyword_length, keyword_length_original;
+   const char *keyword = NULL;
+   uint keyword_length = 0;
 -  grn_operator default_operator = GRN_OP_OR;
 +  grn_operator default_operator = GRN_OP_ADJUST;
-   grn_bool weight_specified = false;
-   keyword = keyword_original = key->ptr();
-   keyword_length = keyword_length_original = key->length();
+   grn_expr_flags expression_flags = 0;
+   generic_ft_init_ext_parse_pragma(info,
+                                    key,

component/membase/buildout.cfg

@@ -31,6 +31,7 @@ md5sum = c933fffea299d00e43b002cb65738663
 
 [membase-source-common]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 strip-top-level-dir = true
 
 [membase-component-common]

component/memcached/buildout.cfg

@@ -7,6 +7,7 @@ extends =
 
 [memcached-fix-array-subscript-is-above-array-bounds]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ${:_profile_base_location_}/${:filename}
 filename = memcached-1.4-fix-array-subscript-is-above-array-bounds.patch
 download-only = true
@@ -14,6 +15,7 @@ md5sum = 472508b9a4b6c0b9f5d6f2abce3444e3
 
 [memcached-gcc-4.4.patch]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ${:_profile_base_location_}/${:filename}
 filename = memcached-gcc-4.4.patch
 download-only = true

component/mysql-5.1/buildout.cfg

@@ -16,6 +16,7 @@ parts =
 
 [mysql-5.1-sphinx-patch]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ${:_profile_base_location_}/${:filename}
 md5sum = eefcd08c400c58d3e89542ab482a8429
 filename = mysql-5.1-sphinx-2.0.1-beta.diff
@@ -23,6 +24,7 @@ download-only = true
 
 [mysql-5.1-no_test-patch]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ${:_profile_base_location_}/${:filename}
 md5sum = 22b0ef8baec5efc182e10d233c6f14ca
 filename = mysql_create_system_tables__no_test.patch

component/mysql-5.5/buildout.cfg

@@ -19,6 +19,7 @@ parts =
 # MySQL-5.5 in
 # http://code.google.com/p/sphinxsearch/source/detail?r=2921
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ${:_profile_base_location_}/${:filename}
 md5sum = 04549822ebfa91b5f84025ff49ef24c2
 filename = mysql-5.5-sphinx-2.0.1-beta.diff
@@ -26,6 +27,7 @@ download-only = true
 
 [mysql-5.5-no_test-patch]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ${:_profile_base_location_}/${:filename}
 md5sum = bb7ee34b9a98da1f913566c63ffbc6f5
 filename = mysql_create_system_tables__no_test.patch

component/mysql-tritonn-5.0/buildout.cfg

@@ -37,6 +37,7 @@ environment =
 
 [mysql-5.0-tritonn-patch]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = http://dl.sourceforge.jp/tritonn/44472/${:filename}
 md5sum = 257abe9c4afdc9b08033687fd486a595
 filename = tritonn-1.0.12-mysql-5.0.87.diff
@@ -44,6 +45,7 @@ download-only = true
 
 [mysql-5.0-sphinx-patch]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ${:_profile_base_location_}/${:filename}
 md5sum = 4ca071cde319213a213ab3605e326d1c
 filename = mysql-5.0.87-sphinx-1.10.diff

component/nettle/buildout.cfg

@@ -2,6 +2,7 @@
 extends =
   ../gmp/buildout.cfg
   ../m4/buildout.cfg
+  ../patch/buildout.cfg
 
 [nettle]
 recipe = slapos.recipe.cmmi
@@ -15,6 +16,6 @@ configure-option =
   --disable-openssl
   --disable-documentation
 environment =
-  PATH=${m4:location}/bin:%(PATH)s
+  PATH=${m4:location}/bin:${patch:location}/bin:%(PATH)s
   CPPFLAGS=-I${gmp:location}/include
   LDFLAGS=-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib

component/nginx/buildout.cfg

@@ -11,15 +11,15 @@ parts = nginx-output
 
 [nginx-common]
 recipe = slapos.recipe.cmmi
-url = http://nginx.org/download/nginx-1.9.4.tar.gz
-md5sum = 27322fbb4b265c0e0cc548f5e6b7f201
+url = http://nginx.org/download/nginx-1.10.1.tar.gz
+md5sum = 088292d9caf6059ef328aa7dda332e44
 
 [nginx]
 <= nginx-common
 configure-options=
   --with-ipv6
   --with-http_ssl_module
-  --with-http_spdy_module
+  --with-http_v2_module
   --with-http_gzip_static_module
   --with-mail
   --with-mail_ssl_module
@@ -28,6 +28,7 @@ configure-options=
 
 [nginx-dav-ext-module]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = https://github.com/arut/nginx-dav-ext-module/archive/v0.0.3.tar.gz
 strip-top-level-dir = true
 md5sum = 2cb502dbda335be4ebd5fed0b3182bae
@@ -38,7 +39,7 @@ mode = 0644
 configure-options =
   --with-ipv6
   --with-http_ssl_module
-  --with-http_spdy_module
+  --with-http_v2_module
   --with-http_gzip_static_module
   --with-mail
   --with-mail_ssl_module
@@ -59,6 +60,7 @@ mime = ${nginx:location}/conf/mime.types
 
 [hexaglobe-nginx-module]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = http://easicloud-p.cdn.hexaglobe.net/nginx-easicloud.tar.gz
 md5sum = 57fe2ceb09740f22b5b1023f29889e0e
 strip-top-level-dir = true

component/nltk/buildout.cfg

+[nltk]
+recipe = zc.recipe.egg
+eggs = nltk
+interpreter = py-nltk
+nltk-patches = ${:_profile_base_location_}/nltk-data-path.patch#8719f78f05ac70752b4e64fe086e36e2
+nltk-patch-options = -p1
+
+[nltk-data]
+recipe = plone.recipe.command
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+# You can override the collection like 'collection = aaa bbb ccc'
+collection = all
+command = ${buildout:bin-directory}/${nltk:interpreter} -m nltk.downloader -- -d ${:location} ${:collection}

component/nltk/nltk-data-path.patch

+diff -ur nltk-3.2.orig/nltk/data.py nltk-3.2/nltk/data.py
+--- nltk-3.2.orig/nltk/data.py	2016-03-02 22:56:32.000000000 +0100
++++ nltk-3.2/nltk/data.py	2016-03-13 18:00:32.192142493 +0100
+@@ -77,6 +77,9 @@
+ if 'APPENGINE_RUNTIME' not in os.environ and os.path.expanduser('~/') != '~/':
+     path.append(os.path.expanduser(str('~/nltk_data')))
+ 
++path += [os.path.join(os.path.dirname(os.path.abspath(__file__)),
++                      '..', '..', '..', 'parts', 'nltk-data')]
++
+ if sys.platform.startswith('win'):
+     # Common locations on Windows:
+     path += [

component/noVNC/buildout.cfg

@@ -4,6 +4,7 @@ parts =
 
 [noVNC]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 # version-0.5.1 release from 29 Nov 2014
 url = https://github.com/kanaka/noVNC/archive/v0.5.1.tar.gz
 md5sum = ac55b2316b2164b6e09ae3bd89c37cb6

component/nodejs/buildout.cfg

@@ -9,13 +9,65 @@ parts =
   nodejs
 
 [nodejs]
-<= nodejs-0.10
+<= nodejs-0.12
+
+[nodejs-5]
+# Server-side Javascript.
+recipe = slapos.recipe.cmmi
+version = v5.9.1
+url = http://nodejs.org/dist/${:version}/node-${:version}.tar.gz
+md5sum = 346c9325912271dc7614fe955c75c3a6
+configure-options =
+  --shared-openssl
+  --shared-openssl-includes=${openssl:location}/include
+  --shared-openssl-libpath=${openssl:location}/lib
+environment =
+  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+
+[nodejs-4]
+# Server-side Javascript.
+recipe = slapos.recipe.cmmi
+version = v4.4.1
+url = http://nodejs.org/dist/${:version}/node-${:version}.tar.gz
+md5sum = ef756c3e773f08bccada08eb37ee699c
+configure-options =
+  --shared-openssl
+  --shared-openssl-includes=${openssl:location}/include
+  --shared-openssl-libpath=${openssl:location}/lib
+environment =
+  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+
+[nodejs-0.12]
+# Server-side Javascript.
+recipe = slapos.recipe.cmmi
+version = v0.12.12
+url = http://nodejs.org/dist/${:version}/node-${:version}.tar.gz
+md5sum = 366f3f65352e6887cc6c06aa96c25c3c
+configure-options =
+  --openssl-includes=${openssl:location}/include
+  --openssl-libpath=${openssl:location}/lib
+environment =
+  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+
 
 [nodejs-0.10]
 # Server-side Javascript.
 recipe = slapos.recipe.cmmi
-url = http://nodejs.org/dist/v0.10.36/node-v0.10.36.tar.gz
-md5sum = 4b3527b830f2dacaba01aececd509c6f
+version = v0.10.43
+url = http://nodejs.org/dist/${:version}/node-${:version}.tar.gz
+md5sum = 2356f55d70a013d7952aad17c25cbcfe
 configure-options =
   --openssl-includes=${openssl:location}/include
   --openssl-libpath=${openssl:location}/lib

component/nspr/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+
 parts = nspr
 
 [nspr-pkgconfig-patch-download]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 filename = nspr-4.8.6-pkgconfig-1.patch
 url = http://www.linuxfromscratch.org/patches/blfs/svn/${:filename}
 md5sum = 7c00beff0475314f59214842509e407f
@@ -23,3 +27,5 @@ configure-options =
   --enable-64bit
 make-options =
   -C mozilla/nsprpub
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/nss/buildout.cfg

@@ -8,6 +8,7 @@ parts =
 
 [nss-patch]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 filename = nss-3.12.9-with-nspr-4.8.7-1.patch
 url = http://www.linuxfromscratch.org/patches/blfs/svn/nss-3.12.8-standalone-1.patch
 md5sum = ee7b5966961bef16ca896435e78652d3
@@ -15,6 +16,7 @@ download-only = true
 
 [nss-download]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_9_RTM/src/nss-3.12.9.tar.gz
 md5sum = bd32f183ca28440c1744650be31a9ccc
 strip-top-level-dir = true

component/ocropus/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+
 parts = ocropus
 
 [ocropus-patch-scons]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 download-only = true
 filename = ocropus.SConstruct-local-installation.patch
 url = ${:_profile_base_location_}/${:filename}
@@ -17,10 +21,11 @@ configure-options =
 patches = ${ocropus-patch-scons:location}/${ocropus-patch-scons:filename}
 patch-options = -p1
 environment =
-  PATH =${scons-bin:destination_directory}:%(PATH)s
+  PATH=${patch:destination_directory}:${scons-bin:destination_directory}:%(PATH)s
 
 [scons-local]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = http://prdownloads.sourceforge.net/scons/scons-local-2.0.1.tar.gz
 
 [scons-bin]
@@ -31,6 +36,7 @@ command =
 
 [iulib-patch-scons]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 download-only = true
 filename = iulib.SConstruct-libtiff-detection.patch
 url = ${:_profile_base_location_}/${:filename}
@@ -44,4 +50,4 @@ md5sum = 3d9754dbd64c56029ce1cd7c2f61894c
 patches = ${iulib-patch-scons:location}/${iulib-patch-scons:filename}
 patch-options = -p1
 environment =
-  PATH =${scons-bin:destination_directory}:%(PATH)s
+  PATH=${patch:destination_directory}:${scons-bin:destination_directory}:%(PATH)s

component/oood/buildout.cfg

@@ -6,6 +6,7 @@ parts +=
 
 [oood]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = http://www.nexedi.org/static/tarballs/oood/oood-r36294.tar.gz
 md5sum = 9e71251eea4b310fd6bd4ebf8abf890e
 strip-top-level-dir = true

component/openblas/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+  ../perl/buildout.cfg
+
 parts =
   openblas
 
@@ -9,6 +13,9 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz
 md5sum = b1190f3d3471685f17cfd1ec1d252ac9
+patch-options = -p0
+patches =
+  ${:_profile_base_location_}/disable_openmp_if_single_core.patch#ee553ccaf9dd4bc37374588e49956f62
 
 build-common-options = BINARY="$(uname -m | grep -q x86_64 && echo 64 || echo 32)" NO_STATIC=1 USE_OPENMP=1 USE_THREAD=1
 
@@ -23,12 +30,12 @@ build-ext-options =
 
 # First try with auto-detected target and if it fails try TARGET=GENERIC.
 configure-command =
-  make ${:build-common-options} ${:build-ext-options} || make ${:build-common-options} TARGET=GENERIC
+  make ${:build-common-options} ${:build-ext-options} || (make -j1 clean && make ${:build-common-options} TARGET=GENERIC)
 make-options =
   dummy
 make-targets =
   PREFIX="${buildout:parts-directory}/${:_buildout_section_name_}" install
 environment =
-  PATH=${gcc-fortran:location}/bin:%(PATH)s
+  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

component/openblas/disable_openmp_if_single_core.patch

+diff --git Makefile.system Makefile.system
+index 42ad498..d43aa7a 100644
+--- Makefile.system
++++ Makefile.system
+@@ -171,6 +171,7 @@ endif
+ 
+ ifeq ($(NUM_THREADS), 1)
+ override USE_THREAD = 0
++override USE_OPENMP = 0
+ endif
+ 
+ ifdef USE_THREAD

component/openssl/buildout.cfg

@@ -16,8 +16,8 @@ parts =
 
 [openssl]
 recipe = slapos.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.2f.tar.gz
-md5sum = b3bf73f507172be9292ea2a8c28b659d
+url = https://www.openssl.org/source/openssl-1.0.2h.tar.gz
+md5sum = 9392e65072ce4b614c1392eefc1f23d0
 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

component/openvpn/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../lzo/buildout.cfg
   ../openssl/buildout.cfg
   ../flex/buildout.cfg
+  ../xz-utils/buildout.cfg
 
 parts =
   openvpn
@@ -15,6 +16,7 @@ configure-options =
   --disable-plugin-auth-pam
   --enable-static
 environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
   LZO_LIBS=-L${lzo:location}/lib -llzo2
   LZO_CFLAGS=-I${lzo:location}/include
   OPENSSL_SSL_LIBS="-L${openssl:location}/lib -lssl" 

component/pdftk/buildout.cfg

@@ -11,6 +11,7 @@ parts = pdftk
 
 [pdftk-1.44-Makefile.Base.patch]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ${:_profile_base_location_}/${:filename}
 download-only = true
 md5sum = 04a3607213e4e638c1fd993321804499
@@ -18,6 +19,7 @@ filename = pdftk-1.44-Makefile.Base.patch
 
 [pdftk-hooks-download]
 recipe = hexagonit.recipe.download
+ignore-existing = true
 url = ${:_profile_base_location_}/${:filename}
 filename = pdftk-hooks.py
 md5sum = d2a067b98953ad30ba1230f87dfb8b92

component/perl-DBD-MySQL/buildout.cfg

@@ -2,6 +2,7 @@
 extends =
   ../mysql-tritonn-5.0/buildout.cfg
   ../mariadb/buildout.cfg
+  ../patch/buildout.cfg
 
 parts =
   perl-DBD-MySQL
@@ -22,6 +23,7 @@ configure-command =
   ${perl:location}/bin/perl Makefile.PL --mysql_config=${mysql-tritonn-5.0:location}/bin/mysql_config
 environment =
   OTHERLDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mysql-tritonn-5.0:location}/lib/mysql -Wl,-rpath=${openssl:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s
 
 [perl-DBD-mariadb]
 <= perl-DBD-MySQL-common
@@ -29,3 +31,4 @@ configure-command =
   ${perl:location}/bin/perl Makefile.PL --mysql_config=${mariadb:location}/bin/mysql_config
 environment =
   OTHERLDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib -Wl,-rpath=${openssl:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s

component/perl-Image-Magick/buildout.cfg

 [buildout]
 extends =
+  ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../imagemagick/buildout.cfg
 parts = perl-Image-Magick
@@ -13,3 +14,5 @@ patches =
   ${:_profile_base_location_}/perl-Image-Magick_MakefilePL.patch#31043e2b79e725d3b251aa09b4549046
 configure-command =
   ${perl:location}/bin/perl Makefile.PL LIBS="-L${imagemagick:location}/lib -Wl,-R${imagemagick:location}/lib -L${perl:location}/libs-c -Wl,-R${perl:location}/libs-c" INC="-I${imagemagick:location}/include/ImageMagick"
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/perl-Term-ReadLine-Gnu/buildout.cfg

 [buildout]
 extends =
+  ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../ncurses/buildout.cfg
   ../readline/buildout.cfg
@@ -14,3 +15,5 @@ patches =
   ${:_profile_base_location_}/perl-Term-ReadLine-Gnu.patch#d4e4624e717c8da63e4d153149d57b68
 configure-command =
   ${perl:location}/bin/perl Makefile.PL --libdir=${readline:location}/lib --includedir="${readline:location}/include" LIBS="-Wl,-R${readline:location}/lib -L${ncurses:location}/lib -Wl,-R${ncurses:location}/lib" INC="-I${ncurses:location}/include"
+environment =
+  PATH=${patch:location}/bin:%(PATH)s