summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/mariadb/doinst.sh1
-rw-r--r--system/mariadb/mariadb.SlackBuild10
-rw-r--r--system/mariadb/mariadb.info6
3 files changed, 9 insertions, 8 deletions
diff --git a/system/mariadb/doinst.sh b/system/mariadb/doinst.sh
index 917c3cfb5f..7d28e15d56 100644
--- a/system/mariadb/doinst.sh
+++ b/system/mariadb/doinst.sh
@@ -24,6 +24,7 @@ preserve_perms() {
preserve_perms etc/rc.d/rc.mysqld.new
config etc/mysqlaccess.conf.new
+config etc/logrotate.d/mysql.new
config etc/my.cnf.new
config etc/my.cnf.d/client.cnf.new
config etc/my.cnf.d/mysql-clients.cnf.new
diff --git a/system/mariadb/mariadb.SlackBuild b/system/mariadb/mariadb.SlackBuild
index 6be4fe4ad4..70e5fe88a1 100644
--- a/system/mariadb/mariadb.SlackBuild
+++ b/system/mariadb/mariadb.SlackBuild
@@ -27,7 +27,7 @@
# MariaDB version maintained by: Heinz Wiesinger <pprkut@liwjatan.at>
PRGNAM=mariadb
-VERSION=5.5.27
+VERSION=5.5.28a
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -96,6 +96,8 @@ cmake \
-DINSTALL_SCRIPTDIR=bin \
-DINSTALL_SUPPORTFILESDIR=share/mysql \
-DINSTALL_MYSQLDATADIR="/var/lib/mysql" \
+ -DINSTALL_DOCREADMEDIR="doc/$PRGNAM-$VERSION" \
+ -DINSTALL_DOCDIR="doc/$PRGNAM-$VERSION" \
-DMYSQL_DATADIR="/var/lib/mysql" \
-DMYSQL_UNIX_ADDR="/var/run/mysql/mysql.sock" \
-DWITH_EXTRA_CHARSETS=complex \
@@ -147,6 +149,7 @@ 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
+mv $PKG/etc/logrotate.d/mysql $PKG/etc/logrotate.d/mysql.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
@@ -157,10 +160,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
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 README VERSION COPYING* KNOWN_BUGS.txt INSTALL-SOURCE \
- $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \;
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/system/mariadb/mariadb.info b/system/mariadb/mariadb.info
index 705bf69dd1..f8aee2b176 100644
--- a/system/mariadb/mariadb.info
+++ b/system/mariadb/mariadb.info
@@ -1,8 +1,8 @@
PRGNAM="mariadb"
-VERSION="5.5.27"
+VERSION="5.5.28a"
HOMEPAGE="http://mariadb.org/"
-DOWNLOAD="http://mirror2.hs-esslingen.de/mariadb/mariadb-5.5.27/kvm-tarbake-jaunty-x86/mariadb-5.5.27.tar.gz"
-MD5SUM="ad6f3239a1d5af0a667e30f7c0b05037"
+DOWNLOAD="http://mirror2.hs-esslingen.de/mariadb/mariadb-5.5.28a/kvm-tarbake-jaunty-x86/mariadb-5.5.28a.tar.gz"
+MD5SUM="a2d20a040ef1e49944a4ffe65ed7fefa"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="perl-TermReadKey"