Merge remote-tracking branch 'origin/erp5' into erp5-z2.13

Conflicts:
	stack/erp5/buildout.cfg

component/ca-certificates/buildout.cfg

@@ -18,10 +18,10 @@ download-only = true
 
 [ca-certificates]
 recipe = hexagonit.recipe.cmmi
-version = 20120623
+version = 20130119
 url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.gz
 patch-binary = ${patch:location}/bin/patch
-md5sum = 5105d4cc086f0d4ecf7bf2e4c4667289
+md5sum = 1fbbec2028a33cf865b79c204aa2e626
 patches =
   ${ca-certificates-sbin-dir.patch:location}/${ca-certificates-sbin-dir.patch:filename}
 patch-options = -p0

component/cloudooo/buildout.cfg

@@ -15,14 +15,10 @@ update-command = ${:command}
 command = grep parts ${buildout:develop-eggs-directory}/cloudooo.egg-link
 
 [cloudooo-repository]
-recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
+recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/cloudooo.git
 branch = master
-revision =
-command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
+git-executable = ${git:location}/bin/git
 
 [cloudooo]
 recipe = zc.recipe.egg
@@ -44,4 +40,4 @@ scripts =
   paster=cloudooo_paster
   runCloudoooUnitTest
   runCloudoooTestSuite
-ugly-depend-on = ${cloudooo-repository:command} ${cloudooo-repository:update-command} ${cloudooo-check-recipe:command}
+ugly-depend-on = ${cloudooo-repository:recipe} ${cloudooo-repository:repository} ${cloudooo-check-recipe:command}

component/curl/buildout.cfg

@@ -11,8 +11,8 @@ parts =
 
 [curl]
 recipe = hexagonit.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.28.1.tar.bz2
-md5sum = 26eb081c999b0e203770869427e9a93d
+url = http://curl.haxx.se/download/curl-7.29.0.tar.bz2
+md5sum = fa5f37f38a8042020e292ce7ec5341ce
 configure-options =
   --disable-static
   --disable-ldap

component/openssl/buildout.cfg

@@ -29,8 +29,8 @@ download-only = true
 
 [openssl]
 recipe = hexagonit.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.1d.tar.gz
-md5sum = b92fc634f0f1f31a67ed4175adc5ba33
+url = https://www.openssl.org/source/openssl-1.0.1e.tar.gz
+md5sum = 66bf6f10f060d561929de96f9dfe5b8c
 patch-binary = ${patch:location}/bin/patch
 patches =
   ${openssl-nodoc.patch:location}/${openssl-nodoc.patch:filename}

component/percona-toolkit/buildout.cfg

@@ -10,8 +10,8 @@ parts =
 recipe = hexagonit.recipe.cmmi
 depends =
   ${perl:version}
-version = 2.1.7
+version = 2.1.9
 url = http://www.percona.com/redir/downloads/percona-toolkit/${:version}/percona-toolkit-${:version}.tar.gz
-md5sum = 12b096cf027395f0bf085f7314f95886
+md5sum = 94545d0fe6a4893dcad8a3411531107d
 configure-command =
   ${perl:location}/bin/perl Makefile.PL

component/xz-utils/buildout.cfg

-[buidout]
+[buildout]
 parts =
   xz-utils
 

stack/erp5/buildout.cfg

@@ -163,7 +163,7 @@ context =
 [template-mariadb]
 < = template-jinja2-base
 filename = instance-mariadb.cfg
-md5sum = 867bd8e3c4f56db2aab2fcad59f2efd8
+md5sum = 49ae6f1bf97d3755978fe08b8e29fb5a
 extra-context =
     key coreutils_location coreutils:location
     key dcron_location dcron:location
@@ -587,7 +587,6 @@ fpconst = 0.7.2
 gitdb = 0.5.4
 greenlet = 0.4.0
 hexagonit.recipe.cmmi = 1.6
-hexagonit.recipe.download = 1.6nxd002
 http-parser = 0.7.8
 huBarcode = 0.63
 inotifyx = 0.2.0
@@ -626,4 +625,5 @@ xupdate-processor = 0.4
 mr.developer = 1.21
 qrcode = 2.4.1
 requests = 0.13.2
+cloudooo = 1.2.5-dev
 zope.app.testing = 3.8.1 ; BBB

