Merge branch 'master' into mysql

CHANGES.txt

@@ -4,7 +4,7 @@ Changes
 0.23 (unreleased)
 -----------------
 
- * No change yet.
+ * Clean code in mysql recipe [Cedric de Saint Martin]
 
 
 0.22 (2011-09-12)

component/libuuid/buildout.cfg

@@ -4,7 +4,7 @@ parts =
 
 [libuuid]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.kernel.org/pub/linux/utils/util-linux/v2.18/util-linux-ng-2.18.tar.bz2
+url = http://mirror.be.gbxs.net/pub/linux/utils/util-linux-ng/v2.18/util-linux-ng-2.18.tar.bz2
 md5sum = 2f5f71e6af969d041d73ab778c141a77
 configure-options =
   --disable-static

component/mariadb/buildout.cfg

@@ -12,9 +12,9 @@ parts =
 
 [mariadb]
 recipe = hexagonit.recipe.cmmi
-version = 5.2.7
-url = http://www.percona.com/downloads/MariaDB/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz
-md5sum = 06b9b102946a3606b38348c0ebf18367
+version = 5.3.1-beta
+url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://mirror.layerjet.com/mariadb
+md5sum = 5b3a94de1c1fcaa193edbbc8d7f8ffe4
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 # configure: how to avoid searching for my.cnf?

component/memcached/buildout.cfg

@@ -27,27 +27,37 @@ download-only = true
 md5sum = 3418477f64500cd2a8dce046f5d72fec
 
 [memcached]
-<= memcached-1.4.5
+<= memcached-1.4.6
+
+[memcached-1.4.6]
+<= memcached-common
+url = http://memcached.googlecode.com/files/memcached-1.4.6.tar.gz
+md5sum = 243e5d82de27e6e45caf0ebfd400e41a
+patches =
+  ${memcached-fix-array-subscript-is-above-array-bounds:location}/${memcached-fix-array-subscript-is-above-array-bounds:filename}
 
 [memcached-1.4.5]
 <= memcached-common
 url = http://memcached.googlecode.com/files/memcached-1.4.5.tar.gz
 md5sum = 583441a25f937360624024f2881e5ea8
+patches =
+  ${memcached-strict-aliasing-patch:location}/${memcached-strict-aliasing-patch:filename}
+  ${memcached-fix-array-subscript-is-above-array-bounds:location}/${memcached-fix-array-subscript-is-above-array-bounds:filename}
+  ${memcached-gcc4.6.patch:location}/${memcached-gcc4.6.patch:filename}
 
 [memcached-1.4.4]
 <= memcached-common
 url = http://memcached.googlecode.com/files/memcached-1.4.4.tar.gz
 md5sum = 5ca5b24de347e97ac1f48f3785b4178a
+patches =
+  ${memcached-strict-aliasing-patch:location}/${memcached-strict-aliasing-patch:filename}
+  ${memcached-fix-array-subscript-is-above-array-bounds:location}/${memcached-fix-array-subscript-is-above-array-bounds:filename}
+  ${memcached-gcc4.6.patch:location}/${memcached-gcc4.6.patch:filename}
 
 [memcached-common]
 recipe = hexagonit.recipe.cmmi
 configure-options =
   --with-libevent=${libevent:location}
-patches =
-  ${memcached-strict-aliasing-patch:location}/${memcached-strict-aliasing-patch:filename}
-  ${memcached-fix-array-subscript-is-above-array-bounds:location}/${memcached-fix-array-subscript-is-above-array-bounds:filename}
-  ${memcached-gcc4.6.patch:location}/${memcached-gcc4.6.patch:filename}
 patch-options = -p1
 environment =
     LDFLAGS =-Wl,-rpath=${libevent:location}/lib
-

component/xtrabackup/buildout.cfg

@@ -36,8 +36,8 @@ filename = ${:_buildout_section_name_}
 
 [xtrabackup]
 recipe = hexagonit.recipe.cmmi
-url = http://www.percona.com/redir/downloads/XtraBackup/XtraBackup-1.6/source/xtrabackup-1.6.tar.gz
-md5sum = 7c263723312cba36539df4cd7a119744
+url = http://www.percona.com/redir/downloads/XtraBackup/xtrabackup-1.6.2/source/xtrabackup-1.6.2.tar.gz
+md5sum = 933243ae362156c98f1211eb87b3b4ea
 make-binary = true
 patches =
   ${xtrabackup-build-patch-download:location}/${xtrabackup-build-patch-download:filename}

component/xtrabackup/xtrabackup_build.patch

