Merge branch 'erp5-component' into erp5

component/apache/buildout.cfg

@@ -21,19 +21,19 @@ md5sum = ffee70a111fd07372982b0550bbb14b7
 
 [apr-util]
 recipe = hexagonit.recipe.download
-version = 1.4.1
+version = 1.5.1
 url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-util-${:version}.tar.bz2
-md5sum = 52b31b33fb1aa16e65ddaefc76e41151
+md5sum = 9c1db8606e520f201c451ec9a0b095f6
 
 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = hexagonit.recipe.cmmi
 depends =
   ${gdbm:version}
-version = 2.4.3
-revision = 2
+version = 2.4.4
+revision = 1
 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 87aaf7bc7e8715f0455997bb8c6791aa
+md5sum = 0e712ee2119cd798c8ae39d5f11a9206
 configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure
 configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
                     --disable-static
@@ -120,8 +120,8 @@ make-targets =
 [apache-2.2]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = hexagonit.recipe.cmmi
-url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.22.tar.gz
-md5sum = d77fa5af23df96a8af68ea8114fa6ce1
+url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.24.tar.gz
+md5sum = 64a3392018ad60583209a16d728180d3
 patch-options = -p1
 configure-options = --disable-static
                     --enable-authn-alias

component/groonga/buildout.cfg

@@ -11,9 +11,9 @@ extends =
 
 [groonga]
 recipe = hexagonit.recipe.cmmi
-version = 3.0.0
+version = 3.0.1
 url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz
-md5sum = 75961cef063c3523751682f437e13b07
+md5sum = fd03bb14a04e7c696151b5673e408701
 configure-options =
   --disable-static
   --disable-glibtest
@@ -27,9 +27,9 @@ environment =
 
 [groonga-normalizer-mysql]
 recipe = hexagonit.recipe.cmmi
-version = 1.0.0
+version = 1.0.1
 url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-${:version}.tar.gz
-md5sum = 71182d064896a22f008960cc22934db5
+md5sum = 93239c856f2e4768562506d440cb4c7d
 location = ${groonga:location}
 depends =
   ${groonga:version}

component/mariadb/buildout.cfg

@@ -62,8 +62,8 @@ environment =
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
 # http://mroonga.github.com/
 recipe = hexagonit.recipe.cmmi
-url = http://packages.groonga.org/source/mroonga/mroonga-3.00.tar.gz
-md5sum = d565539d5002237cbb603c70c2b8c191
+url = http://packages.groonga.org/source/mroonga/mroonga-3.01.tar.gz
+md5sum = 45c302ca45ae0eb4bbc6f3ec5f7f1072
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config
@@ -75,4 +75,4 @@ environment =
   PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${groonga:location}/include/groonga
   LDFLAGS=-L${groonga:location}/lib
-  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig:${groonga-normalizer-mysql:location}/lib/pkgconfig

slapos/recipe/generic_mysql/template/my.cnf.in

@@ -22,7 +22,7 @@ slow_query_log
 slow_query_log_file = %(slow_query_log)s
 long_query_time = 1
 max_allowed_packet = 128M
-query_cache_size = 32M
+query_cache_size = 0
 
 plugin-load = ha_mroonga.so;handlersocket.so
 

stack/erp5/buildout.cfg

@@ -142,7 +142,7 @@ parts =
 [slapos.cookbook-repository]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/slapos.git
-branch = erp5
+branch = erp5-component
 git-executable = ${git:location}/bin/git
 
 [check-recipe]
@@ -344,7 +344,7 @@ repository_id_list = erp5
 [erp5]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/erp5.git
-branch = master
+branch = erp5-component
 git-executable = ${git:location}/bin/git
 
 [fix-products-paths]
@@ -608,6 +608,7 @@ huBarcode = 0.63
 inotifyx = 0.2.0
 ipdb = 0.7
 ipython = 0.13
+lxml = 2.3.6
 meld3 = 0.6.8
 netaddr = 0.7.9
 netifaces = 0.8