Merge branch 'erp5' into erp5-cluster

component/firefox/buildout.cfg

@@ -7,7 +7,6 @@ extends =
   ../gtk-2/buildout.cfg
   ../libpng/buildout.cfg
   ../dash/buildout.cfg
-  ../openssl/buildout.cfg
 
 parts =
   firefox
@@ -22,8 +21,10 @@ depends =
   ${liberation-fonts:location}
   ${ipaex-fonts:location}
 
-x86 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/18.0.2/linux-i686/en-US/firefox-18.0.2.tar.bz2 9eb4dcf2e9578203a16da3c70817ccb2
-x86-64 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/18.0.2/linux-x86_64/en-US/firefox-18.0.2.tar.bz2 29903172f6fd788f04dbeb27b9193fe6
+version = 27.0
+
+x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 2711961e5fcccbb224625a77fd0f4422
+x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 ea3eb21e260647bfbe5f308bff74d6f0
 
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
@@ -34,7 +35,7 @@ script =
   wrapper = open(wrapper_location, 'w')
   wrapper.write("""#!${dash:location}/bin/dash
   cd %(location)s
-  export LD_LIBRARY_PATH=%(location)s:${libXrender:location}/lib:${dbus:location}/lib:${dbus-glib:location}/lib:${freetype:location}/lib:${fontconfig:location}/lib:${libX11:location}/lib:${bzip2:location}/lib:${libXext:location}/lib:${libXt:location}/lib:${zlib:location}/lib:${libXcursor:location}/lib:${gtk-2:location}/lib:${cairo:location}/lib:${pango:location}/lib:${glib:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${alsa:location}/lib:${libpng15:location}/lib:${libSM:location}/lib:${libICE:location}/lib:${libxml2:location}/lib:${openssl:location}/lib
+  export LD_LIBRARY_PATH=%(location)s:${alsa:location}/lib:${atk:location}/lib:${bzip2:location}/lib:${cairo:location}/lib:${dbus:location}/lib:${dbus-glib:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${gdk-pixbuf:location}/lib:${gettext:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${harfbuzz:location}/lib:${libICE:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXcursor:location}/lib:${libXext:location}/lib:${libXrender:location}/lib:${libXt:location}/lib:${libffi:location}/lib:${libpng:location}/lib:${libtool:location}/lib:${libuuid:location}/lib:${libxcb:location}/lib:${libxml2:location}/lib:${pango:location}/lib:${pixman:location}/lib:${xfixes:location}/lib:${zlib:location}/lib
   export PATH=${fontconfig:location}/bin:$PATH
   exec %(location)s/firefox $*""")
   wrapper.close()

component/groonga/buildout.cfg

@@ -11,9 +11,9 @@ extends =
 
 [groonga]
 recipe = slapos.recipe.cmmi
-version = 3.1.2
+version = 4.0.0
 url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz
-md5sum = fdd39d0c5bd647fb1a42e65f9d389081
+md5sum = 63d1ae3453719f7bef06a30f8966e886
 configure-options =
   --disable-static
   --disable-glibtest
@@ -27,9 +27,9 @@ environment =
 
 [groonga-normalizer-mysql]
 recipe = slapos.recipe.cmmi
-version = 1.0.5
+version = 1.0.6
 url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-${:version}.tar.gz
-md5sum = 88c0ab0d07c761877a5271e4a7f18551
+md5sum = 12740a835cfdf4b0dac66c3f2f152d84
 location = ${groonga:location}
 depends =
   ${groonga:version}

component/libpng/buildout.cfg

@@ -18,16 +18,16 @@ environment =
 
 [libpng12]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.2.50.tar.bz2
-md5sum = 717caa58e9c71a80820eb38c4f4d6ec3
+url = http://download.sourceforge.net/libpng/libpng-1.2.51.tar.xz
+md5sum = 4efba67fa5aa2b785c6fcec2cc3e90c9
 
 [libpng15]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.17.tar.xz