-diff --git a/Makefile b/Makefile
-index dbb15d5..852a627 100644
---- a/Makefile
-+++ b/Makefile
-@@ -137,5 +137,5 @@ $(TARGET): xtrabackup.o $(INNODBOBJS) $(MYSQLOBJS)
+diff -ur xtrabackup-1.6.2.orig/Makefile xtrabackup-1.6.2/Makefile
+--- xtrabackup-1.6.2.orig/Makefile	2011-07-19 05:16:22.000000000 +0900
++++ xtrabackup-1.6.2/Makefile	2011-07-27 17:58:38.108925111 +0900
+@@ -137,5 +137,5 @@
  clean:
  	rm -f *.o xtrabackup_* 
  install:
 -	install -m 755 innobackupex-1.5.1 $(BIN_DIR)
 +	install -m 755 innobackupex-1.5.1 $(BIN_DIR)/innobackupex
  	install -m 755 xtrabackup_*  $(BIN_DIR)
-diff --git a/utils/build.sh b/utils/build.sh
-index 3f0cee7..c41dc89 100755
---- a/utils/build.sh
-+++ b/utils/build.sh
-@@ -21,12 +21,14 @@ function usage()
+diff -ur xtrabackup-1.6.2.orig/utils/build.sh xtrabackup-1.6.2/utils/build.sh
+--- xtrabackup-1.6.2.orig/utils/build.sh	2011-07-19 05:16:22.000000000 +0900
++++ xtrabackup-1.6.2/utils/build.sh	2011-07-27 18:01:53.809212142 +0900
+@@ -21,12 +21,14 @@
  {
      echo "Build an xtrabackup binary against the specified InnoDB flavor."
      echo
@@ -29,7 +27,7 @@ index 3f0cee7..c41dc89 100755
      exit -1
  }
  
-@@ -79,7 +81,12 @@ function build_server()
+@@ -79,7 +81,12 @@
  {
      echo "Configuring the server"
      cd $server_dir
@@ -43,19 +41,22 @@ index 3f0cee7..c41dc89 100755
      eval $configure_cmd
  
      echo "Building the server"
-@@ -92,9 +99,10 @@ function build_xtrabackup()
+@@ -92,12 +99,13 @@
      echo "Building XtraBackup"
      mkdir $build_dir
      cp $top_dir/Makefile $top_dir/xtrabackup.c $build_dir
 +    cp $top_dir/innobackupex $build_dir/innobackupex-1.5.1
  
+     # Read XTRABACKUP_VERSION from the VERSION file
+     . $top_dir/VERSION
+ 
      cd $build_dir
--    $MAKE_CMD $xtrabackup_target
-+    $MAKE_CMD PREFIX=$1 $xtrabackup_target
+-    $MAKE_CMD $xtrabackup_target XTRABACKUP_VERSION=$XTRABACKUP_VERSION
++    $MAKE_CMD $xtrabackup_target XTRABACKUP_VERSION=$XTRABACKUP_VERSION PREFIX=$1
      cd $top_dir
  }
  
-@@ -103,11 +111,36 @@ function build_tar4ibd()
+@@ -106,11 +114,36 @@
      echo "Building tar4ibd"
      unpack_and_patch libtar-1.2.11.tar.gz tar4ibd_libtar-1.2.11.patch
      cd libtar-1.2.11
@@ -93,7 +94,7 @@ index 3f0cee7..c41dc89 100755
  ################################################################################
  # Do all steps to build the server, xtrabackup and tar4ibd
  # Expects the following variables to be set before calling:
-@@ -136,9 +169,15 @@ function build_all()
+@@ -141,9 +174,15 @@
  
      build_server
  
@@ -111,7 +112,7 @@ index 3f0cee7..c41dc89 100755
  }
  
  if ! test -f xtrabackup.c
-@@ -148,6 +187,15 @@ then
+@@ -153,6 +192,15 @@
  fi
  
  type=$1
@@ -127,20 +128,20 @@ index 3f0cee7..c41dc89 100755
  top_dir=`pwd`
  
  case "$type" in
-@@ -161,9 +209,10 @@ case "$type" in
+@@ -166,9 +214,10 @@
  	    --with-plugins=innobase \
  	    --with-zlib-dir=bundled \
  	    --enable-shared \
--	    --with-extra-charsets=complex"
-+	    --with-extra-charsets=complex \
-+      --prefix=$2"
+-	    --with-extra-charsets=all"
++	    --with-extra-charsets=all \
++	    --prefix=$2"
  
 -	build_all
 +	build_all $2
  	;;
  
  "innodb55" | "5.5")
-@@ -225,7 +274,7 @@ case "$type" in
+@@ -230,7 +279,7 @@
  
  	build_server