Merge branch 'erp5-component' into erp5

component/curl/buildout.cfg

@@ -11,8 +11,8 @@ parts =
 
 [curl]
 recipe = slapos.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.31.0.tar.bz2
-md5sum = b7bea20579ac2f696338ae03f2c19ba5
+url = http://curl.haxx.se/download/curl-7.33.0.tar.bz2
+md5sum = 57409d6bf0bd97053b8378dbe0cadcef
 configure-options =
   --disable-static
   --disable-ldap
@@ -28,12 +28,15 @@ configure-options =
   --enable-ipv6
   --disable-sspi
   --without-gnutls
+  --without-spnego
   --with-ssl=${openssl:location}
   --with-zlib=${zlib:location}
   --without-nss
+  --without-libmetalink
   --without-libssh2
   --without-librtmp
   --without-libidn
+  --without-nghttp2
 
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s

component/gettext/buildout.cfg

@@ -8,12 +8,13 @@ extends =
 
 [gettext]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.2.1.tar.gz
-md5sum = 034c8103b14654ebd300fadac44d6f14
+url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.3.1.tar.gz
+md5sum = 3fc808f7d25487fc72b5759df7419e02
 
 configure-options =
   --disable-static
   --disable-java
+  --disable-native-java
   --disable-csharp
   --with-libncurses-prefix=${ncurses:location}
   --with-libxml2-prefix=${libxml2:location}
@@ -22,6 +23,8 @@ configure-options =
   --disable-acl
   --disable-openmp
   --without-git
+  --without-bz2
+  --without-xz
 
 environment =
   CPPFLAGS=-I${libxml2:location}/include -I${zlib:location}/include -I${ncurses:location}/include

component/grep/buildout.cfg

@@ -8,8 +8,8 @@ parts =
 
 [grep]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/grep/grep-2.14.tar.xz
-md5sum = d4a3f03849d1e17ce56ab76aa5a24cab
+url = http://ftp.gnu.org/gnu/grep/grep-2.15.tar.xz
+md5sum = 8cab8ca52bcae735af40278423c7c942
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${pcre:location}/include

component/groonga/buildout.cfg

@@ -11,9 +11,9 @@ extends =
 
 [groonga]
 recipe = slapos.recipe.cmmi
-version = 3.0.9
+version = 3.1.0
 url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz
-md5sum = 2e9f7090f40876233c1f077fd25c26ee
+md5sum = 93db2097cba720f41fb736822cc9bcb7
 configure-options =
   --disable-static
   --disable-glibtest

component/m4/buildout.cfg

 [buildout]
+extends =
+  ../xz-utils/buildout.cfg
 parts =
   m4
 
-[m4-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = dc5f06fb42649e181c40177eb1edc333
-download-only = true
-filename = drop.gets.patch
-
 [m4]
-virtual-depends = ${m4-drop.gets.patch:md5sum}
-patch-options = -p1
-patches =
-  ${m4-drop.gets.patch:location}/${m4-drop.gets.patch:filename}
-
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.bz2
-md5sum = 8a7cef47fecab6272eb86a6be6363b2f
+url = http://ftp.gnu.org/gnu/m4/m4-1.4.17.tar.xz
+md5sum = 12a3c829301a4fd6586a57d3fcf196dc
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s

component/mariadb/buildout.cfg

@@ -63,8 +63,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-3.09.tar.gz
-md5sum = bdcd1d86185a64520881d33e12b7d7a7
+url = http://packages.groonga.org/source/mroonga/mroonga-3.10.tar.gz
+md5sum = d519f9e21cfe8ec07ea607873dc1a501
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config
@@ -74,6 +74,6 @@ depends =
   ${groonga-normalizer-mysql:version}
 environment =
   PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  CPPFLAGS=-I${groonga:location}/include/groonga -I${mariadb:location}__compile__/mariadb-${mariadb:version}/pcre
+  CPPFLAGS=-I${groonga:location}/include/groonga
   LDFLAGS=-L${groonga:location}/lib
   PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig:${groonga-normalizer-mysql:location}/lib/pkgconfig

component/python-2.7/buildout.cfg

@@ -27,8 +27,8 @@ python = python2.7
 [python2.7]
 recipe = slapos.recipe.cmmi
 package_version = 2.7.6
-package_version_suffix = rc1
-md5sum = 74e1f6abe529350ac0d239387ee98616
+package_version_suffix =
+md5sum = bcf93efa8eaf383c98ed3ce40b763497
 
 depends =
   ${gdbm:version}