Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (83795e972679827287de6fef01666ed66b864f72)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (83795e972679827287de6fef01666ed66b864f72)
  • Date: Thu, 11 Nov 2010 15:39:53 -0600

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

database/mariadb/BUILD | 98
++++++++-------------------------------
database/mariadb/CONFIGURE | 35 +++++++++----
database/mariadb/DEPENDS | 19 ++-----
database/mariadb/DETAILS | 19 +++----
database/mariadb/FINAL | 4 +
database/mariadb/HISTORY | 14 +++++
database/mariadb/INSTALL | 3 -
database/mariadb/POST_INSTALL | 3 -
database/mariadb/PREPARE | 4 -
database/mariadb/PRE_SUB_DEPENDS | 4 -
database/mariadb/SUB_DEPENDS | 8 +--
11 files changed, 90 insertions(+), 121 deletions(-)

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

mariadb: => 5.2.3

diff --git a/database/mariadb/BUILD b/database/mariadb/BUILD
index a1c3986..4bc45d2 100755
--- a/database/mariadb/BUILD
+++ b/database/mariadb/BUILD
@@ -1,80 +1,26 @@
-OPTS="--with-charset=$MADB_CHARSET $OPTS" &&
+create_account mariadb &&

+OPTS="$MADB_SERVER $MADB_EMBED $OPTS" &&
+CFLAGS="${CFLAGS//-ffast-math}" &&

-if list_find "$MADB_ENGINES" "none" ; then
- OPTS="--without-archive-storage-engine \
- --without-berkeley-db \
- --without-blackhole-storage-engine \
- --without-example-storage-engine \
- --without-federated-storage-engine \
- --without-innodb \
- --without-ndbcluster \
- $OPTS"
-else
- if list_find "$MADB_ENGINES" "ARCHIVE" ; then
- OPTS="--with-archive-storage-engine $OPTS"
- else
- OPTS="--without-archive-storage-engine $OPTS"
- fi &&
- if ! list_find "$MADB_ENGINES" "BerkeleyDB" ; then
- OPTS="--without-berkeley-db $OPTS"
- fi &&
- if list_find "$MADB_ENGINES" "BLACKHOLE" ; then
- OPTS="--with-blackhole-storage-engine $OPTS"
- else
- OPTS="--without-blackhole-storage-engine $OPTS"
- fi &&
- if list_find "$MADB_ENGINES" "EXAMPLE" ; then
- OPTS="--with-example-storage-engine $OPTS"
- else
- OPTS="--without-example-storage-engine $OPTS"
- fi &&
- if list_find "$MADB_ENGINES" "FEDERATED" ; then
- OPTS="--with-federated-storage-engine $OPTS"
- else
- OPTS="--without-federated-storage-engine $OPTS"
- fi &&
- if list_find "$MADB_ENGINES" "InnoDB" ; then
- OPTS="--with-innodb $OPTS"
- else
- OPTS="--without-innodb $OPTS"
- fi &&
- if list_find "$MADB_ENGINES" "ndbcluster" ; then
- OPTS="--with-ndbcluster $OPTS"
- else
- OPTS="--without-ndbcluster $OPTS"
- fi
-fi &&
-
-OPTS="$MADB_SERVER $MADB_EMBED $OPTS" &&
-CFLAGS="${CFLAGS//-ffast-math}" &&
-
-create_account mariadb &&
-
-local LD_PRELOAD_OLD="$LD_PRELOAD" &&
-unset LD_PRELOAD &&
-export CFLAGS="$CFLAGS -DUSE_OLD_FUNCTIONS" &&
+local LD_PRELOAD_OLD="$LD_PRELOAD" &&
+unset LD_PRELOAD &&
+CFLAGS="$CFLAGS -DUSE_OLD_FUNCTIONS" &&

