add missing PATH.

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
@@ -106,6 +107,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 +166,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
 
@@ -35,3 +37,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/coreutils/buildout.cfg

 [buildout]
 extends =
   ../gmp/buildout.cfg
+  ../perl/buildout.cfg
   ../xz-utils/buildout.cfg
 parts =
   coreutils-output
@@ -12,7 +13,7 @@ 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/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
@@ -26,6 +27,7 @@ configure-options =
 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/firewalld/buildout.cfg

@@ -19,6 +19,7 @@ extends =
   ../flex/buildout.cfg
   ../bison/buildout.cfg
   ../xz-utils/buildout.cfg
+  ../perl/buildout.cfg
 
 [firewalld]
 recipe = slapos.recipe.cmmi
@@ -32,7 +33,7 @@ pre-configure =
 
 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
+  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

component/gcc/buildout.cfg

@@ -3,6 +3,8 @@
 [buildout]
 extends =
   ../gmp/buildout.cfg
+  ../perl/buildout.cfg
+  ../tar/buildout.cfg
   ../xz-utils/buildout.cfg
 
 parts =
@@ -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/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 =
@@ -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/groonga/buildout.cfg

@@ -8,6 +8,7 @@ parts =
 extends =
   ../jemalloc/buildout.cfg
   ../libstemmer/buildout.cfg
+  ../patch/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
 
@@ -34,6 +35,7 @@ configure-options =
 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

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/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
@@ -60,7 +61,7 @@ patch-options = -p1
 patches =
   ${:_profile_base_location_}/imagemagick-6.6.6-1-no-gsx-gsc-probe.patch#3f28ecd9f6722cf2c3238ce6ec3d7a68
 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

component/jasper/buildout.cfg

 [buildout]
 extends =
   ../libjpeg/buildout.cfg
+  ../patch/buildout.cfg
 parts =
   jasper
 
@@ -25,3 +26,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
 
@@ -25,3 +28,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/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
 
