Merge remote-tracking branch 'origin/master' into erp5testnode

component/apache/buildout.cfg

@@ -113,9 +113,9 @@ make-targets =
 [apache-2.2]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
-version = 2.2.26
+version = 2.2.27
 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 254eda547f8d624604e4bf403241e617
+md5sum = 8faef0decf3fa7e69b2568eb2105a3d8
 patch-options = -p1
 configure-options = --disable-static
                     --enable-authn-alias

component/ca-certificates/buildout.cfg

@@ -4,18 +4,21 @@
 
 extends =
   ../patch/buildout.cfg
+  ../xz-utils/buildout.cfg
 
 parts =
   ca-certificates
 
 [ca-certificates]
 recipe = slapos.recipe.cmmi
-version = 20130906
-url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.gz
+version = 20140325
+url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.xz
 patch-binary = ${patch:location}/bin/patch
-md5sum = 67d42b6be21c616a8b7d3d85d95ae912
+md5sum = 0436aba482091da310bd762e1deca8b4
 patches =
   ${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b
 patch-options = -p0
 configure-command = true
 make-targets = install DESTDIR=${buildout:parts-directory}/${:_buildout_section_name_} CERTSDIR=certs SBINDIR=sbin
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s

component/fontconfig/buildout.cfg

@@ -15,7 +15,7 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://fontconfig.org/release/fontconfig-2.11.0.tar.bz2
 md5sum = 000bd4baf7aefa828e03414d0c8c7dc5
-pkg_config_depends = ${freetype:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig
+pkg_config_depends = ${freetype:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
 # XXX-Cedric : should we use --with-add-fonts={somefont:location}/share,{someotherfont:location}/share?
 configure-options =
   --disable-static

component/fonts/buildout.cfg

@@ -4,39 +4,42 @@ parts =
   ipaex-fonts
   ipa-fonts
   ocrb-fonts
+  android-fonts
 
 [fonts]
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
+[fonts-base]
+destination = ${fonts:location}/${:_buildout_section_name_}
+recipe = hexagonit.recipe.download
+strip-top-level-dir = true
+
 # Liberation(tm) Fonts - a font family which aims at metric
 # compatibility with Arial, Times New Roman, and Courier New.
 # https://fedorahosted.org/liberation-fonts/
 [liberation-fonts]
-recipe = hexagonit.recipe.download
-strip-top-level-dir = true
+<= fonts-base
 url = https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-2.00.1.tar.gz
 md5sum = 5c781723a0d9ed6188960defba8e91cf
-destination = ${fonts:location}/${:_buildout_section_name_}
 
 # IPAex and IPA Font - Japanese fonts provided by IPA
 # http://ipafont.ipa.go.jp/
 [ipaex-fonts]
-recipe = hexagonit.recipe.download
-strip-top-level-dir = true
+<= fonts-base
 url = http://ipafont.ipa.go.jp/ipaexfont/IPAexfont00201.php
 md5sum = 7bf84182a04a9632268dbcb03f100d05
-destination = ${fonts:location}/${:_buildout_section_name_}
 
 [ipa-fonts]
-recipe = hexagonit.recipe.download
-strip-top-level-dir = true
+<= fonts-base
 url = http://ipafont.ipa.go.jp/ipafont/IPAfont00303.php
 md5sum = 39a828acf27790adbe4944dfb4d94bb1
-destination = ${fonts:location}/${:_buildout_section_name_}
 
 [ocrb-fonts]
-recipe = hexagonit.recipe.download
-strip-top-level-dir = true
+<= fonts-base
 url = http://sourceforge.jp/frs/redir.php?m=jaist&f=%2Ftsukurimashou%2F56948%2Focr-0.2.zip
 md5sum = 9f2acd83291a31dbe053912f4115db75
-destination = ${fonts:location}/${:_buildout_section_name_}
+
+[android-fonts]
+<= 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

component/garbage-collector/buildout.cfg

+# A garbage collector for C and C++
+# http://www.hboehm.info/gc/
+
 [buildout]
 parts = garbage-collector
 
 [garbage-collector]
 recipe = slapos.recipe.cmmi
-md5sum = 2ff9924c7249ef7f736ecfe6f08f3f9b
-url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.1.tar.gz
+md5sum = 5e230029f802d0ac633b1d9b3d4934c9
+url = http://www.hboehm.info/gc/gc_source/gc-7.2e.tar.gz
 configure-options =
+  --enable-cplusplus
+  --disable-gcj-support
   --disable-static
+  --disable-dependency-tracking

component/glib/buildout.cfg

@@ -9,8 +9,8 @@ parts =
 
 [glib]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/glib/2.39/glib-2.39.3.tar.xz
-md5sum = c8ddc045e12cfafdea607c138f3f8429
+url = http://ftp.gnome.org/pub/gnome/sources/glib/2.38/glib-2.38.2.tar.xz
+md5sum = 26d1d08e478fc48c181ca8be44f5b69f
 configure-options =
   --disable-static
   --disable-selinux

component/groonga/buildout.cfg

@@ -11,9 +11,9 @@ extends =
 
 [groonga]
 recipe = slapos.recipe.cmmi
-version = 4.0.0
+version = 4.0.1
 url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz
-md5sum = 63d1ae3453719f7bef06a30f8966e886
+md5sum = 7bfd1c78fe6506424d3f6e4a689a4619
 configure-options =
   --disable-static
   --disable-glibtest

component/gtkmm/buildout.cfg

@@ -15,8 +15,8 @@ parts =
 
 [cairomm]
 recipe = slapos.recipe.cmmi
-url = http://cairographics.org/releases/cairomm-1.10.0.tar.gz
-md5sum = 9c63fb1c04c8ecd3c5e6473075b8c39f
+url = http://cairographics.org/releases/cairomm-1.11.2.tar.gz
+md5sum = 732a3ff5b57401eb5dfeef795a2a0c52
 depends =
   ${libpng:so_version}
 pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}:${libsigc:location}/lib/pkgconfig

component/imagemagick/buildout.cfg

@@ -8,8 +8,8 @@ extends =
   ../fontconfig/buildout.cfg
   ../freetype/buildout.cfg
   ../ghostscript/buildout.cfg
+  ../inkscape/buildout.cfg
   ../lcms/buildout.cfg
-  ../librsvg/buildout.cfg
   ../libjpeg/buildout.cfg
   ../libpng/buildout.cfg
   ../libtiff/buildout.cfg
@@ -24,9 +24,9 @@ extends =
 
 [imagemagick]
 recipe = slapos.recipe.cmmi
-version = 6.8.8-2
+version = 6.8.8-9
 url = http://ftp.vim.org/ImageMagick/ImageMagick-${:version}.tar.xz
-md5sum = d11e1c732add731ff368b2dffcd004b4
+md5sum = d4a7ac7400622a325580e52cf9a562c7
 depends =
   ${libtiff:version}
   ${libpng:so_version}
@@ -47,7 +47,9 @@ configure-options =
   --without-gvc
   --without-lcms
   --with-lcms2
+  --without-openjp2
   --without-lqr
+  --without-lzma
   --without-openexr
   --without-pango
   --without-rsvg
@@ -62,7 +64,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:${librsvg: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:${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/mariadb/buildout.cfg

@@ -56,11 +56,8 @@ environment =
 # 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-4.00.tar.gz
-md5sum = f54c44c1ab0a98bea9f6ea6c4a8b2787
-patch-options = -p1
-patches =
-  ${:_profile_base_location_}/mroonga-4.00-mariadb-10.0.9.patch#1ad028d2d5701eecc7cb5b40b78abdc0
+url = http://packages.groonga.org/source/mroonga/mroonga-4.01.tar.gz
+md5sum = 7081aed69e715fb4b0b8f65b0d8d99f1
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config

component/xorg/buildout.cfg

@@ -465,7 +465,7 @@ configure-options =
   --with-xkb-path=${xkeyboard-config:location}/share/X11/xkb
   --with-sha1=libgcrypt
 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:location}/lib/pkgconfig
+  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: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
   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

software/cloudooo/software.cfg

@@ -108,7 +108,9 @@ mode = 640
 #   Cedric de Saint Martin
 #   Yingjie Xu
 #   Gabriel Monnerat
-#   Test Agent (Automatic Update from Tests)
+#   Łukasz Nowak
+#   Test Agent (Automatic update from tests)
+#   Aurélien Calonne
 signature-certificate-list =
   -----BEGIN CERTIFICATE-----
   MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
@@ -189,6 +191,19 @@ signature-certificate-list =
   yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
   -----END CERTIFICATE-----
   -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
+  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
+  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
+  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
+  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
+  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
+  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
+  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
+  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
   MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
   BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
   MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
@@ -201,3 +216,16 @@ signature-certificate-list =
   5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
   x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
   -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB+DCCAWGgAwIBAgIJAKGd0vpks6T/MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+  BAMMCUNPTVAtMTU4NDAgFw0xMzA2MjAxMjE5MjBaGA8yMTEzMDUyNzEyMTkyMFow
+  FDESMBAGA1UEAwwJQ09NUC0xNTg0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+  gQDZTH9etPUC+wMZQ3UIiOwyyCfHsJ+7duCFYjuo1uZrhtDt/fp8qb8qK9ob+df3
+  EEYgA0IgI2j/9jNUEnKbc5+OrfKznzXjrlrH7zU8lKBVNCLzQuqBKRNajZ+UvO8R
+  nlqK2jZCXP/p3HXDYUTEwIR5W3tVCEn/Vda4upTLcPVE5wIDAQABo1AwTjAdBgNV
+  HQ4EFgQU7KXaNDheQWoy5uOU01tn1M5vNkEwHwYDVR0jBBgwFoAU7KXaNDheQWoy
+  5uOU01tn1M5vNkEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQASmqCU
+  Znbvu6izdicvjuE3aKnBa7G++Fdp2bdne5VCwVbVLYCQWatB+n4crKqGdnVply/u
+  +uZ16u1DbO9rYoKgWqjLk1GfiLw5v86pd5+wZd5I9QJ0/Sbz2vZk5S4ciMIGwArc
+  m711+GzlW5xe6GyH9SZaGOPAdUbI6JTDwLzEgA==
+  -----END CERTIFICATE-----

stack/cloudooo.cfg

@@ -72,7 +72,9 @@ parts =
 # fonts
   liberation-fonts
   ipaex-fonts
+  ipa-fonts
   ocrb-fonts
+  android-fonts
 
 # Dependencies
   cups

stack/erp5/buildout.cfg

@@ -122,7 +122,9 @@ parts =
 # fonts
   liberation-fonts
   ipaex-fonts
+  ipa-fonts
   ocrb-fonts
+  android-fonts
 
 # Cloudooo specific part
   cloudooo