stack/erp5/instance-mariadb.cfg.in

@@ -62,26 +62,38 @@ mysql-binary = {{ mariadb_location }}/bin/mysql
 mysql-install-binary = {{ mariadb_location }}/scripts/mysql_install_db
 mysql-upgrade-binary = {{ mariadb_location }}/bin/mysql_upgrade
 mysqld-binary = {{ mariadb_location }}/bin/mysqld
+pt-align-binary = {{ perl_siteprefix }}/bin/pt-align
 pt-archiver-binary = {{ perl_siteprefix }}/bin/pt-archiver
+pt-collect-binary = {{ perl_siteprefix }}/bin/pt-collect
 pt-config-diff-binary = {{ perl_siteprefix }}/bin/pt-config-diff
 pt-deadlock-logger-binary = {{ perl_siteprefix }}/bin/pt-deadlock-logger
+pt-diskstats-binary = {{ perl_siteprefix }}/bin/pt-diskstats
 pt-duplicate-key-checker-binary = {{ perl_siteprefix }}/bin/pt-duplicate-key-checker
 pt-fifo-split-binary = {{ perl_siteprefix }}/bin/pt-fifo-split
 pt-find-binary = {{ perl_siteprefix }}/bin/pt-find
+pt-fingerprint-binary = {{ perl_siteprefix }}/bin/pt-fingerprint
 pt-fk-error-logger-binary = {{ perl_siteprefix }}/bin/pt-fk-error-logger
 pt-heartbeat-binary = {{ perl_siteprefix }}/bin/pt-heartbeat
 pt-index-usage-binary = {{ perl_siteprefix }}/bin/pt-index-usage
+pt-ioprofile-binary = {{ perl_siteprefix }}/bin/pt-ioprofile
 pt-kill-binary = {{ perl_siteprefix }}/bin/pt-kill
 pt-log-player-binary = {{ perl_siteprefix }}/bin/pt-log-player
+pt-mext-binary = {{ perl_siteprefix }}/bin/pt-mext
+pt-mysql-summary-binary = {{ perl_siteprefix }}/bin/pt-mysql-summary
 pt-online-schema-change-binary = {{ perl_siteprefix }}/bin/pt-online-schema-change
+pt-pmp-binary = {{ perl_siteprefix }}/bin/pt-pmp
 pt-query-advisor-binary = {{ perl_siteprefix }}/bin/pt-query-advisor
 pt-query-digest-binary = {{ perl_siteprefix }}/bin/pt-query-digest
 pt-show-grants-binary = {{ perl_siteprefix }}/bin/pt-show-grants
+pt-sift-binary = {{ perl_siteprefix }}/bin/pt-sift
 pt-slave-delay-binary = {{ perl_siteprefix }}/bin/pt-slave-delay
 pt-slave-find-binary = {{ perl_siteprefix }}/bin/pt-slave-find
 pt-slave-restart-binary = {{ perl_siteprefix }}/bin/pt-slave-restart
+pt-stalk-binary = {{ perl_siteprefix }}/bin/pt-stalk
+pt-summary-binary = {{ perl_siteprefix }}/bin/pt-summary
 pt-table-checksum-binary = {{ perl_siteprefix }}/bin/pt-table-checksum
 pt-table-sync-binary = {{ perl_siteprefix }}/bin/pt-table-sync
+pt-table-usage-binary = {{ perl_siteprefix }}/bin/pt-table-usage
 pt-tcp-model-binary = {{ perl_siteprefix }}/bin/pt-tcp-model
 pt-trend-binary = {{ perl_siteprefix }}/bin/pt-trend
 pt-upgrade-binary = {{ perl_siteprefix }}/bin/pt-upgrade

stack/slapos.cfg

@@ -22,6 +22,7 @@ exec-sitecustomize = false
 find-links +=
   http://www.nexedi.org/static/packages/source/slapos.buildout/
   http://www.nexedi.org/static/packages/source/
+  http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
 
 # Use only quite well working sites.
 allow-hosts +=
@@ -68,7 +69,8 @@ eggs =
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.6.0-dev-SlapOS-010
-
+# Use xz-friendly hexagonit.recipe.download
+hexagonit.recipe.download = 1.6nxd002
 # zc.recipe.egg 2.0.0a is buggy
 zc.recipe.egg = 1.3.2