Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 database/mariadb/BUILD              |    2 +-
 database/mariadb/DETAILS            |   10 ++++++++--
 database/mariadb/EXPORTS            |    1 +
 database/mariadb/HISTORY            |   11 +++++++++--
 database/mariadb/INSTALL            |    3 +--
 database/mariadb/PREPARE            |   16 ++++++++++++++++
 database/mariadb/REPAIR^all^EXPORTS |    1 +
 7 files changed, 37 insertions(+), 7 deletions(-)

New commits:
commit aede71593f7e5efd6e3ce9433135e4d87396f66c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    mariadb: added 5.3 branch

diff --git a/database/mariadb/BUILD b/database/mariadb/BUILD
index b0c48e8..47781f2 100755
--- a/database/mariadb/BUILD
+++ b/database/mariadb/BUILD
@@ -24,4 +24,4 @@ OPTS="--with-mysqld-user=mariadb \
 default_build &&
 
 LD_PRELOAD="$LD_PRELOAD_OLD" &&
-make pkglibdir=${TRACK_ROOT}/usr/lib
+make
diff --git a/database/mariadb/DETAILS b/database/mariadb/DETAILS
index 788e7c7..7111b30 100755
--- a/database/mariadb/DETAILS
+++ b/database/mariadb/DETAILS
@@ -1,15 +1,21 @@
            SPELL=mariadb
+if [[ $MARIADB_BRANCH == 5.3 ]]; then
+         VERSION=5.3.12
+     
SOURCE_HASH=sha512:d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94
+else
          VERSION=5.2.14
   SECURITY_PATCH=3
+      PATCHLEVEL=1
+     
SOURCE_HASH=sha512:b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869
+fi
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-     
SOURCE_HASH=sha512:b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869
    
SOURCE_URL[0]=http://mirrors.fe.up.pt/pub/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE
    
SOURCE_URL[1]=http://ftp-stud.hs-esslingen.de/pub/Mirrors/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE
    
SOURCE_URL[2]=http://ftp.osuosl.org/pub/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE
    
SOURCE_URL[3]=http://mirrors.supportex.net/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE
       LICENSE[0]=GPL
-        WEB_SITE=http://askmonty.org/wiki/MariaDB
+        WEB_SITE=https://mariadb.org/
         KEYWORDS="sql database"
          ENTERED=20100402
            SHORT="backward compatible, drop-in replacement branch of the 
MySQL(r) database server"
diff --git a/database/mariadb/EXPORTS b/database/mariadb/EXPORTS
new file mode 100755
index 0000000..ecc8c23
--- /dev/null
+++ b/database/mariadb/EXPORTS
@@ -0,0 +1 @@
+MARIADB_BRANCH
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index c7a801d..70c5fbd 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,6 +1,13 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: added 5.3 branch; PATCHLEVEL=1 for 5.2 branch to set
+         MARIADB_BRANCH in tablet for further usage; updated website
+       * BUILD, INSTALL: use default pkglibdir (fixes 5.3 branch build), puts
+         mysql modules into isolated place in a system
+       * PREPARE: added branching framework
+       * {REPAIR^all^,}EXPORTS: added, to export MARIADB_BRANCH
+
 2013-02-01 Sukneet Basuta <sukneet AT sourcemage.org>
-       * BUILD: build with -with-readline until system readline support
-         fixed
+       * BUILD: build with --with-readline until system readline support 
fixed
 
 2013-02-01 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 5.2.14; SECURITY_PATCH++
diff --git a/database/mariadb/INSTALL b/database/mariadb/INSTALL
index 1bf093d..9c90b69 100755
--- a/database/mariadb/INSTALL
+++ b/database/mariadb/INSTALL
@@ -1,5 +1,4 @@
-make pkglibdir="${TRACK_ROOT}/usr/lib" \
-     benchdir_root="${TRACK_ROOT}/usr/share/mysql" \
+make benchdir_root="${TRACK_ROOT}/usr/share/mysql" \
      testroot="${TRACK_ROOT}/usr/share/mysql" \
      install &&
 
diff --git a/database/mariadb/PREPARE b/database/mariadb/PREPARE
index c605187..cb0d439 100755
--- a/database/mariadb/PREPARE
+++ b/database/mariadb/PREPARE
@@ -1,2 +1,18 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+
+#
+# This block is required for proper configuration procedure for users with 
5.2
+# branch installed after adding multiversion functionality to the spell and
+# prevents previous branch from resetting to a new default value on ``cast 
-r''
+#
+persistent_read $SPELL MARIADB_BRANCH MARIADB_BRANCH || true &&
+
+if [[ -z "$MARIADB_BRANCH" ]]; then
+  persistent_add MARIADB_BRANCH &&
+  local MARIADB_BRANCH="5.2"
+fi &&
+
+prepare_select_branch 5.3 5.2 &&
+
 config_query MARIA_TESTS "Install MariaDB testing utilities?" n &&
 config_query MARIA_BENCH "Install MariaDB benchmarking utilities?" n
diff --git a/database/mariadb/REPAIR^all^EXPORTS 
b/database/mariadb/REPAIR^all^EXPORTS
new file mode 100755
index 0000000..ecc8c23
--- /dev/null
+++ b/database/mariadb/REPAIR^all^EXPORTS
@@ -0,0 +1 @@
+MARIADB_BRANCH