-md5sum = 6509aba334bbd87613d2d353a2af44d6
+url = http://download.sourceforge.net/libpng/libpng-1.5.18.tar.xz
+md5sum = 23fb6a0e9f4dbaab7b34b6fd317a4f2d
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.6.8.tar.xz
-md5sum = 51ce71a1642cdde1f4485a7ff82193c0
+url = http://download.sourceforge.net/libpng/libpng-1.6.9.tar.xz
+md5sum = 14e037c5c9f1db16844760285ad5c2d6
 so_version = 16

component/mariadb/buildout.cfg

@@ -17,24 +17,24 @@ extends =
 parts =
   mariadb
 
-[mariadb-10.0.5-no_test-patch]
+[mariadb-10.0.8-no_test-patch]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
-md5sum = acc065292320f0c2805ce6bbdc3af0b5
-filename = mariadb_10.0.5_create_system_tables__no_test.patch
+md5sum = a176d491cf45fccd53ee397c70393bc4
+filename = mariadb_10.0.8_create_system_tables__no_test.patch
 download-only = true
 
 [mariadb]
 recipe = slapos.recipe.cmmi
-version = 10.0.7
+version = 10.0.8
 revision = 1
 url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
-md5sum = 46d341a6e76f3faf6891d3db45402862
+md5sum = 2b925d0beae8101f1f3f98102da91bf7
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0
 patches =
-  ${mariadb-10.0.5-no_test-patch:location}/${mariadb-10.0.5-no_test-patch:filename}
+  ${mariadb-10.0.8-no_test-patch:location}/${mariadb-10.0.8-no_test-patch:filename}
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
   -DCMAKE_INSTALL_PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
@@ -63,11 +63,13 @@ 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.12.tar.gz
-md5sum = 45d98789035dd9f00ad7cdc74098e190
+url = http://packages.groonga.org/source/mroonga/mroonga-4.00.tar.gz
+md5sum = f54c44c1ab0a98bea9f6ea6c4a8b2787
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config
+  --disable-static
+  --disable-document
 depends =
   ${mariadb:version}
   ${mariadb:revision}

component/mariadb/mariadb_10.0.5_create_system_tables__no_test.patch → component/mariadb/mariadb_10.0.8_create_system_tables__no_test.patch

@@ -7,7 +7,7 @@ and http://bugs.mysql.com/bug.php?id=6901
 
 --- scripts/mysql_system_tables_data.sql.orig   2013-11-05 17:46:05.000000000 +0100
 +++ scripts/mysql_system_tables_data.sql        2013-11-08 09:28:34.707291508 +0100
-@@ -31,8 +31,6 @@
+@@ -30,8 +30,6 @@
  -- Fill "db" table with default grants for anyone to
  -- access database 'test' and 'test_%' if "db" table didn't exist
  CREATE TEMPORARY TABLE tmp_db LIKE db;
@@ -15,13 +15,13 @@ and http://bugs.mysql.com/bug.php?id=6901
 -INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
  INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
  DROP TABLE tmp_db;
-
-@@ -44,8 +42,6 @@
- REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N' FROM dual WHERE LOWER( @current_hostname) != 'localhost';
+ 
+@@ -43,8 +41,6 @@
+ REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N' FROM dual WHERE @current_hostname != 'localhost';
  REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N');
  REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N');
 -INSERT INTO tmp_user (host,user) VALUES ('localhost','');
--INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost';
+-INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost';
  INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
  DROP TABLE tmp_user;
-
+ 

stack/erp5/buildout.cfg

@@ -466,7 +466,6 @@ eggs =
   PyXML
   Pympler
   SOAPpy
-  cElementTree
   chardet
   coverage
   elementtree
@@ -684,10 +683,9 @@ PyPDF2 = 1.20
 StructuredText = 2.11.1
 WSGIUtils = 0.7
 Werkzeug = 0.9.4
-apache-libcloud = 0.14.0
+apache-libcloud = 0.14.1
 async = 0.6.1
-atomize = 0.1.1
-cElementTree = 1.0.5-20051216
+atomize = 0.2.0
 chardet = 2.2.1
 cliff = 1.5.2
 csp-eventlet = 0.7.0