@@ -35,5 +38,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/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/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/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/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/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/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
@@ -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
@@ -82,7 +84,7 @@ patch-options = -p1
 patches =
   ${:_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/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/nspr/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+
 parts = nspr
 
 [nspr-pkgconfig-patch-download]
@@ -23,3 +26,5 @@ configure-options =
   --enable-64bit
 make-options =
   -C mozilla/nsprpub
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/ocropus/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+
 parts = ocropus
 
 [ocropus-patch-scons]
@@ -17,7 +20,7 @@ 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
@@ -44,4 +47,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/openblas/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+  ../perl/buildout.cfg
+
 parts =
   openblas
 
@@ -32,6 +36,6 @@ make-options =
 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/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

component/postfix/buildout.cfg

@@ -5,6 +5,7 @@
 extends =
   ../libdb/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../pcre/buildout.cfg
   ../cyrus-sasl/buildout.cfg
 
@@ -20,3 +21,5 @@ patches =
 configure-command = make
 configure-options = makefiles CCARGS='-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -DUSE_TLS -DHAS_PCRE -DHAS_DB -I${libdb:location}/include -I${pcre:location}/include -I${openssl:location}/include -I${cyrus-sasl:location}/include/sasl' AUXLIBS='-L${openssl:location}/lib -L${pcre:location}/lib -L${libdb:location}/lib -L${cyrus-sasl:location}/lib -lssl -lpcre -ldb -lcrypto -lsasl2 -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${libdb:location}/lib -Wl,-rpath=${cyrus-sasl:location}/lib'
 make-targets = non-interactive-package install_root=${:location}
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/pysvn-python/buildout.cfg

 [buildout]
 extends =
   ../apache/buildout.cfg
+  ../patch/buildout.cfg
   ../subversion/buildout.cfg
 
 parts =
@@ -15,6 +16,7 @@ patches =
   ${:_profile_base_location_}/pysvn-1.7.10-inc_lib_dir.patch#02d00b58d537242aa5bb5c9202dedbf1
   ${:_profile_base_location_}/pysvn-issue-179.patch#bd3f9629f95f0f749c5a5e93c797ee2b
 patch-options = -p1
+patch-binary = ${patch:location}/bin/patch
 include-dirs =
   ${subversion:location}/include/subversion-1
   ${apache:location}/include

component/python-2.7/buildout.cfg

@@ -7,6 +7,7 @@ extends =
   ../libffi/buildout.cfg
   ../ncurses/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../readline/buildout.cfg
   ../sqlite3/buildout.cfg
   ../zlib/buildout.cfg
@@ -57,6 +58,6 @@ make-targets = make profile-opt && make install
 # the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,
 # which would otherwise load the system libmagic.so with ctypes
 environment =
-  PATH=${xz-utils:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
   LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib

component/python-ldap-python/buildout.cfg

@@ -5,6 +5,7 @@ extends =
   ../cyrus-sasl/buildout.cfg
   ../openldap/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
 
 [python-ldap-python]
 recipe = zc.recipe.egg:custom
@@ -12,6 +13,7 @@ egg = python-ldap
 patches =
   ${:_profile_base_location_}/python-ldap-no_default_dirs.patch#959115f13f1de5c63654c69b8dfacd69
 patch-options = -p1
+patch-binary = ${patch:location}/bin/patch
 rpath =
   ${openldap:location}/lib
   ${cyrus-sasl:location}/lib

component/readline/buildout.cfg

 [buildout]
 extends =
   ../ncurses/buildout.cfg
+  ../patch/buildout.cfg
 
 parts =
   readline5
@@ -29,6 +30,8 @@ md5sum = e39331f32ad14009b9ff49cc10c5e751
 configure-options =
   --enable-multibyte
   --disable-static
+environment =
+  PATH=${patch:location}/bin:%(PATH)s
 
 [readline]
 recipe = slapos.recipe.cmmi
@@ -50,3 +53,4 @@ configure-options =
 environment =
   CPPFLAGS=-I${ncurses:location}/include/ncurses
   LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s

component/redis/buildout.cfg

@@ -3,7 +3,9 @@
 parts =
   redis
 
-extends = ../tcl/buildout.cfg
+extends =
+  ../patch/buildout.cfg
+  ../tcl/buildout.cfg
 
 [redis]
 <= redis28
@@ -21,7 +23,7 @@ make-targets =
   install
   test
 environment =
-  PATH=${tcl:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${tcl:location}/bin:%(PATH)s
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/0001-tests-Disable-replication-psync-for-now.patch#1ed899443ed70fce02d9b95f5e7ca046

component/rsync/buildout.cfg

 [buildout]
+extends =
+  ../perl/buildout.cfg
+
 parts =
   rsync
 
@@ -8,3 +11,5 @@ url = http://rsync.samba.org/ftp/rsync/src/rsync-3.1.1.tar.gz
 md5sum = 43bd6676f0b404326eee2d63be3cdcfe
 make-options =
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
+environment =
+  PATH=${perl:location}/bin:%(PATH)s

component/screen/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+
 parts =
   screen
 
@@ -16,4 +19,6 @@ environment=
 # Compatibility with CentOS
 patch-options = -p1 -b
 patches =
-  ${:_profile_base_location_}/screen-4.0.3-stropts.patch#5677917353067ffbcb08a23a59605aa4
\ No newline at end of file
+  ${:_profile_base_location_}/screen-4.0.3-stropts.patch#5677917353067ffbcb08a23a59605aa4
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/shellinabox/buildout.cfg

@@ -44,7 +44,7 @@ configure-command =
   ${autoconf:location}/bin/autoreconf -vif
   ./configure
 environment =
-  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:%(PATH)s
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${git:location}/bin:${libtool:location}/bin:${m4:location}/bin:%(PATH)s
   CFLAGS = -I${zlib:location}/include -I${openssl:location}/include
   LDFLAGS = -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
   PKG_CONFIG_PATH = ${openssl:location}/lib/pkgconfig/

component/subversion/buildout.cfg

@@ -8,6 +8,7 @@ extends =
   ../libuuid/buildout.cfg
   ../neon/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../serf/buildout.cfg
@@ -50,7 +51,7 @@ configure-options =
   --disable-nls
 make-targets = install -j1
 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=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${serf:location}/lib/pkgconfig
   CPPFLAGS=-I${libexpat:location}/include -I${libuuid:location}/include
   LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${openssl:location}/lib

component/tar/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
 
 parts = tar
 
@@ -12,3 +14,4 @@ url = http://ftp.gnu.org/gnu/tar/tar-1.26.tar.gz
 md5sum = 00d1e769c6af702c542cca54b728920d
 environment =
   FORCE_UNSAFE_CONFIGURE=1
+  PATH=${patch:location}/bin:%(PATH)s

component/tesseract/buildout.cfg

@@ -6,6 +6,7 @@ extends =
   ../leptonica/buildout.cfg
   ../libpng/buildout.cfg
   ../libtool/buildout.cfg
+  ../patch/buildout.cfg
   ../webp/buildout.cfg
 
 parts =
@@ -35,7 +36,7 @@ configure-options =
 # tesseract has a non-standard way of testing for leptonica, hence the
 # LIBLEPT_HEADERSDIR entry below:
 environment =
-  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:%(PATH)s
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:${patch:location}/bin:%(PATH)s
   ACLOCAL_ARGS=-I${libtool:location}/share/aclocal
   LIBLEPT_HEADERSDIR=${leptonica:location}/include
   CPPFLAGS=-I${leptonica:location}/include

component/w3m/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../garbage-collector/buildout.cfg
   ../ncurses/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
@@ -38,7 +39,7 @@ patches =
   ${:_profile_base_location_}/w3m-0.5.2-gc72.patch#5a74b6379240c8dd1372efa7926c8bdc
 
 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:${garbage-collector:location}/lib/pkgconfig
   CPPFLAGS=-I${ncurses:location}/include/ -I${zlib:location}/include/ -I${garbage-collector:location}/include
   LDFLAGS=-Wl,--as-needed -L${garbage-collector:location}/lib -Wl,-rpath=${garbage-collector:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/wget/buildout.cfg

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

component/xorg/buildout.cfg

@@ -12,6 +12,7 @@ extends =
   ../libxml2/buildout.cfg
   ../libxslt/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
@@ -69,7 +70,7 @@ configure-options =
   --without-fop
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
 
 [libXau]
 recipe = slapos.recipe.cmmi
@@ -106,7 +107,7 @@ configure-options =
   --disable-build-docs
 environment =
   PKG_CONFIG_PATH=${libXau:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
-  PATH=${pkgconfig:location}/bin:${libxslt:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${pkgconfig:location}/bin:${libxslt:location}/bin:%(PATH)s
   PYTHON=${buildout:executable}
 # Python note: libxcb requires python with ElementTree. In case of appliance
 # non system python is used, and this binary contains ElementTree. In case of
@@ -525,5 +526,5 @@ configure-options =
 environment =
   PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${fixesproto:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${freetype:pkg_config_depends}:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
   CPPFLAGS=-I${bzip2:location}/include -I${gcrypt:location}/include -I${gpg-error:location}/include -I${zlib:location}/include
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gcrypt:location}/lib -Wl,-rpath=${gcrypt:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/xtrabackup/buildout.cfg

@@ -9,6 +9,7 @@ extends =
   ../flex/buildout.cfg
   ../libtool/buildout.cfg
   ../ncurses/buildout.cfg
+  ../patch/buildout.cfg
   ../readline/buildout.cfg
   ../zlib/buildout.cfg
 
@@ -45,6 +46,6 @@ configure-command = ln -sf ${mysql-5.1-download:location}/${mysql-5.1-download:f
 environment =
   CPPFLAGS =-I${zlib:location}/include -I${ncurses:location}/include -I${readline:location}/include
   LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib
-  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${flex:location}/bin:%(PATH)s:${bison:location}/bin
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${bison:location}/bin:${libtool:location}/bin:${flex:location}/bin:${patch:location}/bin:%(PATH)s
 make-options =
   -j1

software/neoppod/software-common.cfg

@@ -13,6 +13,7 @@ extends =
 #LXML
     ../../component/lxml-python/buildout.cfg
 #END LXML
+    ../../component/patch/buildout.cfg
     ../../component/python-mysqlclient/buildout.cfg
     ../../component/pycrypto-python/buildout.cfg
 
@@ -39,6 +40,7 @@ recipe = zc.recipe.egg
 eggs = neoppod[admin, ctl, master, storage-importer, storage-mysqldb]
   ${python-mysqlclient:egg}
   ZODB3
+patch-binary = ${patch:location}/bin/patch
 ZODB3-patches =
   ${:_profile_base_location_}/../../component/egg-patch/ZODB3-3.10.5.patch#c5fe331b1e3a930446f93ab4f6e97c6e
 ZODB3-patch-options = -p1