[Lunar-commits] <moonbase> Revert "mysql: version bumped to 5.1.44."

[Florin Braescu]

commit 1aa4815ebe31f3d0f317c259a2f37b4001147fe1
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Thu Feb 25 19:01:37 2010 +0200

    Revert "mysql: version bumped to 5.1.44."
    
    This reverts commit 7d641b7d978e4f788b2aae0f1ccf2ff6fe495874.
    
    mysql: revert it as it breaks akonadi.
---
 sql/mysql/BUILD     |   34 +++++++++++-----------------------
 sql/mysql/CONFIGURE |   21 +++++++++++++++------
 sql/mysql/DEPENDS   |   11 -----------
 sql/mysql/DETAILS   |   15 +++++++--------
 4 files changed, 33 insertions(+), 48 deletions(-)

diff --git a/sql/mysql/BUILD b/sql/mysql/BUILD
index 320c46d..a9bd692 100644
--- a/sql/mysql/BUILD
+++ b/sql/mysql/BUILD
@@ -1,31 +1,19 @@
 (
 
-  message " "
-  message " ${PROBLEM_COLOR}Warning! ${DEFAULT_COLOR}Database backup have to be done to avoid any data loss during migration."
-  message " "
-  query INSTALL "Have you done data backup (y/n)? " n
-
-  if ! [ "$INSTALL" == "y" ] ; then
-     message " "
-     message " ${DEFAULT_COLOR}Please consult first http://dev.mysql.com/doc/refman/5.1/en/upgrade.html before installing."
-     sleep 5
-     exit 1
-  fi
-
   add_priv_user mysql:mysql  &&
   devoke_installwatch        &&
 
   if [ "`arch`" == "alpha" ]; then
-      export CFLAGS="$CFLAGS -fPIC"
-      export CXXFLAGS="$CXXFLAGS -fPIC"
-  fi  &&
+          export CFLAGS="$CFLAGS -fPIC"
+        export CXXFLAGS="$CXXFLAGS -fPIC"
+  fi &&
 
   if [ "`arch`" == "x86_64" ]; then
-      export CFLAGS="$CFLAGS -fPIC"
-      export CXXFLAGS="$CXXFLAGS -fPIC"
-  fi  &&
+         export CFLAGS="$CFLAGS -fPIC"
+       export CXXFLAGS="$CXXFLAGS -fPIC"
+  fi &&
 
-  export CXX='gcc'  &&
+  export CXX='gcc' &&
 
   ./configure  --prefix=/usr                   \
                --disable-dependency-tracking   \
@@ -56,10 +44,10 @@
     message ""
     exit $MYSQL_EXIT;
   }
-  prepare_install                    &&
-  mkdir -p /var/lib/mysql            &&
-  make  pkglibdir=/usr/lib  install  &&
-  rm    -rf  /usr/mysql-test         &&
+  prepare_install                             &&
+  mkdir -p /var/lib/mysql                     &&
+  make  pkglibdir=/usr/lib  install           &&
+  rm    -rf  /usr/mysql-test                  &&
 
   if  [ -x /etc/init.d/mysql.server ]; then
     rm -f /etc/init.d/mysql.server
diff --git a/sql/mysql/CONFIGURE b/sql/mysql/CONFIGURE
index d0705aa..a96ff3f 100644
--- a/sql/mysql/CONFIGURE
+++ b/sql/mysql/CONFIGURE
@@ -1,7 +1,7 @@
 if  !  grep  -q  CONFIGURED  $MODULE_CONFIG;  then
 
-  if  query  "Install client only? " n; then
-       OPTS="$OPTS --without-server"
+ if    query  "Install client only? " n; then
+    OPTS="$OPTS --without-server"
   else
     if  query  "Enable InnoDB Support? Needed by KDE4/Akonadi " n; then
       OPTS="$OPTS --with-innodb"
