Merge remote-tracking branch 'origin/erp5-component' into erp5

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

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

stack/erp5/buildout.cfg

@@ -8,11 +8,8 @@ extensions =
   slapos.zcbworkarounds
   mr.developer
 
-find-links =
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-    http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
+find-links +=
     http://dist.repoze.org
-    http://www.nexedi.org/static/packages/source/
     http://www.owlfish.com/software/wsgiutils/download.html
 
 extends =
@@ -603,7 +600,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
@@ -642,3 +638,4 @@ xupdate-processor = 0.4
 mr.developer = 1.21
 qrcode = 2.4.1
 requests = 0.13.2
+cloudooo = 1.2.5-dev

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