Merge remote-tracking branch 'origin/master' into erp5-cluster

9c03cd64 · Kazuhiko Shiozaki · df15148a · fa06f923 · 9c03cd64 · 9c03cd64
Commit 9c03cd64 authored May 10, 2014 by Kazuhiko Shiozaki
30 changed files
--- a/component/apache/buildout.cfg
+++ b/component/apache/buildout.cfg
@@ -4,11 +4,13 @@ parts =
  apache-antiloris
 extends =
+  ../gdbm/buildout.cfg
  ../libexpat/buildout.cfg
  ../libuuid/buildout.cfg
-  ../gdbm/buildout.cfg
+  ../libxml2/buildout.cfg
  ../openssl/buildout.cfg
  ../pcre/buildout.cfg
+  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../sqlite3/buildout.cfg
  ../zlib/buildout.cfg
@@ -69,6 +71,7 @@ configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_na
                    --with-ssl=${openssl:location}
                    --with-z=${zlib:location}
                    --with-expat=${libexpat:location}
+                    --with-libxml2=${libxml2:location}/include/libxml2
                    --with-pcre=${pcre:location}
                    --with-sqlite3=${sqlite3:location}
                    --with-gdbm=${gdbm:location}
@@ -85,10 +88,10 @@ configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_na
                    --without-iconv
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
  CPPFLAGS =-I${libuuid:location}/include -I${openssl: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
+  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
 [apache-antiloris]
 # Note: Shall react on each build of apache and reinstall itself
@@ -166,7 +169,7 @@ configure-options = --disable-static
                    --without-iconv
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${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

--- a/component/aspell/buildout.cfg
+++ b/component/aspell/buildout.cfg
@@ -5,6 +5,7 @@ parts =
 extends =
  ../ncurses/buildout.cfg
+  ../perl/buildout.cfg
 [aspell-common-dictionary]
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -19,6 +20,7 @@ revision = 1
 url = http://ftp.gnu.org/gnu/aspell/aspell-0.60.6.1.tar.gz
 md5sum = e66a9c9af6a60dc46134fdacf6ce97d7
 environment =
+  PATH=${perl:location}/bin:%(PATH)s
  CPPFLAGS=-I${ncurses:location}/include
  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib

--- a/component/cups/buildout.cfg
+++ b/component/cups/buildout.cfg
 [buildout]
-extends =
-  ../zlib/buildout.cfg
 parts =
  cups
+extends =
+  ../perl/buildout.cfg
+  ../zlib/buildout.cfg
 # for now we build and install library and header files only.
 [cups]
 recipe = slapos.recipe.cmmi
@@ -28,5 +30,6 @@ make-targets =
  install-headers
  install-libs
 environment =
+  PATH=${perl:location}/bin:%(PATH)s
  CPPFLAGS=-I${zlib:location}/include
  DSOFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/curl/buildout.cfg
+++ b/component/curl/buildout.cfg
@@ -4,6 +4,7 @@
 [buildout]
 extends =
  ../openssl/buildout.cfg
+  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../zlib/buildout.cfg
 parts =
@@ -39,6 +40,6 @@ configure-options =
  --without-nghttp2
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
  LDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib
--- a/component/gettext/buildout.cfg
+++ b/component/gettext/buildout.cfg
@@ -4,6 +4,7 @@ parts =
 extends =
  ../ncurses/buildout.cfg
  ../libxml2/buildout.cfg
+  ../perl/buildout.cfg
  ../zlib/buildout.cfg
 [gettext]
@@ -27,5 +28,6 @@ configure-options =
  --without-xz
 environment =
+  PATH=${perl:location}/bin:%(PATH)s
  CPPFLAGS=-I${libxml2:location}/include -I${zlib:location}/include -I${ncurses:location}/include
  LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
--- a/component/glib/buildout.cfg
+++ b/component/glib/buildout.cfg
@@ -2,6 +2,7 @@
 extends =
  ../gettext/buildout.cfg
  ../libffi/buildout.cfg
+  ../perl/buildout.cfg
  ../xz-utils/buildout.cfg
  ../zlib/buildout.cfg
 parts =
@@ -18,7 +19,7 @@ configure-options =
  --disable-xattr
  --disable-man
 environment =
-  PATH=${gettext:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${gettext:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
  CPPFLAGS=-I${gettext:location}/include -I${zlib:location}/include
  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
  LIBFFI_CFLAGS=-I${libffi:location}/lib/libffi-${libffi:version}/include

--- a/component/glibmm/buildout.cfg
+++ b/component/glibmm/buildout.cfg
@@ -3,6 +3,7 @@ extends =
  ../gettext/buildout.cfg
  ../glib/buildout.cfg
  ../libsigc/buildout.cfg
+  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../xz-utils/buildout.cfg
 parts =
@@ -16,7 +17,7 @@ pkg_config_depends = ${glib:location}/lib/pkgconfig:${libsigc:location}/lib/pkgc
 configure-options =
  --disable-documentation
 environment =
-  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${:pkg_config_depends}
  CPPFLAGS=-I${gettext:location}/include
  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
--- a/component/groff/buildout.cfg
+++ b/component/groff/buildout.cfg
@@ -2,6 +2,9 @@
 parts =
  groff
+extends =
+  ../perl/buildout.cfg
 [groff]
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/groff/groff-1.21.tar.gz
@@ -9,3 +12,5 @@ md5sum = 8b8cd29385b97616a0f0d96d0951c5bf
 configure-options =
  --disable-static
  --without-x
+environment =
+  PATH=${perl:location}/bin:%(PATH)s
--- a/component/gtk-2/buildout.cfg
+++ b/component/gtk-2/buildout.cfg
@@ -9,6 +9,7 @@ extends =
  ../libpng/buildout.cfg
  ../libtiff/buildout.cfg
  ../libxml2/buildout.cfg
+  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../xorg/buildout.cfg
  ../xz-utils/buildout.cfg
@@ -80,7 +81,7 @@ configure-options =
  --without-libintl-prefix
  --with-x11
 environment =
-  PATH=${glib:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${:pkg_config_depends}
  CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include
  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
@@ -112,7 +113,7 @@ configure-options =
  --disable-xinerama
  --disable-gtk-doc-html
 environment =
-  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${:pkg_config_depends}
 # not taken from pkg-config result...
  CPPFLAGS=-I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${libXext:location}/include

--- a/component/gtkmm/buildout.cfg
+++ b/component/gtkmm/buildout.cfg
@@ -7,6 +7,7 @@ extends =
  ../gtk-2/buildout.cfg
  ../libpng/buildout.cfg
  ../libxml2/buildout.cfg
+  ../perl/buildout.cfg
  ../xorg/buildout.cfg
  ../xz-utils/buildout.cfg
  ../zlib/buildout.cfg
@@ -24,7 +25,7 @@ configure-options =
  --disable-static
  --disable-documentation
 environment =
-  PATH=${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${freetype:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${:pkg_config_depends}
  CPPFLAGS=-I${libX11:location}/include -I${libXrender:location}/include -I${render:location}/include -I${xproto:location}/include
  LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
@@ -38,7 +39,7 @@ configure-options =
  --disable-static
  --disable-documentation
 environment =
-  PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${glib:location}/bin:${freetype:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${:pkg_config_depends}
  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
@@ -51,7 +52,7 @@ configure-options =
  --disable-static
  --disable-documentation
 environment =
-  PATH=${glib:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${:pkg_config_depends}
  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
@@ -64,6 +65,6 @@ configure-options =
  --disable-static
  --disable-documentation
 environment =
-  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${gtk-2:location}/bin:${pango:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${gtk-2:location}/bin:${pango:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${:pkg_config_depends}
  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/libsigc/buildout.cfg
+++ b/component/libsigc/buildout.cfg
 [buildout]
 extends =
  ../m4/buildout.cfg
+  ../perl/buildout.cfg
  ../xz-utils/buildout.cfg
 parts =
@@ -13,4 +14,4 @@ md5sum = 06a0569e8ba161d3428e7daa838682f8
 configure-options =
  --disable-documentation
 environment =
-  PATH=${m4:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${m4:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
--- a/component/libuuid/buildout.cfg
+++ b/component/libuuid/buildout.cfg
@@ -2,6 +2,9 @@
 parts =
  libuuid
+extenrs =
+  ../perl/buildout.cfg
 [libuuid]
 recipe = slapos.recipe.cmmi
 url = http://www.kernel.org/pub/linux/utils/util-linux/v2.18/util-linux-ng-2.18.tar.bz2
@@ -38,3 +41,5 @@ configure-options =
 make-options =
  -C shlibs/uuid
+environment =
+  PATH=${perl:location}/bin:%(PATH)s
--- a/component/libxml2/buildout.cfg
+++ b/component/libxml2/buildout.cfg
@@ -2,7 +2,10 @@
 # http://xmlsoft.org/
 [buildout]
-extends = ../zlib/buildout.cfg
+extends =
+  ../perl/buildout.cfg
+  ../zlib/buildout.cfg
 parts =
  libxml2
@@ -16,4 +19,5 @@ configure-options =
  --without-lzma
  --with-zlib=${zlib:location}
 environment =
-    LDFLAGS = -Wl,-rpath=${zlib:location}/lib
+  PATH=${perl:location}/bin:%(PATH)s
+  LDFLAGS=-Wl,-rpath=${zlib:location}/lib
--- a/component/mariadb/buildout.cfg
+++ b/component/mariadb/buildout.cfg
@@ -50,7 +50,7 @@ environment =
  CMAKE_PROGRAM_PATH=${cmake:location}/bin
  CMAKE_INCLUDE_PATH=${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${readline5:location}/include:${zlib:location}/include
  CMAKE_LIBRARY_PATH=${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
-  LDFLAGS=-L${libaio:location}/lib -L${zlib:location}/lib
+  LDFLAGS=-L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${zlib:location}/lib
 [mroonga-mariadb]
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.

--- a/component/opensp/buildout.cfg
+++ b/component/opensp/buildout.cfg
 [buildout]
+parts =
+  opensp
+extends =
+  ../perl/buildout.cfg
 [opensp]
 recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/openjade/OpenSP-1.5.2.tar.gz
@@ -6,3 +12,5 @@ md5sum = 670b223c5d12cee40c9137be86b6c39b
 configure-options =
  --disable-static
  --disable-doc-build
+environment =
+  PATH=${perl:location}/bin:%(PATH)s
--- a/component/openssl/buildout.cfg
+++ b/component/openssl/buildout.cfg
@@ -6,9 +6,10 @@
 [buildout]
 extends =
  ../ca-certificates/buildout.cfg
-  ../zlib/buildout.cfg
-  ../patch/buildout.cfg
  ../coreutils/buildout.cfg
+  ../patch/buildout.cfg
+  ../perl/buildout.cfg
+  ../zlib/buildout.cfg
 parts =
  openssl-output
@@ -40,6 +41,8 @@ make-options =
  -j1
 make-targets =
  all install_sw && rm -f ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/* && for i in ${ca-certificates:location}/certs/*/*.crt; do ln -sv $i ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/`${buildout:parts-directory}/${:_buildout_section_name_}/bin/openssl x509 -hash -noout -in $i`.0; done; true
+environment =
+  PERL=${perl:location}/bin/perl
 [openssl-output]
 # Shared binary location to ease migration

--- a/component/percona-toolkit/buildout.cfg
+++ b/component/percona-toolkit/buildout.cfg
@@ -2,7 +2,7 @@
 extends =
  ../perl/buildout.cfg
  ../perl-DBI/buildout.cfg
-  ../perl-DBD-mariadb/buildout.cfg
+  ../perl-DBD-MySQL/buildout.cfg
 parts =
  percona-toolkit

--- a/component/perl-DBD-MySQL/DBD-mysql-4.019.rpathsupport.patch
+++ b/component/perl-DBD-MySQL/DBD-mysql-4.019.rpathsupport.patch
--- DBD-mysql-4.019.back/Makefile.PL    2011-05-09 03:12:07.000000000 +0200
-+++ DBD-mysql-4.019/Makefile.PL 2011-06-22 11:44:06.478371893 +0200
-@@ -358,7 +358,14 @@  
-                      'Data::Dumper' => 0 };
- }
-ExtUtils::MakeMaker::WriteMakefile(%o);
-+
-+my %config;
-+if (defined($ENV{'OTHERLDFLAGS'})) {
-+    $config{dynamic_lib} = { OTHERLDFLAGS => " $ENV{'OTHERLDFLAGS'} " };
-+}
-+
-+
-+ExtUtils::MakeMaker::WriteMakefile(%o, %config);
- exit 0;
--- a/component/perl-DBD-MySQL/DBD-mysql-4.027.rpathsupport.patch
+++ b/component/perl-DBD-MySQL/DBD-mysql-4.027.rpathsupport.patch
+--- DBD-mysql-4.027/Makefile.PL.orig	2014-03-14 19:34:06.000000000 +0100
+++ DBD-mysql-4.027/Makefile.PL	2014-05-10 07:34:50.497350471 +0200
+@@ -974,7 +974,12 @@
+   delete $params{ABSTRACT_FROM} if $] < 5.005;
+   delete $params{BINARY_LOCATION} if $] < 5.005;
+-  ExtUtils::MakeMaker::WriteMakefile(%params);
+  my %config;
+  if (defined($ENV{'OTHERLDFLAGS'})) {
+    $config{dynamic_lib} = { OTHERLDFLAGS => " $ENV{'OTHERLDFLAGS'} " };
+  }
+
+  ExtUtils::MakeMaker::WriteMakefile(%params, %config);
+ }
+ __DATA__
--- a/component/perl-DBD-MySQL/buildout.cfg
+++ b/component/perl-DBD-MySQL/buildout.cfg
 [buildout]
 extends =
  ../mysql-tritonn-5.0/buildout.cfg
+  ../mariadb/buildout.cfg
 parts =
  perl-DBD-MySQL
-[perl-DBD-MySQL]
+[perl-DBD-MySQL-common]
 recipe = slapos.recipe.cmmi
-version = 4.019
 depends =
  ${perl:version}
  ${perl-DBI:version}
-url = http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.019.tar.gz
+url = http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.027.tar.gz
-md5sum = 566d98ab8ffac9626a31f6f6d455558e
+md5sum = 11fa6449715ba9d3fa5f4ee5ae688d6f
 patches =
-  ${:_profile_base_location_}/DBD-mysql-4.019.rpathsupport.patch#e12e9233f20b0370cfcf5228ea767fbc
+  ${:_profile_base_location_}/DBD-mysql-4.027.rpathsupport.patch#a932982b7725e6621cfce3a3d7917e03
 patch-options = -p1
+[perl-DBD-MySQL]
+<= perl-DBD-MySQL-common
 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
+[perl-DBD-mariadb]
+<= perl-DBD-MySQL-common
+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
--- a/component/perl-DBD-mariadb/DBD-mysql-4.019.rpathsupport.patch
+++ b/component/perl-DBD-mariadb/DBD-mysql-4.019.rpathsupport.patch
--- DBD-mysql-4.019.back/Makefile.PL    2011-05-09 03:12:07.000000000 +0200
-+++ DBD-mysql-4.019/Makefile.PL 2011-06-22 11:44:06.478371893 +0200
-@@ -358,7 +358,14 @@  
-                      'Data::Dumper' => 0 };
- }
-ExtUtils::MakeMaker::WriteMakefile(%o);
-+
-+my %config;
-+if (defined($ENV{'OTHERLDFLAGS'})) {
-+    $config{dynamic_lib} = { OTHERLDFLAGS => " $ENV{'OTHERLDFLAGS'} " };
-+}
-+
-+
-+ExtUtils::MakeMaker::WriteMakefile(%o, %config);
- exit 0;
--- a/component/perl-DBD-mariadb/buildout.cfg
+++ b/component/perl-DBD-mariadb/buildout.cfg
-[buildout]
-extends =
-  ../mariadb/buildout.cfg
-parts =
-  perl-DBD-mariadb
-[perl-DBD-mariadb]
-recipe = slapos.recipe.cmmi
-version = 4.019
-# binary library should be rebuilt when perl is updated.
-depends =
-  ${mariadb:version}
-  ${perl:version}
-  ${perl:revision}
-  ${perl-DBI:version}
-url = http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.019.tar.gz
-md5sum = 566d98ab8ffac9626a31f6f6d455558e
-patches =
-  ${:_profile_base_location_}/DBD-mysql-4.019.rpathsupport.patch#e12e9233f20b0370cfcf5228ea767fbc
-patch-options = -p1
-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
--- a/component/perl-DBI/buildout.cfg
+++ b/component/perl-DBI/buildout.cfg
@@ -11,7 +11,7 @@ version = 1.616
 depends =
  ${perl:version}
  ${perl:revision}
-url = http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-1.616.tar.gz
+url = http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-1.631.tar.gz
-md5sum = 799313e54a693beb635b47918458f7c4
+md5sum = 444d3c305e86597e11092b517794a840
 configure-command =
  ${perl:location}/bin/perl Makefile.PL
--- a/component/perl-XML-Parser/buildout.cfg
+++ b/component/perl-XML-Parser/buildout.cfg
 [buildout]
 extends =
  ../libexpat/buildout.cfg
-  ../libxml2/buildout.cfg
  ../perl/buildout.cfg
  ../perl-libwww-perl/buildout.cfg
-  ../zlib/buildout.cfg
 parts =
  perl-XML-Parser
@@ -13,18 +11,15 @@ recipe = slapos.recipe.cmmi
 depends =
  ${perl:version}
  ${perl-libwww-perl:location}
-url = http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-Parser-2.36.tar.gz
+url = http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz
-md5sum = 1b868962b658bd87e1563ecd56498ded
+md5sum = c320d2ffa459e6cdc6f9f59c1185855e
 configure-command =
  ${perl:location}/bin/perl Makefile.PL \
    EXPATINCPATH=${libexpat:location}/include \
    EXPATLIBPATH=${libexpat:location}/lib \
-    INC="-I${libxml2:location}/include/libxml2" \
-    LIBS="-L${libxml2:location}/lib -L${zlib:location}/lib"
 # Parallel make does not work for this package on fast machines
 # with many cores
 make-options =
-  OTHERLDFLAGS=" -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${zlib:location}/lib" -j1
+  OTHERLDFLAGS="-Wl,-rpath=${libexpat:location}/lib" -j1
 environment =
-  LD_LIBRARY_PATH=${libxml2:location}/lib:${zlib:location}/lib
  PERLLIB=blib/lib
--- a/component/perl/buildout.cfg
+++ b/component/perl/buildout.cfg
@@ -9,11 +9,11 @@ parts =
 recipe = slapos.recipe.cmmi
 depends =
  ${gdbm:version}
-version = 5.16.3
+version = 5.18.2
 # increase revision when we need to rebuild binary libraries.
-revision = 2
+revision = 1
 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
-md5sum = 025102de0e4a597cf541e57da80c6aa3
+md5sum = d549b16ee4e9210988da39193a9389c1
 siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
 patch-options = -p1
 patches =

--- a/component/subversion/buildout.cfg
+++ b/component/subversion/buildout.cfg
@@ -7,6 +7,7 @@ extends =
  ../libexpat/buildout.cfg
  ../libuuid/buildout.cfg
  ../neon/buildout.cfg
+  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../sqlite3/buildout.cfg
  ../zlib/buildout.cfg
@@ -49,7 +50,7 @@ make-options =
  -j1
 environment =
-  PATH=${pkgconfig:location}/bin:${neon:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${pkgconfig:location}/bin:${neon:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${neon: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=${neon:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib

--- a/component/w3m/buildout.cfg
+++ b/component/w3m/buildout.cfg
@@ -3,6 +3,7 @@ extends =
  ../garbage-collector/buildout.cfg
  ../ncurses/buildout.cfg
  ../openssl/buildout.cfg
+  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../zlib/buildout.cfg
@@ -37,7 +38,7 @@ patches =
  ${:_profile_base_location_}/w3m-0.5.2-gc72.patch#5a74b6379240c8dd1372efa7926c8bdc
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${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
--- a/component/wget/buildout.cfg
+++ b/component/wget/buildout.cfg
@@ -29,5 +29,5 @@ patches =
 environment =
  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
-  LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib
  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include -I${pcre:location}/include
--- a/component/xorg/buildout.cfg
+++ b/component/xorg/buildout.cfg
 [buildout]
 extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../bzip2/buildout.cfg
+  ../dash/buildout.cfg
  ../freetype/buildout.cfg
+  ../gnutls/buildout.cfg
  ../intltool/buildout.cfg
+  ../libtool/buildout.cfg
  ../libuuid/buildout.cfg
  ../libxml2/buildout.cfg
  ../libxslt/buildout.cfg
+  ../openssl/buildout.cfg
+  ../perl/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../zlib/buildout.cfg
-  ../bzip2/buildout.cfg
-  ../openssl/buildout.cfg
-  ../gnutls/buildout.cfg
-  ../autoconf/buildout.cfg
-  ../automake/buildout.cfg
-  ../libtool/buildout.cfg
-  ../dash/buildout.cfg
 parts =
  libXdmcp
@@ -155,7 +156,7 @@ configure-options =
  --without-xmlto
  --without-fop
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${:pkg_config_depends}
 # Below is stuff for xserver
@@ -351,7 +352,7 @@ md5sum = a6f137ae100e74ebe3b71eb4a38c40b3
 configure-options =
  --disable-static
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${libSM:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libICE:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
 [dri2proto]

--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -668,7 +668,7 @@ zope.app.testing = 3.8.1
 # Pinned versions
 Flask = 0.10.1
 GitPython = 0.3.2.RC1
-MarkupSafe = 0.21
+MarkupSafe = 0.23
 MySQL-python = 1.2.5
 PIL = 1.1.7
 Products.CMFActionIcons = 2.1.3
@@ -725,9 +725,9 @@ minitage.paste = 1.4.6
 minitage.recipe.common = 1.90
 minitage.recipe.egg = 1.107
 netaddr = 0.7.11
-netifaces = 0.10.2
+netifaces = 0.10.3
 ordereddict = 1.1
-paramiko = 1.13.0
+paramiko = 1.14.0
 plone.recipe.command = 1.1
 ply = 3.4
 polib = 1.0.4