@@ -9,6 +9,12 @@ if  !  grep  -q  CONFIGURED  $MODULE_CONFIG;  then
       OPTS="$OPTS --without-innodb"
     fi
 
+    if  query  "Enable BDB Support? " n; then
+      OPTS="$OPTS --with-berkeley-db"
+    else
+      OPTS="$OPTS --without-berkeley-db"
+    fi
+
     if  query  "Enable RAID Support? " n; then
       OPTS="$OPTS --with-raid"
     else
@@ -34,12 +40,16 @@ if  !  grep  -q  CONFIGURED  $MODULE_CONFIG;  then
     fi
   fi
 
-  if  query  "Build embedded server (libmysqld), needed by KDE4 ? " n; then
+  if    query  "Include the OpenSSL support? " n; then
+    OPTS="$OPTS --with-openssl"
+  fi
+
+  if    query  "Build embedded server (libmysqld), needed by KDE4 ? " n; then
     OPTS="$OPTS --with-embedded-server"
   else
     OPTS="$OPTS --without-embedded-server"
   fi
-
+  
   if  query "Enable all character sets? " y; then
     OPTS="$OPTS --with-extra-charsets=all"
   elif query "Enable just complex character sets? " y; then
@@ -49,6 +59,5 @@ if  !  grep  -q  CONFIGURED  $MODULE_CONFIG;  then
   fi
 
   echo  'CONFIGURED="y"'  >>  $MODULE_CONFIG
-  echo  'OPTS='\"$OPTS\"  >>  $MODULE_CONFIG
-
+  echo  'OPTS='\"$OPTS\"    >>  $MODULE_CONFIG
 fi
diff --git a/sql/mysql/DEPENDS b/sql/mysql/DEPENDS
index 2bc80cd..cabe0eb 100644
--- a/sql/mysql/DEPENDS
+++ b/sql/mysql/DEPENDS
@@ -1,13 +1,2 @@
 depends  chkconfig
 depends  perl
-
-optional_depends  "db"                    \
-                  "--with-berkley-db"     \
-                  "--without-berkley-db"  \
-                  "for Berkley DB support"
-
-optional_depends  "openssl"        \
-                  "--with-ssl"     \
-                  "--without-ssl"  \
-                  "for SSL support"
-
diff --git a/sql/mysql/DETAILS b/sql/mysql/DETAILS
index faa6c0a..8547b35 100644
--- a/sql/mysql/DETAILS
+++ b/sql/mysql/DETAILS
@@ -1,14 +1,14 @@
           MODULE=mysql
-         VERSION=5.1.44
+         VERSION=5.0.90
           SOURCE=$MODULE-$VERSION.tar.gz
-   SOURCE_URL[0]=ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/MySQL-5.1
-   SOURCE_URL[1]=ftp://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-5.1
-   SOURCE_URL[2]=http://mysql.mirrors.pair.com/Downloads/MySQL-5.1
-   SOURCE_URL[3]=http://mirrors.sunsite.dk/mysql/Downloads/MySQL-5.1
-      SOURCE_VFY=sha1:265fbca02b2ef62926e2845d5fdf394298eb3206
+   SOURCE_URL[0]=ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/MySQL-5.0
+   SOURCE_URL[1]=ftp://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-5.0
+   SOURCE_URL[2]=http://mysql.mirrors.pair.com/Downloads/MySQL-5.0
+   SOURCE_URL[3]=http://mirrors.sunsite.dk/mysql/Downloads/MySQL-5.0
+      SOURCE_VFY=sha1:c637d0afed52de1e3326824afa954d1ffbcc7a2f
         WEB_SITE=http://www.mysql.com
          ENTERED=20011114
-         UPDATED=20100222
+         UPDATED=20100130
            SHORT="A widely used and fast SQL database server"
 
 cat << EOF
@@ -16,4 +16,3 @@ MySQL is a widely used and fast SQL database server. It is a client/
 server implementation that consists of a server daemon (mysqld) and 
 many different client programs/libraries.
 EOF
-