diff options
Diffstat (limited to 'system/mariadb')
| -rw-r--r-- | system/mariadb/README | 3 | ||||
| -rw-r--r-- | system/mariadb/doinst.sh | 5 | ||||
| -rw-r--r-- | system/mariadb/mariadb.SlackBuild | 122 | ||||
| -rw-r--r-- | system/mariadb/mariadb.info | 8 | ||||
| -rw-r--r-- | system/mariadb/rc.mysqld | 2 |
5 files changed, 65 insertions, 75 deletions
diff --git a/system/mariadb/README b/system/mariadb/README index 8b7d4ae2e6..d4c88cdc14 100644 --- a/system/mariadb/README +++ b/system/mariadb/README @@ -5,8 +5,7 @@ engines, including the Aria storage engine. This conflicts with Slackware's mysql package. Do NOT install both! This conflicts with mytop, as MariaDB already ships with its own -version of mytop. Note that mytop requires perl-TermReadKey at -runtime. +version of mytop. If you want to build the embedded mysql server (libmysqld), which you will need if you plan to (re)build amarok, then run the script diff --git a/system/mariadb/doinst.sh b/system/mariadb/doinst.sh index 30509fa0d9..917c3cfb5f 100644 --- a/system/mariadb/doinst.sh +++ b/system/mariadb/doinst.sh @@ -23,4 +23,9 @@ preserve_perms() { } preserve_perms etc/rc.d/rc.mysqld.new +config etc/mysqlaccess.conf.new +config etc/my.cnf.new +config etc/my.cnf.d/client.cnf.new +config etc/my.cnf.d/mysql-clients.cnf.new +config etc/my.cnf.d/server.cnf.new diff --git a/system/mariadb/mariadb.SlackBuild b/system/mariadb/mariadb.SlackBuild index f456750e20..6be4fe4ad4 100644 --- a/system/mariadb/mariadb.SlackBuild +++ b/system/mariadb/mariadb.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA -# Copyright 2011 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2011-2012 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ # MariaDB version maintained by: Heinz Wiesinger <pprkut@liwjatan.at> PRGNAM=mariadb -VERSION=5.3.6 +VERSION=5.5.27 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -44,10 +44,10 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "${EMBEDDED:-no}" = "" ]; then - embed="" +if [ "${EMBEDDED:-no}" = "no" ]; then + embed="OFF" else - embed="--with-embedded-server" + embed="ON" fi if [ "$ARCH" = "i486" ]; then @@ -76,64 +76,48 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -felide-constructors -fno-exceptions -fno-rtti" \ -CXX=g++ \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --with-mysqld-user=mysql \ - --with-unix-socket-path=/var/run/mysql/mysql.sock \ - --localstatedir=/var/lib/mysql \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --enable-assembler \ - --without-debug \ - --enable-thread-safe-client \ - --with-extra-charsets=complex \ - --with-ssl=/usr \ - --with-aria-tmp-tables \ - --with-libevent \ - --enable-largefile \ - --with-readline \ - --with-big-tables \ - --enable-local-infile \ - --with-plugins=max \ - --build=$ARCH-slackware-linux \ - $embed +mkdir build +cd build +cmake \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKCFLAGS -felide-constructors -fno-exceptions -fno-rtti" \ + -DBUILD_CONFIG=mysql_release \ + -DFEATURE_SET="community" \ + -DINSTALL_LAYOUT="RPM" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DINSTALL_LIBDIR="lib${LIBDIRSUFFIX}" \ + -DINSTALL_SBINDIR=libexec \ + -DINSTALL_INCLUDEDIR=include/mysql \ + -DINSTALL_MYSQLSHAREDIR=share/mysql \ + -DINSTALL_SQLBENCHDIR= \ + -DINSTALL_MYSQLTESTDIR=mysql-test \ + -DINSTALL_MANDIR=man \ + -DINSTALL_PLUGINDIR="lib${LIBDIRSUFFIX}/mysql/plugin" \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_SUPPORTFILESDIR=share/mysql \ + -DINSTALL_MYSQLDATADIR="/var/lib/mysql" \ + -DMYSQL_DATADIR="/var/lib/mysql" \ + -DMYSQL_UNIX_ADDR="/var/run/mysql/mysql.sock" \ + -DWITH_EXTRA_CHARSETS=complex \ + -DENABLED_LOCAL_INFILE=ON \ + -DWITH_EMBEDDED_SERVER=$embed \ + -DWITH_READLINE=ON \ + -DWITH_SSL=system \ + -DWITH_ZLIB=system \ + -DUSE_ARIA_FOR_TMP_TABLES=ON \ + -DMANUFACTURER="Slackware" \ + .. make make install DESTDIR=$PKG -# install additional headers needed for building external engine plugins -for i in sql include regex; do - for j in $i/*.h; do - install -m 0644 $j $PKG/usr/include/mysql/ - done -done - -mkdir -p $PKG/usr/include/mysql/atomic -for i in include/atomic/*.h; do - install -m 0644 $i $PKG/usr/include/mysql/atomic/ -done +# Leave build directory: +cd .. -install -m 0644 storage/maria/ma_{pagecache,loghandler_lsn}.h \ - $PKG/usr/include/mysql/ -install -m 0644 storage/maria/ha_maria.h \ - $PKG/usr/include/mysql/ -sed -i "s|../storage/maria/ma_pagecache.h|ma_pagecache.h|" \ - $PKG/usr/include/mysql/maria.h -sed -i "s|../storage/maria/ha_maria.h|ha_maria.h|" \ - $PKG/usr/include/mysql/sql_select.h - -# Add some handy library symlinks: -cd $PKG/usr/lib${LIBDIRSUFFIX} - for i in libmysqlclient libmysqlclient_r; do - rm -f $i.so $i.so.16 - ln -sf mysql/$i.so $i.so - ln -sf mysql/$i.so.16 $i.so.16 - done -cd - +# remove static client libraries +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqlclient.a +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqlclient_r.a +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmysqld.a # The ./configure option to omit this has gone away, so we'll omit it # the old-fashioned way. It's all in the source tarball if you need it. @@ -142,10 +126,6 @@ rm -rf $PKG/usr/sql-bench # Do not include the test suite: rm -rf $PKG/usr/mysql-test -# Install support files -mkdir -p $PKG/etc -cp support-files/my-{huge,large,medium,small}.cnf $PKG/etc - # This is the directory where databases are stored mkdir -p $PKG/var/lib/mysql chown mysql.mysql $PKG/var/lib/mysql @@ -160,19 +140,25 @@ chmod 0755 $PKG/var/run/mysql mkdir -p $PKG/etc/rc.d # This is intentionally chmod 644. cat $CWD/rc.mysqld > $PKG/etc/rc.d/rc.mysqld.new +rm -rf $PKG/etc/init.d + +# Install mysqlaccess.conf +install -m 644 scripts/mysqlaccess.conf $PKG/etc/mysqlaccess.conf.new + +# Mark config files under /etc as .new +mv $PKG/etc/my.cnf $PKG/etc/my.cnf.new +for i in client mysql-clients server; do + mv $PKG/etc/my.cnf.d/$i.cnf $PKG/etc/my.cnf.d/$i.cnf.new +done find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -rm -f $PKG/usr/info/dir -gzip -9 $PKG/usr/info/* - find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - COPYING* EXCEPTIONS* INSTALL-SOURCE README* Docs/INSTALL-BINARY \ +cp -a README VERSION COPYING* KNOWN_BUGS.txt INSTALL-SOURCE \ $PKG/usr/doc/$PRGNAM-$VERSION find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \; diff --git a/system/mariadb/mariadb.info b/system/mariadb/mariadb.info index a6e860890a..705bf69dd1 100644 --- a/system/mariadb/mariadb.info +++ b/system/mariadb/mariadb.info @@ -1,10 +1,10 @@ PRGNAM="mariadb" -VERSION="5.3.6" +VERSION="5.5.27" HOMEPAGE="http://mariadb.org/" -DOWNLOAD="http://mirror2.hs-esslingen.de/mariadb/mariadb-5.3.6/kvm-tarbake-jaunty-x86/mariadb-5.3.6.tar.gz" -MD5SUM="1720dc637ae1b27a6147b166e53b52be" +DOWNLOAD="http://mirror2.hs-esslingen.de/mariadb/mariadb-5.5.27/kvm-tarbake-jaunty-x86/mariadb-5.5.27.tar.gz" +MD5SUM="ad6f3239a1d5af0a667e30f7c0b05037" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="perl-TermReadKey" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@liwjatan.at" diff --git a/system/mariadb/rc.mysqld b/system/mariadb/rc.mysqld index a509d68aca..3dd1ce36f8 100644 --- a/system/mariadb/rc.mysqld +++ b/system/mariadb/rc.mysqld @@ -32,7 +32,7 @@ SKIP="--skip-networking" # Uncomment the next line to use Oracle's InnoDB plugin instead of the included XtraDB -#INNODB="--ignore-builtin-innodb --plugin-load=innodb=ha_innodb_plugin.so" +#INNODB="--ignore-builtin-innodb --plugin-load=innodb=ha_innodb.so" # Start mysqld: mysqld_start() { |