From cc4b5da06afdfbd78033a0a60ed351cf5857a2b0 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 27 Oct 2014 17:01:32 +0100
Subject: [PATCH] mariadb: update to 10.0.14; added runit service.

---
 srcpkgs/mariadb/files/mysqld/log/run |  2 ++
 srcpkgs/mariadb/files/mysqld/run     |  4 ++++
 srcpkgs/mariadb/template             | 22 ++++++++++++----------
 3 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100755 srcpkgs/mariadb/files/mysqld/log/run
 create mode 100755 srcpkgs/mariadb/files/mysqld/run

diff --git a/srcpkgs/mariadb/files/mysqld/log/run b/srcpkgs/mariadb/files/mysqld/log/run
new file mode 100755
index 00000000000..b36c4dafa40
--- /dev/null
+++ b/srcpkgs/mariadb/files/mysqld/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -p daemon.notice
diff --git a/srcpkgs/mariadb/files/mysqld/run b/srcpkgs/mariadb/files/mysqld/run
new file mode 100755
index 00000000000..bc16a07883e
--- /dev/null
+++ b/srcpkgs/mariadb/files/mysqld/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ ! -d /run/mysqld ] && mkdir -p /run/mysqld
+chown mysql:mysql /run/mysqld
+exec chpst -u mysql:mysql mysqld --user=mysql 2>&1
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 97349b75c9c..5f0845c8261 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.0.12
-revision=2
+version=10.0.14
+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
@@ -26,15 +26,15 @@ depends="mariadb-client"
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
 conf_files="/etc/mysql/my.cnf"
-systemd_services="mysqld.service on"
+build_options="systemd"
 system_accounts="mysql"
-mysqld_homedir="/var/lib/mysql"
+mysql_homedir="/var/lib/mysql"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://mariadb.org/"
 license="GPL-2"
 distfiles="https://downloads.$pkgname.org/f/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=612bc7360997173d536b79d744e8418d3910924775cbb0614d0843d609be162d
+checksum=ac0eca4ebb278aa304236bf6dbd5e8c9cf285431333f1379051c231c08e2e31d
 
 pre_configure() {
 	# We need some host binaries before starting cross compilation.
@@ -69,10 +69,14 @@ post_install() {
 	# Configuration file.
 	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
 
+	vsv mysqld
+
 	# systemd service.
-	vinstall ${FILESDIR}/mysqld.service 644 usr/lib/systemd/system
-	vinstall ${FILESDIR}/mysqld-post 755 usr/bin
-	vinstall ${FILESDIR}/mysqld.tmpfiles 644 usr/lib/tmpfiles.d mysqld.conf
+	if [ "$build_option_systemd" ]; then
+		vinstall ${FILESDIR}/mysqld.service 644 usr/lib/systemd/system
+		vinstall ${FILESDIR}/mysqld-post 755 usr/bin
+		vinstall ${FILESDIR}/mysqld.tmpfiles 644 usr/lib/tmpfiles.d mysqld.conf
+	fi
 }
 
 libmariadbclient_package() {
@@ -84,7 +88,6 @@ libmariadbclient_package() {
 		vmove "usr/lib/libmysqlclient*.so.*"
 	}
 }
-
 libmariadbclient-devel_package() {
 	depends="libmariadbclient>=${version}_${revision}"
 	provides="libmysqlclient-devel-${version}_${revision}"
@@ -98,7 +101,6 @@ libmariadbclient-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-
 mariadb-client_package() {
 	depends="perl"
 	provides="mysql-client-${version}_${revision}"