From 67f41017be37b3b408080fe1c94ff2ad67f2d7ac Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 2 Aug 2014 18:45:26 +0200
Subject: [PATCH] mysql: update to 5.6.20; fix initial setup noticed by
 @dominikh.

---
 srcpkgs/mysql/INSTALL  | 3 ++-
 srcpkgs/mysql/template | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mysql/INSTALL b/srcpkgs/mysql/INSTALL
index f6506edc7d..4ce513cca4 100644
--- a/srcpkgs/mysql/INSTALL
+++ b/srcpkgs/mysql/INSTALL
@@ -2,7 +2,8 @@
 #
 case ${ACTION} in
 post)
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr
+	install -dm0700 var/lib/mysql
+	usr/bin/mysql_install_db --user=mysql --keep-my-cnf --basedir=/usr --datadir=/var/lib/mysql
 	chown -R mysql:mysql var/lib/mysql
 	;;
 esac
diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template
index e45769c29c..ea7fe5a223 100644
--- a/srcpkgs/mysql/template
+++ b/srcpkgs/mysql/template
@@ -1,13 +1,13 @@
 # Template file for 'mysql'
 pkgname=mysql
-version=5.6.19
+version=5.6.20
 revision=1
 build_style=cmake
 configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
  -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
  -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
+ -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
@@ -29,8 +29,8 @@ short_desc="The world's most popular open source database"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://www.mysql.com/products/community/"
 license="GPL-2"
-distfiles="http://files.directadmin.com/services/all/mysql/mysql-${version}.tar.gz"
-checksum=80ef3aae048866539380e7e330d9f1034f0ee50ddfb9c662570132492678b09f
+distfiles="https://downloads.skysql.com/archives/mysql-${version%.*}/mysql-${version}.tar.gz"
+checksum=4fc33b1a3ddb75fbc1cc30d0aba1af3d94c4fbe608048d46e34f39a8281a064d
 
 pre_configure() {
 	# libressl major detection.