if glibc_is_nptl; then
- OPTS="$OPTS --with-named-thread-libs=-lpthread" &&
- export CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-fi &&
-OPTS="$OPTS --with-mysqld-user=mariadb --without-bench \
- --localstatedir=${INSTALL_ROOT}/var/lib/mysql \
- --enable-assembler --enable-thread-safe-client" &&
-default_build &&
-
-#./configure --build=$BUILD \
-# --prefix=$INSTALL_ROOT/usr \
-# --sysconfdir=$INSTALL_ROOT/etc \
-# --mandir=$INSTALL_ROOT/usr/share/man \
-# --infodir=$INSTALL_ROOT/usr/share/info \
-# --localstatedir=/var/lib/mysql \
-# --with-mysqld-user=mysql \
-# --without-bench \
-# --enable-assembler \
-# --enable-thread-safe-client \
-# $OPTS &&
-
-export LD_PRELOAD="$LD_PRELOAD_OLD" &&
-make pkglibdir=${TRACK_ROOT}/usr/lib
+ OPTS="--with-named-thread-libs=-lpthread $OPTS" &&
+ CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+fi &&
+
+OPTS="--with-mysqld-user=mariadb \
+ --with-charset=$MADB_CHARSET \
+ --with-plugins=${MADB_ENGINES// /,} \
+ --localstatedir=${INSTALL_ROOT}/var/lib/mariadb \
+ --enable-assembler \
+ --enable-thread-safe-client \
+ $OPTS" &&
+
+default_build &&
+
+LD_PRELOAD="$LD_PRELOAD_OLD" &&
+make pkglibdir=${TRACK_ROOT}/usr/lib
diff --git a/database/mariadb/CONFIGURE b/database/mariadb/CONFIGURE
index a9ecc45..cab8651 100755
--- a/database/mariadb/CONFIGURE
+++ b/database/mariadb/CONFIGURE
@@ -48,17 +48,32 @@ config_query_multi MADB_ENGINES
\
"What additional storage engines to build?" \
none \
all \
- ARCHIVE \
- BerkeleyDB \
- BLACKHOLE \
- EXAMPLE \
- FEDERATED \
- InnoDB \
- ndbcluster &&
+ archive \
+ xtradb \
+ blackhole \
+ example \
+ federated \
+ innodb_plugin \
+ ndbcluster \
+ myisam \
+ partition \
+ auth \
+ daemon_example \
+ ftexample \
+ csv \
+ federatedx \
+ heap \
+ ibmdb2i \
+ aria \
+ myisammrg \
+ oqgraph \
+ pbxt \
+ sphinx &&

-if list_find "$MADB_ENGINES" "all"
-then
- MADB_ENGINES="ARCHIVE BerkeleyDB BLACKHOLE EXAMPLE FEDERATED InnoDB
ndbcluster"
+if list_find "$MADB_ENGINES" "all"; then
+ MADB_ENGINES="all"
+elif list_find "$MADB_ENGINES" "none"; then
+ MADB_ENGINES="none"
fi &&

config_query_option MADB_EMBED \
diff --git a/database/mariadb/DEPENDS b/database/mariadb/DEPENDS
index 3387320..d4819eb 100755
--- a/database/mariadb/DEPENDS
+++ b/database/mariadb/DEPENDS
@@ -3,18 +3,11 @@ depends perl &&
depends procps &&
depends g++ &&

-if [[ $OLD == y ]]; then
- optional_depends openssl \
- "--with-openssl" \
- "--without-openssl" \
- "for OpenSSL support"
-else
- optional_depends openssl \
- "--with-ssl" \
- "--without-ssl" \
- "for OpenSSL support"
-fi &&
+optional_depends openssl \
+ "--with-ssl" \
+ "--without-ssl" \
+ "for OpenSSL support" &&

-if ! list_find "$MSQL_ENGINES" "none" && list_find "$MSQL_ENGINES"
"BerkeleyDB"; then
- depends db "--with-berkeley-db"
+if list_find "$MADB_ENGINES" "all" || list_find "$MADB_ENGINES" "sphinx";
then
+ depends sphinx "--with-plugin-sphinx"
fi
diff --git a/database/mariadb/DETAILS b/database/mariadb/DETAILS
index 55e66b4..2f00f22 100755
--- a/database/mariadb/DETAILS
+++ b/database/mariadb/DETAILS
@@ -1,19 +1,20 @@
SPELL=mariadb
- VERSION=5.1.47
+ VERSION=5.2.3
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-
SOURCE_HASH=sha512:bccaace9d3ca4713ef99bdcfd14dfafa8bb09a8a3a7d9c736f607e4914568b53523da3123b746f74cfc6c574d4dc1818894a5ffcba25ba646bffeb7089662635
-
SOURCE_URL[0]=http://ftp.rediris.es/mirror/MariaDB/${SPELL}-${VERSION}/kvm-tarbake-jaunty-x86/${SOURCE}
-
SOURCE_URL[1]=http://maria.llarian.net/download/${SPELL}-${VERSION}/kvm-tarbake-jaunty-x86/${SOURCE}
+
SOURCE_HASH=sha512:25d044a44c766b05177eadea5fbb7ef1a19fd792883f980b418f4cc0c3c457728515f2aa8d8ea915ef3c4529fcbd42f6313187f6ae74cbc241d00c96a6ca09cc
+
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
KEYWORDS="sql database"
- ENTERED=20011114
- SHORT="MariaDB is a backward compatible, drop-in replacement
branch of the MySQL(r) Database Sever"
+ ENTERED=20100402
+ SHORT="backward compatible, drop-in replacement branch of the
MySQL(r) database server"
cat << EOF
-MariaDB is a backward compatible, drop-in replacement branch of the
-MySQL(r) Database Server.
+MariaDB is a backward compatible, drop-in replacement branch of the
+MySQL(r) database server.

It includes all major open source storage engines,
including the Maria storage engine.
diff --git a/database/mariadb/FINAL b/database/mariadb/FINAL
new file mode 100755
index 0000000..9e21478
--- /dev/null
+++ b/database/mariadb/FINAL
@@ -0,0 +1,4 @@
+ message "${MESSAGE_COLOR}After initial install of MariaDB run"
+ message "\"mysql_install_db --user=mariadb\" to create directory"
+ message "structure and initial tables. See MariaDB documentation"
+ message "for more information${DEFAULT_COLOR}"
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index 1be87d8..25edfb5 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,16 @@
+2010-11-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.2.3 (latest stable); removed useless
+ SOURCE2_IGNORE; set correct mirrors; fixed ENTERED, descriptions
+ * BUILD: removed dirty hacks, fixed localstatedir; removed incorrect
+ configure flags; cleaned up
+ * CONFIGURE: added more storage engines to select
+ * DEPENDS: removed old checks from mysql; added sphinx dependency
+ * INSTALL: increased verbosity level; quoting paths
+ * POST_INSTALL: removed, we don't do/force anything for SA
+ * FINAL: added, as informational replacement of POST_INSTALL
+ * PREPARE: s:MySQL:MariaDB:
+ * {PRE_}SUB_DEPENDS: fixed variable names, so they can actually work
+
2010-05-19 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* DETAILS: updated spell to 5.1.47, updating mirrors

@@ -11,4 +24,3 @@

2010-04-02 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* spell created
-
diff --git a/database/mariadb/INSTALL b/database/mariadb/INSTALL
index 734ead5..1ae9745 100755
--- a/database/mariadb/INSTALL
+++ b/database/mariadb/INSTALL
@@ -11,4 +11,5 @@ if [[ $MARIA_BENCH == n ]]; then
rm -fr "${INSTALL_ROOT}/usr/share/mysql/sql-bench"
fi &&

-install -m 0644 $SCRIPT_DIRECTORY/profile.d/mariadb
$INSTALL_ROOT/etc/sysconfig
+install -vm 0644 "$SPELL_DIRECTORY/profile.d/mariadb" \
+ "$INSTALL_ROOT/etc/sysconfig"
diff --git a/database/mariadb/POST_INSTALL b/database/mariadb/POST_INSTALL
deleted file mode 100755
index 16144c3..0000000
--- a/database/mariadb/POST_INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-default_post_install &&
-chown mariadb.mariadb /var/lib/mariadb
-${INSTALL_ROOT}/usr/bin/mysql_install_db --user=mariadb
--datadir=/var/lib/mariadb
diff --git a/database/mariadb/PREPARE b/database/mariadb/PREPARE
index ba03d1c..c605187 100755
--- a/database/mariadb/PREPARE
+++ b/database/mariadb/PREPARE
@@ -1,2 +1,2 @@
-config_query MARIA_TESTS "Install MySQL testing utilities?" n &&
-config_query MARIA_BENCH "Install MySQL benchmarking utilities?" n
+config_query MARIA_TESTS "Install MariaDB testing utilities?" n &&
+config_query MARIA_BENCH "Install MariaDB benchmarking utilities?" n
diff --git a/database/mariadb/PRE_SUB_DEPENDS
b/database/mariadb/PRE_SUB_DEPENDS
index b79f83d..414ee98 100755
--- a/database/mariadb/PRE_SUB_DEPENDS
+++ b/database/mariadb/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- embedded|EMBEDDED) if [ $MSQL_EMBED == "--with-embedded-server" ]; then
return 0; fi;;
- innodb|INNODB) if [[ $MSQL_ENGINES == *InnoDB* || "$MSQL_ENGINES" ==
"all" ]]; then return 0; fi;;
+ embedded|EMBEDDED) if [ $MADB_EMBED == "--with-embedded-server" ]; then
return 0; fi;;
+ innodb|INNODB) if [[ $MADB_ENGINES == *innodb_plugin* || "$MADB_ENGINES"
== "all" ]]; then return 0; fi;;
esac
return 1
diff --git a/database/mariadb/SUB_DEPENDS b/database/mariadb/SUB_DEPENDS
index b31384a..b6b3018 100755
--- a/database/mariadb/SUB_DEPENDS
+++ b/database/mariadb/SUB_DEPENDS
@@ -1,11 +1,11 @@
case $THIS_SUB_DEPENDS in
embedded|EMBEDDED) echo "Embbeded mysql requested, forcing it." &&
- MSQL_EMBED="--with-embedded-server" ;;
+ MADB_EMBED="--with-embedded-server" ;;
innodb|INNODB) echo "InnoDB storage engine support requested, forcing
it." &&
- if [ "$MSQL_ENGINES" == "none" ]; then
- MSQL_ENGINES="InnoDB"
+ if [ "$MADB_ENGINES" == "none" ]; then
+ MADB_ENGINES="innodb_plugin"
else
- MSQL_ENGINES="$MSQL_ENGINES InnoDB"
+ MADB_ENGINES="innodb_plugin $MADB_ENGINES"
fi ;;
*) echo "unknown sub-depends!"; return 1 ;;
esac



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (83795e972679827287de6fef01666ed66b864f72), Vlad Glagolev, 11/11/2010

Archive powered by MHonArc 2.6.24.

Top of Page